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

132 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann1 532ebd3ac8 standardize g.db behavior 2022-11-15 17:39:00 +02: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
Snakes 8fee66c894
Reorder decorators to support f63237a9a2. 
Ultimately necessary because otherwise all bots share rate limits
with each other. The somewhat haphazard ordering of decorators bothers
me, but it's functionally required.

Approaches using request context (like reading the Authorization
header in ratelimit_user) likely produce bugs all their own.
 2022-11-13 05:18:52 -05:00
justcool393 aa272729f1 default ratelimit and default ratelimit slower 2022-11-13 00:43:47 -06:00
justcool393 80d7d5281d ratelimit_user() wrapper 2022-11-13 00:07:15 -06:00
Aevann1 f41b09cc07 small change to /admin/app 2022-10-28 22:13:58 +02:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
justcool393 f4af073253 fix 17 potential 500s 2022-10-16 02:51:42 -07:00
Aevann1 356c9f1219 add "(Admin)" to messages sent to users due to admin actions (for clarity to new users) 2022-10-10 08:11:17 +02:00
justcool393 02d0e2043e rename APPS_MODERATE to APPS_MODERATION 2022-10-06 00:40:36 -07:00
justcool393 20bd38b5d3 add oauth permissions 2022-10-05 22:33:55 -07:00
justcool393 376566e723
return 404 if oauth app doesn't exist (#366) 
fixes an AttributeError if the oauth app doesn't exist
 2022-09-23 14:08:54 +02:00
