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

563 Commits (30405e18414ab35589eeba81807569e4ca9d8daf)

Author SHA1 Message Date
Aevann1 49263fdd86 Revert "stop using background css property and use its parts instead" 
This reverts commit e4e67a4424.
 2022-12-04 00:17:35 +02:00
Aevann1 e4e67a4424 stop using background css property and use its parts instead 2022-12-04 00:11:02 +02:00
Aevann1 fa0bb57253 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3175605?context=8#context 2022-12-03 04:14:01 +02:00
Aevann1 3e42918afb minor background dedup 2022-11-29 05:37:56 +02:00
Aevann1 3183e0a28e dont allow ppl to use transparent theme without background 2022-11-28 08:11:07 +02:00
justcool393 0ff034b01b add typing to a bunch of routes 2022-11-26 15:00:16 -06:00
Aevann1 642d19b861 move ratelimit_user after auth 2022-11-26 01:37:04 +02:00
justcool393 007e41e7d0 security: validate YouTube link IDs 2022-11-22 06:13:44 -06:00
justcool393 272e2ee936
sneed (rename procoins to marseybux) (#472) 
* sneed (rename procoins to marseybux)

* literally unusable

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 18:08:29 -05:00
Aevann1 2f31fdfdd7 Revert "remove User.newtab and see if anyone complains" 
This reverts commit 787c89961f.
 2022-11-21 18:55:13 +02:00
justcool393 427d8f643d ratelimiting: use ratelimit_user everywhere 2022-11-21 09:30:27 -06:00
Aevann1 787c89961f remove User.newtab and see if anyone complains 2022-11-21 16:36:17 +02:00
Snakes db329f487f
User.pay_account everywhere, fix lottery payout. 2022-11-20 05:50:02 -05:00
Aevann1 785fb28bb2 fix bug when 2fa toggle looked like it didnt apply 2022-11-18 22:07:07 +02:00
Aevann1 6d607a6f59 give ppl a message when they change their settings sucessfully 2022-11-15 16:33:21 +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
Aevann1 41ab1f313c move feature_required wrappers up 2022-11-14 18:14:47 +02:00
Snakes d3f25739f0 Fix ratelimit_user on 3 routes, make proper dec. 2022-11-13 07:25:57 -05: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 27a8fd4657 same as last commit 2022-11-12 12:11:46 +02:00
Aevann1 780e0f85f1 fix 500 error 2022-11-09 19:58:32 +02:00
Snakes e0f43c3668
Remove is_nofollow from backend. 2022-11-09 10:05:36 -05:00
geese-suck 462e3421b5
organize templates (#435) 
dude file management lmao
 2022-11-09 01:11:46 -05:00
Aevann1 23a241f026 fix https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3040826?context=8#context 2022-11-08 10:08:09 +02:00
justcool393 2c043d20e7 css fix 2022-11-07 21:40:11 -06:00
justcool393 7a0fe8015e css: redirect 2022-11-07 20:53:57 -06:00
Snakes 61957ba9ef
Fix /settings/namecolor data key to match frontend. 2022-11-07 16:15:25 -05:00
justcool393 c6e3df3340 settings: fix NSFW toggle 2022-11-06 23:45:21 -06:00
Aevann1 14b19ac950 add two words to the message 2022-11-07 07:15:46 +02:00
justcool393 771f1972aa fix custom filters 2022-11-06 22:50:45 -06:00
justcool393 af696a2f9c verified fixes again 2022-11-06 22:31:38 -06:00
justcool393 0c7d8f0da1 fkjdhfkjdhfdkjfhdkf 2022-11-06 20:06:37 -08:00
justcool393 424e9bc0ae sanity check 2022-11-06 20:06:37 -08:00
justcool393 54fecd99e5 fix poor, fix 500, sanitize fun stuff 2022-11-06 20:06:37 -08:00
justcool393 7de3bb064c make API message better 
also make unchecking the box hide the permalink
 2022-11-06 20:06:37 -08:00
justcool393 57df202cfa don't disable flags 2022-11-06 20:06:37 -08:00
justcool393 657c00244a sanitize, fix bug with update_flag, and update copy for low tsfriends 2022-11-06 20:06:37 -08:00
justcool393 502314ad3c colors: filter properly 2022-11-06 20:06:37 -08:00
justcool393 c2350d36bf add patronage message and message for when it's enabled permanently 2022-11-06 20:06:37 -08:00
justcool393 06736dfb75 fix badge id 2022-11-06 20:06:37 -08:00
justcool393 4d2f429954 enable permanence code and fix some bugs with setting frontsize and some other things 2022-11-06 20:06:37 -08:00
justcool393 d26294de5c don't attempt to set the filter if not in the request 2022-11-06 20:06:37 -08:00
justcool393 edc969e2cd use /settings/personal instead of /settings/profile 2022-11-06 20:06:37 -08:00
justcool393 78c53c1954 debug 2022-11-06 20:06:37 -08:00
justcool393 c10b3e4262 fix prev commit 2022-11-06 20:06:37 -08:00
justcool393 83fe77c039 settings: implement backend logic for permanent filters 2022-11-06 20:06:37 -08:00
justcool393 72da55fd61 settings: implement front end for perma-filters 2022-11-06 20:06:37 -08:00
justcool393 511ed26574 settings: add new settings pages to API 
settings: remove old settings pages from API
settings: delete unused settings template
 2022-11-06 20:06:37 -08:00