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

325 Commits (233d8fc4eb254306dc5fb6b80ff58014e1822539)

Author SHA1 Message Date
Aevann 629ce8f174 do what g-sex wants 2023-08-17 04:28:45 +03:00
Aevann 24345f48cd up under_siege post threshold on WPD from 10 minutes to 1 day 2023-08-16 23:25:30 +03:00
Aevann 4623e7c1a3 fix ping_cost not getting summed with previous value 2023-08-13 19:02:55 +03:00
Aevann 3ec2038caf same as last commit 2023-08-11 16:15:34 +03:00
Aevann af35d0d2b8 rename variable 2023-08-10 15:04:23 +03:00
Aevann 3bcf4e3d22 do this https://rdrama.net/h/meta/post/195365/dramatards-rly-join-eighteen-18-ping/4764206#context 2023-08-09 14:48:02 +03:00
Aevann 1272d3dd1e exclude jannies from antispam-checking 2023-08-08 15:06:14 +03:00
Aevann ed34558f33 remove unnecessary .all() 2023-08-05 22:26:42 +03:00
HeyMoon a2baddb812 Tell Aevann to go home when he posts (#173) 
![image](/attachments/a0137b22-5d12-4f9d-a98a-5feb256533f9)

Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#173
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
 2023-08-02 04:18:25 +00:00
Aevann bd942fe12e remove useless tabs 2023-08-01 10:38:58 +03:00
Aevann 6e9d3d68dc strip after not before 2023-07-30 09:20:02 +03:00
Aevann 8beb2d7e8e remove typing (useless code bloat) 2023-07-30 03:42:06 +03:00
Aevann 6dfe376197 remove tab 2023-07-29 21:31:40 +03:00
Aevann 90cb33c017 make group-pingspamming marginally faster (it will still timeout anyway bc of the transaction timeout i added in previous commit) 2023-07-28 01:08:06 +03:00
Aevann cee9401fe5 fix 500 error on posting 2023-07-25 21:52:53 +03:00
Aevann 8c682f0686 make snappy exiling behavior work in publishing drafts too 2023-07-25 21:37:10 +03:00
Aevann 3e6e1fdcc8 put check_for_alts in under_siege flow 2023-07-25 19:42:16 +03:00
Aevann f3da9df609 add another rare carp response 2023-07-25 17:22:56 +03:00
Aevann 6d0f38348b make snappy downvote 2023-07-23 00:56:59 +03:00
Aevann 425834301e do this https://rdrama.net/h/chudrama/post/188663/-/4606229#context 2023-07-22 20:44:21 +03:00
Aevann ff860f096c another carp easteregg 2023-07-21 16:08:21 +03:00
Aevann 883b553c7a fix snappy ping cost 2023-07-17 20:24:22 +03:00
Aevann ee55030480 much better poll system 2023-07-14 17:46:35 +03:00
Aevann 64b6f4895e remove "or True" 2023-07-10 01:18:00 +03:00
G-tix b658ce95d9 Prevent dylan autojanny overwrite (#168) 
Autojanny overwrites the 'Dylan' shadowban with an 'Under Siege' shadowban. Rechecking "if v.shadowbanned: return" will prevent this, I guess.
As usual, please quadruple check my code.

Reviewed-on: rDrama/rDrama#168
Co-authored-by: G-tix <g-tix@noreply.fsdfsd.net>
Co-committed-by: G-tix <g-tix@noreply.fsdfsd.net>
 2023-07-09 22:17:35 +00:00
Aevann 783c90f9d3 do this https://rdrama.net/h/countryclub/post/79285/-/4494243#context 2023-07-05 23:44:50 +03:00
Aevann 25b9a0f535 stop usage of .update 2023-07-03 00:42:34 +03:00
Aevann 7f6675f7f9 remove unddit.com (RIP u will not be forgotten) 2023-07-01 19:41:59 +03:00
Aevann eed7410277 make spam bans generate modlog items + dedup 2023-07-01 18:27:56 +03:00
Aevann c721b26b61 dylan 2023-06-30 23:17:56 +03:00
Aevann 3d3e517a4c Add House Edgy 2023-06-26 18:05:27 +03:00
Aevann 9ef00b7f0e fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4198466#context 2023-06-24 16:29:28 +03:00
Aevann e3e7c4a8b6 fix wrong longpostbot comment count 2023-06-23 20:44:02 +03:00
Aevann 5e8f04b2ac rename flags to reports 2023-06-23 19:49:26 +03:00
Aevann d9bed378a9 complement 32fa466e6a 2023-06-23 16:46:42 +03:00
Aevann 00a6ae24bd enable showmore button on snappy comments 2023-06-22 15:52:33 +03:00
Aevann ee92098abe fix this https://rdrama.net/post/174840/according-to-siteindicescom-rdramanet-has-a 2023-06-08 03:32:33 +03:00
Aevann 32fa466e6a rename submissions to posts 2023-06-08 02:26:32 +03:00
Aevann 7519f51ce7 remove the increased under siege time for messages and reports on WPD 2023-05-24 13:46:31 +03:00
Aevann bee7cc8892 put my fake headers in const 2023-05-15 03:07:21 +03:00
Aevann bbaa6cd6b0 1. tell jannies the location of the report that caused someone to get under-sieged 
2. allow jannies to see reports by shadowbanned users
3. destroy the shadowbanned underworld for reports
4. dedup reports HTML code
5. show JL5 the message that caused someone to get under-sieged
 2023-05-15 01:01:10 +03:00
Aevann beb8adcda5 use 'report' instead of 'flag' 2023-05-14 23:36:05 +03:00
Aevann f3a0080698 remove useless tabs 2023-05-06 00:47:07 +03:00
Aevann 973ce26b7a better DKD snappy system 2023-05-02 16:49:28 +03:00
Aevann cad9847bf9 add DKD snappy response for carp 2023-05-01 21:41:55 +03:00
Aevann de47c992fa remove !wordle since nobody uses it (only 2 ppl used it last 30 days in rdrama and WPD) 2023-04-29 23:27:45 +02:00
Aevann 6df5b7cf50 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4045834#context 2023-04-27 16:54:06 +02:00
Aevann 8496f0e8dd rename SNAPPY_MARSEYS to SNAPPY_EMOJIS 2023-04-25 19:03:10 +02:00
Aevann 42d91ef296 better snappy quotes for DKD 2023-04-25 19:02:56 +02:00
Aevann 15a47082b5 add snappy quote for DKD 2023-04-25 18:43:05 +02:00
Aevann 0b3ab02ee0 make snappy actually ping group members 2023-04-24 15:47:55 +02:00
Aevann 7a2a96e0ac shorter ban reasons 2023-04-24 09:12:49 +02:00
Aevann 3d1b8b26d1 make more emojis grant the glowie award 2023-03-26 00:08:36 +02:00
Aevann 6240bdc39f do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3864686#context 2023-03-26 00:06:44 +02:00
Aevann e8c2952e3c add comment for future self 2023-03-23 17:53:01 +02:00
Aevann 5c071b749a allow polls with the same text 2023-03-23 17:52:31 +02:00
Aevann 4c47cc5d63 stop implementing BAN_EVASION_DOMAIN since nobody actually uses it https://camas.unddit.com/#{%22searchFor%22:1,%22resultSize%22:100,%22query%22:%22stupidpol.site%22} 2023-03-21 17:39:26 +02:00
Aevann 65542b5fac dont strip poll options 2023-03-19 19:53:33 +02:00
Aevann 8f60bfbeaa fix this https://stupidpol.site/post/155996/anyone-got-an-aqua-dots-bindeez/3818081#context 2023-03-18 17:33:24 +02:00
Aevann dd54413cf3 convert marsey submission form to include all emojis 2023-03-18 15:34:04 +02:00
Aevann 49d958ef46 do this https://stupidpol.site/h/countryclub/post/79285/-/3810012#context 2023-03-18 12:59:30 +02:00
Aevann 0b0ad438a8 add SITE_FULL_IMAGES const 2023-03-17 17:57:31 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann f768d81103 keep db sessions open 2023-03-15 05:58:00 +02:00
Aevann c8ca6d279d stop repetitive under siege shadowban 2023-03-13 21:22:39 +02:00
Aevann 729b095713 remove /h/masterbaiters 2023-03-13 20:53:08 +02:00
Aevann 510d962822 under siege - dont repetitively ban the same person 2023-03-12 22:46:13 +02:00
Aevann a7a104348d fix polls 2023-03-12 20:40:18 +02:00
Aevann d2ccce4dba allow making bets in comments 2023-03-12 19:36:35 +02:00
Aevann 97608ea0a9 test getting rid of ![]( on devrama 2023-03-12 15:02:31 +02:00
Aevann 9f66e33061 Revert "convert IS_FISTMAS and IS_HOMOWEEN from functions to variables" 
This reverts commit b45d845630.
 2023-03-08 08:51:40 +02:00
Aevann b45d845630 convert IS_FISTMAS and IS_HOMOWEEN from functions to variables 2023-03-08 08:10:18 +02:00
Aevann e99f978b77 exclude jannies with perm USE_ADMIGGER_THREADS from comment spam check 2023-03-07 03:08:10 +02:00
Aevann a6f1e7617b add support for !pinggroup snappy quote 2023-03-04 20:33:10 +02:00
Aevann aeb4cf2258 clearer modlog note for under siege 2023-03-02 02:37:17 +02:00
Aevann 6e83d4801d include the details previously in under_siege.log in the mod log 2023-03-01 20:49:32 +02:00
Aevann f84d59e5b5 remove under_siege.log (unnecessary) 2023-03-01 20:48:26 +02:00
Aevann 96ce985cd6 allow poll options with the same text 2023-03-01 01:46:11 +02:00
Aevann 17330c073b fix emojis in polls 2023-03-01 00:56:46 +02:00
Aevann 55c8a51a1d make it possible to position poll options 2023-03-01 00:09:16 +02:00
Aevann 9559c6e93a hide ghosts in push notifs 2023-02-27 15:35:53 +02:00
Aevann 8bd2491a85 higher threshold for reports and DMs 2023-02-27 14:49:19 +02:00
Aevann 3a07858639 revert back from \n to \n\n for easier to read source and making linefeeds work when theres <pre> or ``` 2023-02-26 12:20:32 +02:00
Aevann 16ec90fb79 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3661428#context 2023-02-25 18:09:20 +02:00
Aevann 5e67879108 remove christian_emojis 2023-02-24 09:07:40 +02:00
Aevann 858592965f fix 500 errors 2023-02-24 08:48:30 +02:00
Aevann fbdad373f2 fix broken push notifs 2023-02-24 05:28:03 +02:00
Aevann d2bda15383 remove unnecessary f 2023-02-24 04:54:31 +02:00
Aevann e37031c4dd make sure g.db.flush() is always above _push_notif_thread 2023-02-24 04:36:25 +02:00
Aevann cc1c7d4ab5 give push notifs for zozbot and lpb replies 2023-02-24 03:57:10 +02:00
Aevann d8b998a3c5 capitalize word 2023-02-19 15:24:42 +02:00
Aevann 81cc869fe2 make sure autojanny, zozbot, longpostbot add to the comment count of a post 2023-02-18 23:59:17 +02:00
Aevann 88814ee208 expand blackjack 2023-02-07 05:31:49 +02:00
Aevann be88a74c9a minor blackjack improvement 2023-02-07 04:15:55 +02:00
Aevann 0beb4283af remove unnecessary function 2023-02-06 06:45:44 +02:00
Aevann 0a9cdb337e fix blackjack bug 2023-02-06 04:22:13 +02:00
Aevann 47fdc8e870 fix this https://stupidpol.site/post/142838/woke-ouroboros/3492136#context 2023-01-28 14:01:18 +02:00
Aevann 0c5c97a1f8 only allow imginn replacement for posts, since other types of content arent supported by it 2023-01-23 08:28:54 +02:00
Aevann 24edb49f3b add jl5 (for me) 2023-01-22 10:04:49 +02:00
Aevann df803791ef exclude snappy from fishylinks_regex 2023-01-21 06:18:02 +02:00
Aevann f17fade8a6 purge discord from site code 2023-01-20 07:31:53 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann db6db63836 change event structure 2023-01-01 07:33:09 +02:00
Aevann 03fb84e618 fix HOLIDAY_EVENT check 2023-01-01 04:50:11 +02:00
Aevann fa15b1fdf8 minor syntax change 2022-12-30 17:47:40 +02:00
Aevann 9e43cf0724 minor css fix 2022-12-30 05:40:06 +02:00
Aevann 68673292c1 Revert "notify idio3 too" 
This reverts commit ee264631b9.
 2022-12-27 04:10:22 +02:00
Aevann ee264631b9 notify idio3 too 2022-12-27 04:08:23 +02:00
Aevann 7b8483b83f fix 2022-12-27 04:07:38 +02:00
Aevann a63b02470d use sets with in statements 2022-12-24 00:22:41 +02:00
Aevann 9a49b66940 fix 500 error 2022-12-23 23:42:12 +02:00
Aevann 0e6b144ed7 alt graph 2022-12-22 22:03:40 +02:00
Aevann1 3ae5292ce4 remove pcm from code 2022-12-21 14:42:41 +02:00
Aevann1 4b5647993c fix modmail I hope 2022-12-20 02:51:09 +02:00
Aevann1 e386caf581 Revert "generate mod log item for removals" 
This reverts commit e4d4c4798d.
 2022-12-19 23:52:06 +02:00
Aevann1 e4d4c4798d generate mod log item for removals 2022-12-19 23:48:50 +02:00
Aevann1 e4734f4ec4 fix 2 notifs on same comment 2022-12-19 23:44:46 +02:00
Aevann1 3fa6e4d020 fix 2022-12-19 23:36:41 +02:00
Aevann1 9ceca862d9 notify me too 2022-12-19 23:32:52 +02:00
Aevann1 c99f4bd2c5 blackjack rework 2022-12-19 23:29:21 +02:00
Aevann1 248c7ef50d fix errors 2022-12-19 23:00:48 +02:00
Aevann1 c842d44384 minor css change 2022-12-19 22:54:45 +02:00
Aevann1 2028216c45 do this https://stupidpol.site/h/slackernews/post/132440/ml-engineer-analyzes-what-chatgpt-marks/3265102#context 2022-12-19 19:12:07 +02:00
geese_suck 1574b4da63 fistmas (#79) 
Co-authored-by: justcool393 <justcool393@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Co-authored-by: Nekobit Bitneko <me@ow.nekobit.net>
Reviewed-on: rDrama/rDrama#79
Co-authored-by: geese_suck <deandre.williams@geese-suck.us>
Co-committed-by: geese_suck <deandre.williams@geese-suck.us>
 2022-12-19 01:20:14 +00:00
Aevann1 e0bc8a22e2 generate modlog items for autojanny 2022-12-18 16:25:28 +02:00
Aevann1 cafe3c47d3 overwrite ban reason 2022-12-18 16:25:28 +02:00
Aevann1 36fca9caab minor bugfix 2022-12-13 20:50:38 +02:00
Aevann1 c4b2e5fc4b do this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3233481?context=8#context 2022-12-13 18:36:16 +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 d59543891f add BAN_EVASION_FULL constant 2022-12-11 20:56:04 +02:00
Snakes 0d580b8b4f
Fix post comment count logic not activating. 
Also standardize parameter list order for comment games.
 2022-12-09 00:56:08 -05:00
Snakes 25b5675ac4
Amend PR 52, 53: standardize style, basedbot bug 2022-12-08 22:48:40 -05:00
justcool393 f848f68799 walls: remove duplication among routes/templates (#52) 
removes a bunch of duplicated code in commenting and userpages

Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#52
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-09 03:35:28 +00:00
justcool393 ed0981cbdb add functionality to disable poll formatting (#35) 
Co-authored-by: justcool393 <justcool393@gmail.com>
Reviewed-on: rDrama/rDrama#35
Co-authored-by: justcool393 <justcool393@noreply.fsdfsd.net>
Co-committed-by: justcool393 <justcool393@noreply.fsdfsd.net>
 2022-12-04 21:46:27 +00:00
Snakes d79465517d
Rename siege log filename. 2022-12-02 17:50:48 -05:00
Aevann1 845e13b4ae minor bug fix 2022-12-01 14:27:15 +02:00
justcool393 d395bcab69 logging: create somewhat sane logging 2022-11-30 12:09:31 -06:00
justcool393 0106a4e340 antispam: under siege mode 2022-11-30 11:37:35 -06:00
justcool393 67bfe5a5bd remove unnecessary `str()` 2022-11-29 14:29:27 -06:00
SneedBot a7614a5dd2 sneed 2022-11-29 14:11:34 +00:00
SneedBot c494f006f2 sneed 2022-11-28 06:05:21 +00:00
Aevann1 4656fa0b8d pin posts by pizza/impassionata/TGTW automatically for 1 hour 2022-11-28 04:07:06 +02:00
Aevann1 6a94ac3aa9 since lawlz got demopped, make his automatic mod actions be executed by autojanny instead 2022-11-26 03:56:04 +02:00
justcool393 042edf15bd make antispam a bit less :marseyshook: 2022-11-23 14:45:09 -06:00
Snakes 00880ccadc
zoz 
zle
zozzle
 2022-11-22 19:09:42 -05:00
Aevann1 8776cbca53 do this https://rdrama.net/post/125190/gamingcirclejerk-marseygamer-plays-themselves/3115522?context=8#context 2022-11-22 23:45:50 +02:00
Snakes adeb7acb38
archive_url: suppress errors on remote failure. 
ghostarchive has been giving us 500 backs lately. They are making
an absolute mess of the log for a non-central, opportunistic feature,
and we already eat exceptions for archive.org. We merely extend that
to ghostarchive.
 2022-11-21 18:52:21 -05:00
Snakes db329f487f
User.pay_account everywhere, fix lottery payout. 2022-11-20 05:50:02 -05: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 84d9ed6655 antispam: sanity check 2022-11-13 21:48:52 -06:00