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

5242 Commits (f1bfb872438935fef158ab5b47e8c2830b0789a4)

Author SHA1 Message Date
justcool393 f1bfb87243 chat: permission for mute bypass 2022-11-16 07:00:03 -06:00
justcool393 5b313dd13d hats: only load routes if feature flag enabled 2022-11-16 06:52:16 -06:00
justcool393 ee8df1e3f1 chat: mops are unmutable 2022-11-16 06:38:24 -06:00
justcool393 1559de125c add error handler 2022-11-15 23:36:56 -06:00
justcool393 1565d9ca26 use abort(410) instead of the old message.html template 2022-11-15 23:32:57 -06:00
justcool393 5dedde4691 admin: move admin pages to admin dir 2022-11-15 17:15:53 -05:00
justcool393 ee8ad10fac fix 500 on IntegrityError 2022-11-15 15:12:36 -06:00
justcool393 519a9f91f8 signup: don't accidentally leak *what* validation error it was 2022-11-15 12:59:38 -06:00
justcool393 711518d942 don't redirect to /signup page if registrations are closed 2022-11-15 12:56:57 -06:00
justcool393 01e18dc28b remove unnecessary checks 
* in post_reset even if get_account could return a None, it'd 500 anyway
* lmao even in get reset (why is this done twice anyway?)
 2022-11-15 11:11:22 -06:00
justcool393 b2f5cf92d0 change msg to be more clear 2022-11-15 10:56:40 -06:00
justcool393 b95ee0864e fix 2fa bug 2022-11-15 10:56:04 -06:00
justcool393 3d7737387c use default config vlaue const everywhere 2022-11-15 10:55:00 -06:00
Aevann1 532ebd3ac8 standardize g.db behavior 2022-11-15 17:39:00 +02:00
Aevann1 b130139f3d sneed 2022-11-15 16:55:21 +02:00
Aevann1 4dbc4096d3 remove weird variable 2022-11-15 16:45:18 +02:00
Aevann1 6d607a6f59 give ppl a message when they change their settings sucessfully 2022-11-15 16:33:21 +02:00
justcool393 9b734a8e3a fix ghost 2022-11-15 08:21:37 -06:00
justcool393 a9ebe37e61 sddsdsd 2022-11-15 06:52:17 -06:00
justcool393 3fba55b4ae fix unread 500 2022-11-15 06:51:48 -06:00
justcool393 08b88ef89b we don't need requests 2022-11-15 05:38:37 -06:00
justcool393 022a81a4b9 remove unnecessary feature_required flags, moving them to the routes import 2022-11-15 05:37:53 -06:00
justcool393 b2d0671734 merge fix: remove a couple of unnecessary from flask import *s 2022-11-15 05:28:45 -06:00
justcool393 781daeed2f fix thumbnail thread redux i think 2022-11-15 04:57:49 -06:00
justcool393 60748e4135 add TODO for migration of old comments 2022-11-15 04:43:19 -06:00
Snakes 604321512e
Fix userpage listing sort order (merge error?). 2022-11-15 05:40:16 -05:00
justcool393 168e5d04b9 give the thumbnail thread their own db_session 2022-11-15 04:34:35 -06:00
Snakes e896aaa1f7
Fix comment rendering when pin.level > 1. 2022-11-15 05:29:47 -05:00
justcool393 4b9c702877 fix listing bugs 2022-11-15 03:28:39 -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 c9ecb5d535
account linking improvements (#448) 
currently account delinking is very messy and can sometimes just not work
we do codey stuff so it's not as bad
also we create a pretty page for mops to mop up borked account links

* alts: allow proper delinking

* fix prev commit

* url fix

* fix 500

* fixes

* :pepodrool:

* flag

* :pepodrool: redux

* sdsdsdsds

* correct endpoint

* fix html page

* alts: only adjust session history if flag is set

* fix 500

* allow relinking

* fsdsds

* :pepodrool: redux

* alts: don't fail if an alt isn't history

* use postToastSwitch + some API changes

* remove unnecessary variables

* d-none

* delink accounts mod action

* fa-link-slash

* alts: add form to create alt

* remove copied and pasted template

* rounded section

* UI improvement + fix

* \n

* fix status

* admin: remove duplicate route
admin: do a permissions check on 2 pages that need it
admin: set the manual flag for manually flagged alts

* variable change

* fix 500

* alts

* add shadowban icon to alt link tool

* shadowbanned tooltip

* add user info section

* fix 500, remove unnecessary form, and add alt votes button

* trans and also link to page

* margin

* sdsdsd

* stop the count

* fix prev commit

* with ctx

* plural

* alts

* don't show shadowbanned users to those who can't see them
this is... extremely rare and won't ever be seen in production however if perms were ever rearranged in the future, this keeps permissions correct

* shadowban check in alt list

* let shadow realm enthusiasts see shadowban alts

* sdsdsds

* test

* be graceful where needed

* sdsdsdsds

* alts: don't allow adding the same account
alts: clarify wording

* rename and reorder on admin panel

* EOL

* remove frankly unnecessary check

* try with a set

* test

* Revert "try with a set"

This reverts commit 72be353fba5ffa39b37590cc5d3bf584c94ee06e.

* Revert "Revert "try with a set""

This reverts commit 81e41890a192e8b46d0463477998e905fddf56ba.

* Revert "Revert "Revert "try with a set"""

This reverts commit be51592135a3c09848f993f0154bd2ac862ae505.

* clean up test
 2022-11-14 12:32:13 -05:00
justcool393 000b4f4c37 can post in ghost threads 2022-11-14 11:20:34 -06:00
Aevann1 41ab1f313c move feature_required wrappers up 2022-11-14 18:14:47 +02:00
justcool393 d3aea510f8 remove base 36 crap 2022-11-14 10:10:16 -06:00
Snakes 4aedbc9b2e
Fix imports for sub move frontlist invalidation. 2022-11-14 04:14:41 -05:00
Aevann1 58c4db0399 change casino ratelimit 2022-11-14 08:20:19 +02:00
Aevann1 ac8c1d524d "moved into cc" -> "marked as cc" 2022-11-14 07:49:23 +02:00
Aevann1 e83be235ba delete frontpage cache when moving posts 2022-11-14 07:49:23 +02:00
justcool393 df992db1db signups: notify me on signups 2022-11-13 22:01:02 -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 39e7e61bcb posts: make ghost threads cost DC again 
who the hell disabled this
 2022-11-13 19:52:32 -06:00
Snakes cc8f2d1a6e
Restrict permabanned editing content. 2022-11-13 19:00:55 -05:00
Snakes f6dea300b0
Adjust shadowed comment visibility. 
- Don't show shadowed comments to non-jannies in notifications.
- Auto-collapse for jannies in notifs/threads.
 2022-11-13 17:13:14 -05:00
Snakes d3f25739f0 Fix ratelimit_user on 3 routes, make proper dec. 2022-11-13 07:25:57 -05:00
Snakes dd912addd1
chat: allow dev envs, clarify error message. 2022-11-13 06:43:08 -05:00
justcool393 d7f07dcd67 chat: allow club users into chat as well 2022-11-13 05:37:53 -06:00
justcool393 681d8b482a chat: impose truescore chat limit 2022-11-13 05:31:48 -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