carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
27,072 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

220 Commits (bfffedc5a78b020f7ee6171a7114f2bee2781940)

Author SHA1 Message Date
Aevann 54bd633fda fix group mentions charging even if u were a member 2023-03-10 04:17:13 +02:00
Aevann 355af22171 do this https://stupidpol.site/post/152490/downvoting-isnt-funny-its-just-annoying/3729531#context 2023-03-07 02:25:40 +02:00
Aevann 2d2a1ca28c always use charge_account() 2023-03-04 20:32:55 +02:00
Aevann d7f42ac50a dont give shekels to ppl not notified bc of blocks + dont give shekels to ppl ALSO mentioned directly + prevent group double charging on edit + do this https://stupidpol.site/h/countryclub/post/79285/-/3695711#context 2023-03-02 21:56:43 +02:00
Aevann 308bb03125 add !everyone 2023-03-02 02:32:51 +02:00
Aevann 712239157f two-way-blocks for ping groups 2023-03-01 22:28:34 +02:00
Aevann cb76ab0da9 remove !everyone 2023-03-01 22:21:56 +02:00
Aevann b3f75b9beb always use author_name even if its not needed for consistency 2023-03-01 21:28:10 +02:00
Aevann 4a52246111 add !everyone 2023-03-01 07:32:19 +02:00
Aevann bc9437497d do this https://stupidpol.site/h/countryclub/post/79285/-/3681399#context 2023-02-28 21:27:38 +02:00
Aevann 9078ddbc34 add CAN_PING_ALL_GROUPS perm for myself 2023-02-27 03:13:38 +02:00
Aevann 615d71dda0 fix 500 error 2023-02-26 13:22:16 +02:00
Aevann fd9e1c3fec in push notifs: link the post I was mentioned in 2023-02-26 11:37:44 +02:00
Aevann a90744145a add ping groups 2023-02-24 08:31:06 +02:00
Aevann 22051152de fix 500 error 2023-02-24 05:00:22 +02:00
Aevann e37031c4dd make sure g.db.flush() is always above _push_notif_thread 2023-02-24 04:36:25 +02:00
Aevann 3e7ccb7756 add push notifs to add_notif() 2023-02-24 04:28:10 +02:00
Aevann 760b2e6a4d add push notifs for repeatable notifications 2023-02-24 04:09:49 +02:00
Aevann 6755cbf28a move an if condition to push_notif() 2023-02-24 03:56:46 +02:00
Aevann 98b9c27442 readd temp code i removed earlier 2023-02-18 20:35:22 +02:00
Aevann 96a85bd140 remove temp code 2023-02-18 19:09:33 +02:00
Aevann 69480ac2c5 temp code cuz im lazy 2023-02-18 19:09:16 +02:00
Aevann 198a1f65bf make it exclusive to rdrama 2023-02-18 18:59:36 +02:00
Aevann 0015deba7a add !biofoids ping group 2023-02-18 18:58:59 +02:00
Aevann 88814ee208 expand blackjack 2023-02-07 05:31:49 +02:00
Aevann 72fabb1dff Revert "Revert "handle race condition for signup notifs"" 
This reverts commit 44a8c2338e.
 2023-01-25 03:09:32 +02:00
Aevann 1919fc822a give me push notifs for DMs 2023-01-20 05:42:05 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 44a8c2338e Revert "handle race condition for signup notifs" 
This reverts commit 4d5440a7f3.
 2022-12-26 22:14:33 +02:00