Aevann1 e0d32c7105 dont send me a notif 2022-09-12 19:52:07 +02:00
Aevann1 fbe7089d2a more detailed success message description 2022-09-11 16:32:00 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Aevann1 84dc2b3973 don't notify me of smth I did 2022-08-25 17:56:51 +02:00
Aevann1 a8f62aecdb reserve app management to JL3 2022-08-05 20:45:43 +02:00
Aevann1 81b762fbc2 add a discord server for api users to help eachother 2022-07-18 02:46:46 +02:00
Aevann1 48cbe8a6b1 allow ppl to revoke app authorizations 2022-07-15 02:12:54 +02:00
Aevann1 2d21863e19 replace "request.host" with "SITE" 2022-07-13 20:14:37 +02:00
Aevann1 a8fe49f232 kitchen sink commit, all over the place 2022-07-08 21:03:04 +02:00
Aevann1 cff34fb3a4 reducing query volume, #2 2022-06-26 03:11:02 +02:00
Aevann1 f60db1598d replace "g.db.query" on pkeys with the much more efficient "g.db.get" 2022-06-18 02:57:23 +02:00
Aevann1 6b10d097a2 mn 2022-05-05 01:09:46 +02:00
Aevann1 47d01ed00b vb 2022-05-03 04:15:35 +02:00
Aevann1 78ea56837f fds 2022-04-17 22:20:40 +02:00
Aevann1 579e81de2a site settings 2022-04-12 21:05:50 +02:00
Aevann1 889a8948c4 fsd 2022-04-04 03:41:20 +02:00
Aevann1 7713fd891d fsd 2022-04-02 19:11:35 +02:00
Aevann1 b02b27ce4f fds 2022-03-31 17:00:57 +02:00
SocietyMoment 9592f37756 Fixed oauth error (#223) 2022-03-17 09:14:46 +02:00
Aevann1 5871c6106e vc 2022-02-22 13:43:38 +02:00
Aevann1 833009bd14 gdf 2022-02-21 03:58:12 +02:00
Aevann1 f4557237c6 xcv 2022-02-13 04:04:57 +02:00
Aevann1 820d8387f9 xv 2022-02-07 13:39:26 +02:00
Aevann1 50a7cfc0c1 xvc 2022-02-01 02:07:15 +02:00
Aevann1 59027a7276 fds 2022-02-01 02:03:39 +02:00
Aevann1 db0a881326 df 2022-02-01 01:10:22 +02:00
Aevann1 b7311c61a3 dfs 2022-01-29 18:10:31 +02:00
Aevann1 e493592a23 vc 2022-01-24 22:26:15 +02:00
Aevann1 2b6418a132 testing 2022-01-15 08:31:17 +02:00
Aevann1 c9098526ed b 2022-01-14 14:04:34 +02:00
Aevann1 92a24b5b2f bbb 2022-01-14 08:40:30 +02:00
Aevann1 b69199054c under attack 2022-01-09 17:15:02 +02:00
Aevann1 d0f3ae65e5 sfd 2022-01-07 23:03:14 +02:00
Aevann1 2c7a98e433 big one 2022-01-06 18:46:09 +02:00
Aevann1 00e5e1c048 fsd 2022-01-02 02:06:46 +02:00
Aevann1 22716fa0ab fds 2021-12-30 07:52:26 +02:00
Aevann1 4135175d8a fdssfd 2021-12-20 22:03:59 +02:00
Aevann1 efff0400ef fsfs 2021-12-20 02:27:25 +02:00
Aevann1 68bc992da1 sfdsdf 2021-12-19 15:01:28 +02:00
Aevann1 edca73723a sfdsfd 2021-12-09 23:21:52 +02:00
Aevann1 00366f64a2 sdffsd 2021-12-01 19:41:33 +02:00
Aevann1 65d2090cd8 fdsfsd 2021-11-18 16:21:19 +02:00
Aevann1 f8f91d4a24 sfdsfd 2021-11-16 06:18:36 +02:00
Aevann1 9e449dd8b0 redundant 2021-11-06 17:52:48 +02:00
Aevann1 989e622078 Merge branch 'master' of https://github.com/Aevann1/Drama 2021-11-02 13:33:41 -07:00
Aevann1 83dcd2b198 fds 2021-11-02 13:33:36 -07:00
Aevann1 9387b2f425 yolo 2021-11-02 17:17:16 +02:00
Aevann1 aeac766df3 misc 2021-10-25 20:08:03 +02:00
Aevann1 ef42cfdba8 send notif to carp 2021-10-23 18:10:05 +02:00
Aevann1 abc11732d2 fsdfds 2021-10-15 17:59:23 +02:00
Aevann1 efa408ab2c fd 2021-10-15 16:08:27 +02:00
Aevann1 28c5502d94 fdsfds 2021-10-08 03:41:25 +02:00
Aevann1 82ff6c45a9 dfsfds 2021-10-08 03:40:47 +02:00
Aevann1 fd2d6def63 fdsfsd 2021-10-08 03:40:09 +02:00
Aevann1 3233424c83 dsffds 2021-10-08 03:38:32 +02:00
Aevann1 f09d25fd04 fdsfsd 2021-10-07 08:04:29 +02:00
Aevann1 79e6356b29 dfs 2021-09-28 21:45:17 +02:00
Aevann1 731351e5a2 fsddsf 2021-09-19 15:11:34 +02:00
Aevann1 c2b1f50099 df 2021-09-17 10:55:55 +02:00
Aevann1 1aa81273d5 sfd 2021-09-17 10:29:05 +02:00
Aevann1 9fe06dc7fc fd 2021-09-16 19:15:07 +02:00
Aevann1 88ca2d6206 fd 2021-09-16 19:02:58 +02:00
Aevann1 0ba61d8ab1 fd 2021-09-08 08:57:44 +02:00
Aevann1 1c91ec2dfd df 2021-08-30 11:09:32 +02:00
Aevann1 2a2c512639 fdfd 2021-08-22 22:31:12 +02:00
atrc445 6a36d3c1b5 create const.py 2021-08-21 13:06:28 +02:00
Aevann1 7e76d21ac0 fd 2021-08-11 19:01:19 +02:00
fireworks88 6ee0529180 sex 2021-08-09 23:05:17 +02:00
fireworks88 c7ecf65c96 sex 2021-08-09 23:03:36 +02:00
Aevann1 4af2ce2a53 fddf 2021-08-04 17:35:10 +02:00