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

120 Commits (7141eafdf582a5a32cd36f118ce5190fe112b225)

Author SHA1 Message Date
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
Snakes b5b8b2927c
Expand blackjack handling pipeline. 2022-11-13 21:43:26 -05:00
justcool393 7c0763d81f blackjack fixes 2022-11-13 20:07:13 -06:00
Aevann1 3ff9cd448f adjust babe97e6d8 2022-11-12 11:29:08 +02:00
official-techsupport babe97e6d8
Add Carp's quote to Snappy on CC posts (#443) 2022-11-11 03:45:28 -05:00
Aevann1 c066227d2b remove pizza autovote 2022-11-09 23:27:16 +02:00