Aevann 4d5440a7f3 handle race condition for signup notifs 2022-12-26 22:08:42 +02:00
Aevann c4e4a8d853 give jannies push notifs for chat 2022-12-25 22:30:50 +02:00
justcool393 ab41db22b7 [DO NOT MERGE] multiple sub banners (#59) 
allows multiple sub banners

Snakes note: By request of Carp, especially for WPD.

Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#59
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-11 23:44:34 +00:00
Aevann1 3907a2f25f make the gevent sequential 2022-12-03 01:25:48 +02:00
Snakes 9b09181e28
Dispatch push notifications using greenlets. 2022-12-02 18:15:58 -05:00
Aevann 5c2dab73c7 stop using pusher (#37) 
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#37
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-02 22:21:18 +00:00
Aevann1 955ec104f2 use the new /icon.webp link everywhere 2022-11-30 01:25:11 +02:00
Aevann1 b6efc27551 use "i" instead of "assets/images" 2022-11-30 00:52:19 +02:00
justcool393 3d7737387c use default config vlaue const everywhere 2022-11-15 10:55:00 -06:00
justcool393 8f2f48d6d1
[DO NOT MERGE] import detanglation (#442) 
* move Base definition to files.classes.__init__.py

* fix ImportError

* move userpage listing to users.py

* don't import the app from classes

* consts: set default values to avoid crashes
consts: warn if the secret key is the default config value

* card view: sneed (user db schema)

* cloudflare: use DEFAULT_CONFIG_VALUE

* const: set default values

* decouple media.py from __main__

* pass database to avoid imports

* import cleanup and import request not in const, but in the requests mega import

* move asset_submissions site check to __init__

* asset submissions feature flag

* flag

* g.is_tor

* don't import request where it's not needed

* i think this is fine

* mail: move to own routes and helper

* wrappers

* required wrappers move

* unfuck wrappers a bit

* move snappy quotes and marseys to stateful consts

* marsify

* :pepodrool:

* fix missing import

* import cache

* ...and settings.py

* and static.py

* static needs cache

* route

* lmao all of the jinja shit was in feeds.py amazing

* classes should only import what they need from flask

* import Response

* hdjbjdhbhjf

* ...

* dfdfdfdf

* make get a non-required import

* isort imports (mostly)

* but actually

* configs

* reload config on import

* fgfgfgfg

* config

* config

* initialize snappy and test

* cookie of doom debug

* edfjnkf

* xikscdfd

* debug config

* set session cookie domain, i think this fixes the can't login bug

* sdfbgnhvfdsghbnjfbdvvfghnn

* hrsfxgf

* dump the entire config on a request

* kyskyskyskyskyskyskyskyskys

* duifhdskfjdfd

* dfdfdfdfdfdfdfdfdfdfdfdf

* dfdfdfdf

* imoprt all of the consts beacuse fuck it

* 😭

* dfdfdfdfdfdfsdasdf

* print the entire session

* rffdfdfjkfksj

* fgbhffh

* not the secret keys

* minor bug fixes

* be helpful in the warning

* gfgfgfg

* move warning lower

* isort main imports (i hope this doesn't fuck something up)

* test

* session cookie domain redux

* dfdfdfd

* try only importing Flask

* formkeys fix

* y

* :pepodrool:

* route helper

* remove before flight

* dfdfdfdfdf

* isort classes

* isort helpers

* move check_for_alts to routehelpers and also sort imports and get rid of unused ones

* that previous commit but actkally

* readd the cache in a dozen places they were implicitly imported

* use g.is_tor instead of request.headers. bla bla bla

* upgrade streamers to their own route file

* get rid of unused imports in __main__

* fgfgf

* don't pull in the entire ORM where we don't need it

* features

* explicit imports for the get helper

* explicit imports for the get helper redux

* testing allroutes

* remove unused import

* decouple flask from classes

* syntax fix also remember these have side fx for some reason (why?)

* move side effects out of the class

* posts

* testing on devrama

* settings

* reloading

* settingssdsdsds

* streamer features

* site settings

* testing settings on devrama

* import

* fix modlog

* remove debug stuff

* revert commit 67275b21ab6e2f2520819e84d10bfc1c746a15b6

* archiveorg to _archiveorg

* skhudkfkjfd

* fix cron for PCM

* fix bugs that snekky wants me to

* Fix call to realbody passing db, standardize kwarg

* test

* import check_for_alts from the right place

* cloudflare

* testing on devrama

* fix cron i think

* shadow properly

* tasks

* Remove print which will surely be annoying in prod.

* v and create new session

* use files.classes

* make errors import little and fix rare 500 in /allow_nsfw

* Revert "use files.classes"

This reverts commit 98c10b876cf86ce058b7fb955cf1ec0bfb9996c6.

* pass v to media functions rather than using g

* fix

* dfdfdfdfd

* cleanup, py type checking is dumb so don't use it where it causes issues

* Fix some merge bugs, add DEFAULT_RATELIMIT to main.

* Fix imports on sqlalchemy expressions.

* `from random import random` is an error.

* Fix replies db param.

* errors: fix missing import

* fix rare 500: only send to GIFT_NOTIF_ID if it exists, and send them the right text

* Fix signup formkey.

* fix 2 500s

* propagate db to submissions

* fix replies

* dfdfdfdf

* Fix verifiedcolor.

* is_manual

* can't use getters outside of an app context

* don't attempt to do gumroad on sites where it's not enabled

* don't attempt to do gumraod on sites's where it's unnecessary

* Revert "don't attempt to do gumroad on sites where it's not enabled"

This reverts commit 6f8a6331878655492dfaf1907b27f8be513c14d3.

* fix 500

* validate media type

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-15 03:19:08 -06:00
justcool393 bf98444ead push notifications: fix pusher causing errors on large unicode msgs 2022-11-13 05:12:05 -06:00
Aevann1 cdffb764bd remove @jannies 2022-10-31 00:41:26 +02:00
justcool393 a2c16534a4 admin pings: truescore requirement and exclude shadowban and make a permission 2022-10-22 19:45:15 -05:00
Aevann1 c4103cfaf4 add @jannies to notify all jannies 2022-10-23 01:50:56 +02:00
justcool393 6e33531be3 remove a _FOR_ 2022-10-06 00:38:33 -07:00
justcool393 dc5a132583 mop visibility, WPD notifications, and a fix with shadowbans 2022-10-05 22:25:45 -07:00
Snakes 4a54c6219a
Add trailing final newlines to source files. 
Touched a ton of files to finally standardize on having trailing
final newlines, as best practice recommends and so our devs stop
accidentally fighting each other over it.

This was performed automatically with the following:
git ls-files -z '*.py' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
git ls-files -z '*.css' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
 2022-09-29 01:43:29 -04:00
Aevann1 027449325f tweak to send_repeatable_notification() to minimize num of comments 2022-09-02 03:59:05 +02:00
Aevann1 6a21dd347b Revert "Revert "Revert "restore autoflush""" 
This reverts commit d84b26fc77.
 2022-08-25 17:04:33 +02:00
Aevann1 11d7f34ad0 allow hole jannies to change the hole marsey + cachebust all site assets 2022-08-25 00:22:44 +02:00
Aevann1 d84b26fc77 Revert "Revert "restore autoflush"" 
This reverts commit 5aa03d87bb.
 2022-08-24 16:36:44 +02:00
Aevann1 5aa03d87bb Revert "restore autoflush" 
This reverts commit 687cd766b9.
 2022-08-23 17:17:37 +02:00
Aevann1 663904fb3d steal the parts I wanted from spidey's PR 2022-08-21 19:20:09 +02:00
Aevann1 7084e71c57 fix pinging 2022-08-20 23:39:01 +02:00
Aevann1 d8c6b575de fix pinging 2022-08-19 15:10:39 +02:00
Aevann1 905e8ae351 WPD daisy filter 2022-08-18 11:52:37 +02:00
Aevann1 687cd766b9 restore autoflush 2022-08-17 18:36:59 +02:00
Aevann1 8e8264de92 kill LGB 2022-08-15 17:24:40 +02:00
Aevann1 1be6a6f0dd sneed 2022-08-14 01:49:18 +02:00
Aevann1 9267d43293 fix censoring notifs 2022-08-11 13:45:30 +02:00
Aevann1 861b16478b fix b6e7151cce 2022-08-11 13:40:36 +02:00
Aevann1 b6e7151cce censor notifs 2022-08-11 13:27:52 +02:00
Aevann1 0429da4493 mod action notifs rework 2022-08-05 23:50:30 +02:00
Snakes 0539609d61
Restrict abuse from young accounts. 2022-07-29 15:55:12 -04:00
Aevann1 4c2cb82f48 change deux' assets 2022-07-10 22:27:56 +02:00
Aevann1 fe959573ec fix 500 errors 2022-07-10 16:29:47 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 35e2e12e24 OPs can now rehole their posts 2022-07-04 04:19:43 +02:00
Aevann1 a0cb5874cc refactor push notifs 2022-06-27 21:02:24 +02:00
Aevann1 9593dc58dd move regex from helpers.const into its own helper file 2022-06-24 16:30:59 +02:00
Aevann1 0e1177843e remove the need for alert flag on sanitize() 2022-06-23 00:12:47 +02:00
Aevann1 365d21ff9c fix this https://i.imgur.com/F0OiGKH.png 2022-06-22 23:00:09 +02:00
Snakes 4db48a6ec9 Separate modaction notifs from inbox. 2022-06-10 08:28:46 -04:00
Aevann1 4a1e6cc726 a 500 error is much better than an XSS, bro 2022-06-07 12:03:51 +02:00
Snakes 227ddbec0e Truncate notifs with too-long bodies. 
In general, we don't do a great job of length validating body_html
fields. Lots of ways to get 500 errors by providing too long of
input. Really ought to find a way to fix it in the classes/comment.py
and classes/submission.py classes. In the interim, the recent gifts
messages change is salient because the notification can 500 out
mid-way through performing coin transactions.

Recommended to find a better way of truncating or safely bubbling
the exception up. Truncating probably not best long-term solution
because it could hypothetically permit strings that would otherwise
be considered unsanitized.
 2022-06-01 00:54:05 -04:00
Aevann1 cd2380fb33 fds 2022-05-28 04:20:31 +02:00
Aevann1 4cc4f8f14f sfd 2022-05-08 06:01:42 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 cc3788bd8d fds 2022-04-20 00:23:25 +02:00
Aevann1 889a8948c4 fsd 2022-04-04 03:41:20 +02:00
Aevann1 b02b27ce4f fds 2022-03-31 17:00:57 +02:00
Aevann1 ec80510e4b fds 2022-03-21 22:56:43 +02:00
Aevann1 83c88a9834 sfd 2022-03-17 18:30:13 +02:00
Aevann1 e1722e50dc fd 2022-03-09 04:24:58 +02:00
Aevann1 b35bab0672 hole 2022-03-09 04:04:37 +02:00
Aevann1 e290995d6d ki 2022-03-06 21:22:33 +02:00
Aevann1 17d6fc3dc6 bruh 2022-03-06 00:19:07 +02:00
Aevann1 35ec2a7712 fart 2022-03-05 00:46:20 +02:00
Aevann1 6d6b199a3b transfers fix 2022-03-04 18:53:28 +02:00
Aevann1 70caa241da gf 2022-03-01 02:20:11 +02:00
Aevann1 c22f4e4e95 created 2022-03-01 02:06:50 +02:00
Aevann1 94f2a69167 N 2022-03-01 01:30:44 +02:00
Aevann1 ddbb610142 regex 2022-02-27 23:57:44 +02:00
Aevann1 e0dfe332c2 cope 2022-02-26 20:53:17 +02:00
Aevann1 14c7148eed fd 2022-02-24 10:28:13 +02:00
Aevann1 bfacc5c33f fd 2022-02-23 07:43:38 +02:00
Aevann1 5d4b09ef62 fd 2022-02-23 07:02:07 +02:00
Aevann1 833009bd14 gdf 2022-02-21 03:58:12 +02:00
Aevann1 b48cc5314f bv 2022-02-21 03:35:01 +02:00
Aevann1 729e4a4c62 g 2022-02-16 03:16:01 +02:00
Aevann1 04a1b875ef sfd 2022-02-04 11:15:59 +02:00