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

1235 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann 57e9cb3428 remove .deleted column for alts 2023-02-18 17:19:14 +02:00
Aevann ef2bda6920 remove relinking 2023-02-18 16:55:18 +02:00
Aevann 2da4d08ad0 remove print debugging 2023-02-09 06:05:34 +02:00
Aevann 463a32e021 print debugging in devrama 2023-02-09 06:03:20 +02:00
Aevann fc9b55c776 allow me to change settings in devrama 2023-02-09 06:02:39 +02:00
Aevann a9ec1735c9 fix typo 2023-02-09 06:00:37 +02:00
Aevann 44a80f0492 make under_attack a setting and use it in /submit for WPD 2023-02-09 05:50:30 +02:00
Aevann 88814ee208 expand blackjack 2023-02-07 05:31:49 +02:00
Aevann 95938ee3ec make sure all comment links have #context 2023-02-07 04:34:11 +02:00
Aevann 925fd0497a disable showmore button in sidebars 2023-02-06 05:34:09 +02:00
Aevann 0b30067876 tweak admin perms 2023-01-29 10:28:29 +02:00
Aevann 3b4211e8e1 stop using nullslast rDrama/rDrama#102 2023-01-28 10:25:19 +02:00
Aevann c45cd0fde8 make a UI for /admin/dm_images 2023-01-27 14:24:39 +02:00
Aevann 349fa17836 use exlamation marks instead of dots in responses to users 2023-01-27 13:57:29 +02:00
Aevann ceee02fbce add button to blacklist users from restricted holes 2023-01-25 17:41:46 +02:00
Aevann 94d7042512 add progstack btn to comments 2023-01-25 13:35:37 +02:00
Aevann b23dc76d78 fix muting linking alts 2023-01-25 04:53:52 +02:00
Aevann 680135755e Revert "get rid of get_alt_graph" 
This reverts commit e2e3da4bda.
 2023-01-25 04:51:48 +02:00
Aevann 585d8f9695 fix make admin button 2023-01-25 03:53:20 +02:00
Aevann 947be4fef6 fix missing perm 2023-01-25 03:07:49 +02:00
Aevann e2e3da4bda get rid of get_alt_graph 2023-01-25 03:07:30 +02:00
Aevann 7e8329c296 remove account merging stuff 2023-01-24 14:20:30 +02:00
Aevann 95674fa39a fix /admin/alts 2023-01-24 12:32:06 +02:00
Aevann 757c244f65 allow JL4 to unpin award pins 2023-01-24 12:24:27 +02:00
Aevann c1268d396b make it not possible to sticky removed comments 2023-01-24 12:23:19 +02:00
Aevann f1bdfa8eda disable modaction for login_required 2023-01-24 07:48:27 +02:00
Aevann 223909a2f8 fix 500 error on muting 2023-01-24 06:53:07 +02:00
Aevann d1ee3ba0a3 fix 500 error 2023-01-23 14:44:30 +02:00
Aevann bdaced6c10 allow admins to apply progstack 2023-01-23 14:40:44 +02:00
Aevann 8396126606 add dm images 2023-01-23 11:58:38 +02:00
Aevann 11aef2ae3d make mutes propagate 2023-01-23 10:06:32 +02:00
Aevann 7f1ddf5c0c fix delinking alts 2023-01-22 10:20:38 +02:00
Aevann 24edb49f3b add jl5 (for me) 2023-01-22 10:04:49 +02:00
Aevann 35808e9fd7 use username instead of id in linking/delinking mod notes 2023-01-21 07:54:29 +02:00
Aevann e3fc980984 order /banned and /admin/shadowbanned by ban reason 2023-01-21 07:50:48 +02:00
Aevann a40dee5bd8 improve user ratelimiting 2023-01-21 06:39:46 +02:00
Aevann d82835a968 same as last commit 2023-01-20 03:31:51 +02:00
Aevann dd3dfa5197 make users list viewable by everypony 2023-01-01 16:52:16 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 78351abc4c clean up legacy stuff 2023-01-01 03:17:07 +02:00
Aevann 7a529e70f8 disallow chudding and banning ppl for negative days 2023-01-01 02:58:37 +02:00
Aevann af59e82528 restore banning domains 2022-12-30 18:24:20 +02:00
Aevann 5c13700080 hide ghost identity leak in dev console 2022-12-30 18:22:57 +02:00
Aevann e0e8eb3dd6 fix mod log links 2022-12-30 18:10:29 +02:00
Aevann 0bbe5d5ddd show live commit to everyone 2022-12-30 15:32:58 +02:00
Aevann 909e3f5f29 use a cool flask feature i didnt know about 2022-12-29 12:39:10 +02:00
Aevann 1ec32c3895 combine 2 replace statements 2022-12-29 12:35:49 +02:00
Aevann f7aa7d8dfd better error messages 2022-12-28 11:50:48 +02:00
Aevann 53fcc2ac40 fix reverting admin actions showing wrong username in toast 2022-12-28 11:47:30 +02:00
Aevann 7b71c36e3f require reason for banning 2022-12-28 11:31:27 +02:00
Aevann 181a660760 comment domains for now 2022-12-28 06:12:57 +02:00
Aevann bf00867fe8 fix devrama settings 2022-12-27 15:35:14 +02:00
Aevann 68c00456f0 patch another janny xss 2022-12-27 08:11:44 +02:00
Aevann 5fdec63e8c disallow changing site settings in devrama 2022-12-27 07:25:29 +02:00
Aevann 512c864327 fix xss on banning domains (only admins could use it) 2022-12-27 07:18:46 +02:00
Aevann 465565f26c give error when domain ban reason too long 2022-12-27 07:02:14 +02:00
Aevann 84bff9cb44 fix 2022-12-27 06:32:53 +02:00
Aevann d607e57c92 fixes 2022-12-27 06:24:25 +02:00
Aevann 0fb7418ad9 disable removing jannies in devrama 2022-12-27 06:01:57 +02:00
Aevann 644772d397 replace mention pfps too 2022-12-26 21:00:49 +02:00
Aevann f37e1dc702 disallow jannoids from undoing chud awards 2022-12-26 04:38:32 +02:00
Aevann c4fc37d23a remove unnecessary stuff since im deleting olduser now 2022-12-25 08:15:27 +02:00
Aevann 829db5684b perserve site stats on cache.clear() 2022-12-25 08:14:30 +02:00
Aevann 67f71997b6 move g.db.commit() 2022-12-25 08:13:07 +02:00
Aevann c798eb5090 no point using gevent if the worker timeout is the same lol 2022-12-25 08:12:49 +02:00
Aevann 4a93626040 partially revert prev commit and fix it 2022-12-25 07:54:34 +02:00
Aevann 2f48039a4b minor /move fix 2022-12-25 07:50:31 +02:00
Aevann 6ce3402726 migrate mentions too 2022-12-25 06:53:12 +02:00
Aevann ed16d42377 actually redirect to old_id instead of new_id 2022-12-25 06:37:29 +02:00
Aevann 987db717d6 use gevent for moving account shit 2022-12-25 06:25:47 +02:00
Aevann dc2c2fdc74 expand moving account shit 2022-12-25 06:02:33 +02:00
Aevann 715fecbb15 more detailed toast on banning/chudding 2022-12-25 00:45:01 +02:00
Aevann 7da9a224e9 don't cache user objects in redis 2022-12-24 18:53:13 +02:00
Aevann 9979efbf7a make it possible to edit badge attributes without removing and re-granting them 2022-12-23 03:01:24 +02:00
Aevann a54734c32f better caching for get_alt_graph 2022-12-22 23:24:36 +02:00
Aevann e6274e06f3 delete ability of jannies to clear internal cache 2022-12-22 22:52:36 +02:00
Aevann 92cbe64ac0 cache get_alt_graph for 1 hour 2022-12-22 22:44:37 +02:00
Aevann 0e6b144ed7 alt graph 2022-12-22 22:03:40 +02:00
Aevann1 1dab4f7804 fix last commit 2022-12-21 18:17:14 +02:00
Aevann1 faf17f420c add notification for make_admin and remove_admin 2022-12-21 16:38:02 +02:00
Aevann1 3ae5292ce4 remove pcm from code 2022-12-21 14:42:41 +02:00
Aevann1 e832be4c18 restore badge rate limit 2022-12-19 15:55:39 +02:00
Aevann1 54e3a7eeab fix 500 error 2022-12-18 19:01:06 +02:00
Aevann1 4a334133bc same as last commit 2022-12-18 18:47:11 +02:00
Aevann1 31aa9b09a8 relax ratelimit for badge_grant 2022-12-18 18:46:44 +02:00
Aevann1 9974f98b8c Revert "Revert "remove the logic for fixing old mentions"" 
This reverts commit 5e9e1872af.
 2022-12-17 21:11:22 +02:00
Aevann1 5e9e1872af Revert "remove the logic for fixing old mentions" 
This reverts commit 90f6f0b96e.
 2022-12-17 21:05:29 +02:00
Aevann1 b6c01fb275 clicking twice shouldn't generate a mod log 2022-12-16 22:17:03 +02:00
Aevann1 90f6f0b96e remove the logic for fixing old mentions 2022-12-16 19:50:34 +02:00
Aevann1 8660fcaa2e fix old mentions 2022-12-16 19:47:40 +02:00
Aevann1 7c389bbdfd fix old mentions 2022-12-16 19:43:06 +02:00
Aevann1 bd8ac649d4 order punished listings by truescore instead 2022-12-15 20:31:58 +02:00
Aevann1 1773632a75 remove punished listings filtering 2022-12-14 15:17:39 +02:00
Aevann1 df804c3179 minor change to punished listings 2022-12-14 15:12:02 +02:00
Snakes cf5eff3f48
Revert "better shadowban propagation" 
This reverts commit 129f335363.

If there exists a loop in alts, this sends a worker into an infinite
loop, thrashes the database, and eventually crashes the worker. This,
in practice, makes shadowbanning people with many alts impossible since
our alt linking algorithm almost explicitly creates cycles rather than
maintaining a tree.

To fix this, we need SQL that builds a set of all Users in the
connected Alt graph of a given user (likely using a recursive CTE)
and then bans them at once, rather than running a depth-first search
with maximum depth that doesn't remember previously visited nodes.

There is also potentially the chance that this isn't because of cycles
per se but rather because quintic polynomial behavior explodes quickly
even in the low-double-digits number of alts.
 2022-12-13 23:21:53 -05:00
Aevann1 b923776e71 simplify punished listings 2022-12-14 00:29:56 +02:00
Aevann1 c10c00473a make is_banned fkey on user id 2022-12-14 00:02:53 +02:00
Aevann1 129f335363 better shadowban propagation 2022-12-13 23:12:58 +02:00
Aevann1 b531d38384 small change to punish listings 2022-12-13 20:54:18 +02:00
Aevann1 36fca9caab minor bugfix 2022-12-13 20:50:38 +02:00
Aevann1 0376124eb0 clearer notifications for hole and admin actions 2022-12-13 19:11:26 +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
Aevann1 033e4dd35c disable janny chudding in /h/chudrama 2022-12-10 15:06:30 +02:00
Aevann1 b2591daa2b filter 0 truescore from punishment listings 2022-12-10 10:57:48 +02:00
Aevann1 45be6970d6 punished users listing fixes 2022-12-10 10:23:56 +02:00
Snakes 39a0832223
Sort banned, chudded, etc listings by activity. 
The listings of users affected by jannied states are long. To make
them more useful, sort by recent user activity (when v is allowed to
view last_active) to know which accounts are still in use.
 2022-12-09 23:47:31 -05:00
Aevann1 25cd81e326 dont allow admins to remove themselves 2022-12-09 07:58:44 +02:00
Aevann1 f95f4f2c97 simplify badge granting/removal 2022-12-07 21:03:06 +02:00
Aevann 18df70caab allow JL3 to edit rules (#39) 
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Reviewed-on: rDrama/rDrama#39
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-05 05:22:08 +00:00
Aevann1 3971607aee fix agendapostered wall comments 2022-12-05 05:08:06 +02:00
Aevann e105035272 remove country club system and replace it with a 3 tier thing: (#41) 
- /h/masterbaiters: 1 TS - for gayops

- /h/countryclub: 1000 TS - for anything requiring secrecy and doesnt need critical mass - have to make it a rule that u cant post gayops in /h/countryclub

- /h/chudrama: 5000 TS - for chad+stud posts

EDIT: i removed the /h/masterbaiters gate, but u can bring it back if u want
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#41
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-04 18:39:06 +00:00
Aevann1 3542703ced Revert "make it so only the post author can declare winner and not all admins" 
This reverts commit 9e1425d93e.
 2022-12-03 00:08:46 +02:00
Aevann1 9e1425d93e make it so only the post author can declare winner and not all admins 2022-12-03 00:06:57 +02:00
Aevann1 87ae34966b badge perm shit 2022-11-30 23:15:10 +02:00
justcool393 0106a4e340 antispam: under siege mode 2022-11-30 11:37:35 -06:00
Snakes 9fcdd65d38
PCM: improve Kippy's inflationary ergonomics. 2022-11-29 17:18:33 -05:00
justcool393 5056f09380 chat: fix 500 on some... weird... state... i think? 
cache: get out of jinja templates
chat: threshold is now a const
 2022-11-29 15:49:23 -06:00
Snakes 0dd7809b49
Sort banned_domains deterministically. 2022-11-29 16:24:13 -05:00
Snakes 7551add5d8
Unify admin badge page listings source. 2022-11-27 17:02:18 -05:00
Snakes 427f54175c
WPD: constantify badge whitelist, extend set. 2022-11-27 16:49:20 -05:00
Aevann1 61612e7be3 fix missing "+ 1" 2022-11-27 02:19:50 +02:00
Aevann1 bcbf524fbe make sure stickied child comments are always at the top place they can be 2022-11-26 06:01:20 +02:00
Aevann1 bf72234873 remove SITE url from badge urls to make them relative in the event of a future domain change 2022-11-26 03:45:20 +02:00
Aevann1 bf4031c832 remove annoying excalmation sign in notifs 2022-11-26 01:18:24 +02:00
justcool393 6acd896967 sbs: since propagation isn't optional anyway, let's propagate on a ban to get their alts 2022-11-22 09:51:44 -06:00
Aevann1 0b1f166211 remove "alts" checkbox for shadowbanning since shadowbans propagate anway via check_for_alts() 2022-11-22 17:44:16 +02: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
justcool393 153fb4e2a2
[DO NOT MERGE] titlesssssssssss (#468) 
* titles

* testing

* self

* Revert "self"

This reverts commit d6c12d5a5ba125feb44673f55e1fdac75f151cb5.

* Revert "testing"

This reverts commit 86d800f9fd552196b31f0e0b3891d4fc072a9bc0.

* testing on devrama

* rewrite the html head

* reference error or smth idk

* tempalte debug

* template debug redux

* default2

* rename default2 -> root, page title

* fix settings2

* include the set_variables block

* root scope variables 2

* test 3

* remove unnecessary set

* add pagetitles to all settings2 pages

* add pagetitle to casino

* remove bloat

* remove duplicate site name thingy

* page titles 2

* page titles 3

* remove duplicate imports and add page titles everywhere iirc

* ok but actually this time

* remove unnecessary newlines

* fix title lol

* >

* fsdfsfsfsfsfs

* fsfs

* template configurations

* fix 500

* reduce login template bloat

* move files and add status codes where needful

* move authfroms to login

* remove 2fa bloat

* verification code

* sign up fixes

* readability

* fssfsfsfs

* move forgot password to login/

* readability

* don't emit comments

* add page titles where needful

* gsgsgs

* modals: move to respective pages

* testing on devrama

* get home garbage out of title

* remove insane amount of icon duplication

* sign up text

* add votes pagetitle

* fix blank lines

* Revert "fix blank lines"

This reverts commit b2c54339970725d00b6fc82bb458c1757909952c.

* Fix blank lines on sign_up.html.

* title: votes.html more meaningful identifier.

* titles: Lottery, Directory, Notifications

* head final in submission.html

* fix missing comma

* >

* test

* title: /comments

* fsfsfsfsf

* titles: user_cards

* head: only load video and audio meta attributes if they actually exist

* titlessssss: /admin/lottery/participants

* titlessssssss: extra quote in search.html

* titlessssss: userpage voters.

* titties: /h/<sub>/{followers,blockers,exilees[sic]}

* test banner

* Revert "test banner"

This reverts commit c3d875d03f3e60d72a60dab7d28bf108554a5826.

* make submit.html inherit from default.html

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 02:52:22 -06:00
Snakes db329f487f
User.pay_account everywhere, fix lottery payout. 2022-11-20 05:50:02 -05:00
Aevann1 caff8815ee restore pinning to how it was before JC raped it 2022-11-19 17:36:37 +02:00
justcool393 750a87713f pins: fix removal behavior 2022-11-19 08:24:32 -06:00
justcool393 33878fcd02 remove unnecessary check 2022-11-19 07:46:23 -06:00
Snakes ce84861a44
admin_home: add git HEAD to server status. 2022-11-18 14:05:47 -05:00
justcool393 5dedde4691 admin: move admin pages to admin dir 2022-11-15 17:15:53 -05:00
justcool393 b2d0671734 merge fix: remove a couple of unnecessary from flask import *s 2022-11-15 05:28:45 -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
Aevann1 41ab1f313c move feature_required wrappers up 2022-11-14 18:14:47 +02:00
justcool393 aa272729f1 default ratelimit and default ratelimit slower 2022-11-13 00:43:47 -06:00
Aevann1 42e40c1691 split off muting and unmuting 2022-11-12 11:11:34 +02:00
Aevann1 05b7e79b76 remove the code i added for rdrama.com 2022-11-11 15:52:18 +02:00
justcool393 26549a6e66
remove logged out routes (#433) 
* remove /logged_out/ routes

* update sitemap, remove users route, and update header

* cloudflare cookie

* only mess with the cookie whenever we desire auth

* sitemap: (small) improvements
sitemap: fix little bug i introduced
sitemap: fix login redirects for /id/ routes

* sitemap: remove duplicate entry

* contact is auth desired

* imports: don't import what we don't need and bind late to the db

* praying to god this works

* keep yourself safe

* oh i actually need to commit and push lol

* import Sub

* t

* refix cache purger
 2022-11-09 00:35:24 -05:00
Aevann1 c76bfa5ffc fix 3 permapin limit not working 2022-11-08 11:41:16 +02:00
Aevann1 3f4a568d32 fix permachudding 2022-11-08 05:37:18 +02:00
Snakes 5e35342d2e Fix Cloudflare imports identifier shadow. 
Proximal reason for fix is that /admin/clear_cloudflare_cache resulted
in infinite recursion and a stack overflow because it tried to call
itself as `clear_cloudflare_cache` rather than hitting the function of
the same name in files.helpers.cloudflare.
 2022-11-07 17:30:15 -05:00
Aevann1 50bcc81f14 give user an error when they give invalid page input 2022-11-07 23:34:43 +02:00
justcool393 0fffa7efc0 rename truecoins to truescore 2022-11-06 23:04:34 -08:00
Aevann1 3b49535c4a make 3 more buttons instant 2022-11-07 08:26:41 +02:00
Aevann1 ce6998bd6e make shadowbanned, banning, chudding from the userpage work without refreshing the page 2022-11-07 08:08:53 +02:00
Aevann1 07f4383d4c unmarked as chud -> unchudded 2022-11-07 07:44:09 +02:00
Aevann1 99a44f461c fix chud badge not being given 2022-11-07 07:43:25 +02:00
Aevann1 a664d19c37 rename 2 modlog actions 2022-11-07 03:47:27 +02:00
Aevann1 bbfb18da9a change clearing cache terminology 2022-11-06 07:28:47 +02:00
Aevann1 c1937a67c4 fix 0.0001 days being displayed as "0 days" 2022-11-05 05:06:33 +02:00
Aevann1 299dbceeeb only add reason if there's a reason 2022-11-05 04:48:04 +02:00
Aevann1 f924f88821 make "unshadowban" button work instantly 2022-11-05 04:16:43 +02:00
Aevann1 87d5a0de46 improve ban modal and add chud modal 2022-11-05 04:12:22 +02:00
Aevann1 ab9c0288fb make "unban user" button in userpage work instantly 2022-11-05 04:12:22 +02:00
Aevann1 5ef2b41d5e change chud theme terminology 2022-11-05 04:12:21 +02:00
Aevann1 07a12380de accomodate alt domain 2022-11-03 17:29:14 +02:00
justcool393 4a252e9699 security: fix CSRF on internal cache dump route 
move dumping internal cache to admin tools
 2022-11-02 20:35:46 -05:00
justcool393 09f76d917d permissions: check if user can dump internal cache before attempting to do it 2022-11-02 20:22:22 -05:00
Aevann1 f73c6d46df accomodate rdrama.com users 2022-11-02 08:31:04 +02:00
Aevann1 111c9ab208 fix this https://rdrama.life/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3007141?context=8#context 2022-11-02 05:22:16 +02:00
justcool393 6caebac946 actions: move user-only actions to useractions, which gets rid of a circular dependency 2022-11-01 18:46:56 -05:00
justcool393 7d80483f67 alts: only change session data if new include_current_session flag is set 2022-11-01 16:58:42 -05:00
justcool393 2fed50cb46 not post.stickied_utc 2022-11-01 15:19:35 -05:00
justcool393 f665941e16 pins: use variable instead of recomputing again 2022-11-01 15:15:29 -05:00
justcool393 02efc44682 pins: reintroduce bug/feature at @Aevann1's request 
the old behavior was actually to let admins bypass the limit, but this was buggy when the new multi pin thing was added and wouldn't let jannies make permapins if pins were at the limit
to make the code clear though, the permission name has been changed
 2022-11-01 15:14:11 -05:00
justcool393 b17ea4fd37 awards: only restrict admins if award feature flag set 2022-10-31 18:11:49 -05:00
Aevann1 48775dbb5d disallow jannies from undoing ban awards 2022-11-01 01:05:02 +02:00
Aevann1 cc473795bf make banned domains case insensitive 2022-10-31 16:33:11 +02:00
Aevann1 8dd9045a33 allow distinguishing other ppl's comments 2022-10-30 17:32:54 +02:00
justcool393 e6ce4edbd8 templates: remove redundant badge_remove template 
templates: fix badge admin template when removing a badge
 2022-10-29 01:08:29 -05:00
justcool393 3a6dfdf2de listings: constantify PAGE_SIZE as 25 
magic numbers are bad, do better next time
 2022-10-28 22:20:48 -05:00
justcool393 e4d50be763 stickies: fix logic error i reintroduced that @Aevann1 has earlier fixed 2022-10-26 18:32:30 -05:00
justcool393 31eb387c8d pins: remove unnecessary code 2022-10-26 12:23:26 -05:00
justcool393 548f2613c7 pinprovements 2022-10-25 17:48:10 -05:00
Snakes eafa7b8e05
Revert "this is stupid": no fighting in the commit log. 
This reverts commit 1f1ace3d66.
 2022-10-25 11:32:32 -04:00
justcool393 1f1ace3d66
this is stupid 2022-10-25 08:21:37 -07:00
Aevann1 69648de587 minor change to /remove_post 2022-10-25 15:45:44 +02:00
justcool393 0d7437ca1c i am a pro carp hero 2022-10-24 12:43:14 -05:00
justcool393 df7690fb54 fishsticks (prev commit redux) 2022-10-24 12:42:02 -05:00
Aevann1 4b37bd721b prevent carp from undoing award pins 2022-10-24 19:36:35 +02:00
Snakes 97eb823ed0 Fix janny pinning. 2022-10-23 19:47:53 -04:00
justcool393 dbb7296dd7 stickies: allow JL2 to sticky post 
stickies: unpin on removal
stickies: don't allow removed posts to be stickied
 2022-10-23 17:17:49 -05:00
Aevann1 0b851d237c remove exploit allowing jannies to unpin award pins 2022-10-23 23:52:11 +02:00
Aevann1 8e68f60e3d fix roundabout way of jannies getting pin awards undone (not exploited so far AFAIK) 2022-10-23 23:36:38 +02:00
justcool393 e248295880 lawlzposts: fix a couple of bugs 2022-10-23 13:28:51 -05:00
justcool393 bd0f56fd22 lawlzposts: restrict to rDrama 2022-10-23 12:02:55 -05:00
justcool393 ec1affcf85 posts: add MasterLawlz specific actions 2022-10-23 12:01:00 -05:00
Aevann1 80eedbd58d more approval/removal refactors 2022-10-23 18:24:23 +02:00
Aevann1 888e552283 fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2937807?context=8#context 2022-10-22 18:40:52 +02:00
Aevann1 c78579ec5a refactor banned domains a little bit 2022-10-21 00:14:28 +02:00
justcool393 981256eb00 kippyprinter: change check to only allow pcmemes.net instead of disallowing rdrama.net 2022-10-20 15:53:52 -05:00
Aevann1 44fca7f086 ripbozo 2022-10-17 21:13:33 +02:00
Aevann1 e54c4a1f15 require reason when banning a domain 2022-10-17 10:16:14 +02:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
Aevann1 4355768995 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-16 11:56:15 +02:00
Aevann1 94424163db fix pinned posts 2022-10-16 11:54:36 +02:00
justcool393 f4af073253 fix 17 potential 500s 2022-10-16 02:51:42 -07:00
justcool393 32a4693da9 fix a couple of potentially rare 500s 2022-10-15 14:35:24 -07:00
Aevann1 f63bf4e718 restore old pin behavior 2022-10-15 19:03:51 +02:00
Aevann1 afdec9a5a9 minor tweak to avoid double-notifying ppl 2022-10-14 20:35:13 +02:00
Aevann1 423ad25d2a fix typo 2022-10-14 20:28:46 +02:00
Aevann1 2411053d55 add tiered pins 2022-10-14 20:28:20 +02:00
Aevann1 f2a5c8f5d4 add whitelist of badge_granting on WPD, and disallow removing award badges 2022-10-14 19:11:39 +02:00
Aevann1 77312317f3 get rid of Boolean columns for permenant awards 2022-10-14 18:59:49 +02:00
justcool393 0f56b8de5e i need a d 🤭 2022-10-13 00:55:15 -07:00
justcool393 c56e45aa57 create cloudflare helper 2022-10-13 00:55:15 -07:00
Snakes e7da195645
Revert "Disable Cloudflare API call timing out admin_home." 
This reverts commit ed27225d10.

The proximal cause of the request timeout issues was the /comments
performance issues, which seem to have been resolved by 2edeb4875.
Probably still need to refactor this, but for now it's likely fine.
 2022-10-13 02:12:35 -04:00
Snakes ed27225d10
Disable Cloudflare API call timing out admin_home. 2022-10-13 00:47:37 -04:00
Aevann1 cdff11424f use charge_account everywhere 2022-10-12 18:33:00 +02:00
Aevann1 925ec12141 more shadowban refactor 2022-10-12 08:53:32 +02:00
justcool393 c0acb1722b abort a bunch of stuff where we manually returned JSON 2022-10-11 08:40:19 -07:00
Aevann1 8032b9d5a4 allow me to ban (((🐟))) 2022-10-11 15:48:49 +02:00
justcool393 456dd43bba replace "if not FEATURES" with wrapper 2022-10-11 00:33:23 -07:00
justcool393 75e593da00 Revert "feature required wrapper" 
This reverts commit 8700bcc5ee.
 2022-10-10 02:54:47 -07:00
justcool393 8700bcc5ee feature required wrapper 2022-10-09 23:16:05 -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
Aevann1 df44613686 make it so when u ban someone for 3 days for example, it appears as "3 days" instead of "3.0 days" 2022-10-10 06:16:43 +02:00
Aevann1 55c62b820f fix grammar 2022-10-08 08:08:45 +02:00
justcool393 558ee805ec re-add revert admin actions function and also fix a bug with it 2022-10-07 21:07:44 -07:00
justcool393 6df6054938 remove revert admin actions function 2022-10-07 20:48:37 -07:00
justcool393 c4c3d6cf49
Merge branch 'frost' into permissions-refactor 2022-10-06 19:55:36 -07:00
Aevann1 a2600767d1 notify ppl when admins add them into CC or disallow them from it 2022-10-07 04:51:56 +02:00
justcool393 8bed8c64e8 rearrange and rename a couple of permissions 2022-10-06 00:55:54 -07:00
justcool393 ad7f3b7363 > to >= 2022-10-06 00:34:57 -07:00
justcool393 8d51980dca rename cache purge things to include prefix 2022-10-05 23:21:04 -07:00
justcool393 6911101e29 post bet distributions 2022-10-05 22:59:27 -07:00
justcool393 53a5343a55 use ban permission for muting and also add a user home permission (wonder if should be the same as mop perm) 2022-10-05 22:54:48 -07:00
justcool393 0c0fa68cb4 title change permission 2022-10-05 22:45:44 -07:00
justcool393 1220d06eab some admin perms and also fix search 2022-10-05 22:37:50 -07:00
justcool393 57b08043a4 notification settings and admin setting 2022-10-05 21:40:02 -07:00
justcool393 3f1cc45a2b settings, cache, and domain ban permissions 2022-10-05 21:26:15 -07:00
justcool393 9bb7b3758f distinguish stuff 2022-10-05 21:19:11 -07:00
justcool393 44bf01151f apparently this thing likes to commit without committing half of it ok 2022-10-05 21:03:40 -07:00
justcool393 a3b9d71e70 user badge permissions 2022-10-05 20:50:02 -07:00
justcool393 65c75ba5da club permissions 2022-10-05 20:47:42 -07:00
justcool393 4aef026594 add and remove admin permissions 2022-10-05 20:37:18 -07:00
justcool393 3cf972ef9a merge permission 2022-10-05 20:33:23 -07:00
justcool393 c813f52c1a view active users perm 2022-10-05 20:29:14 -07:00
justcool393 1a0785d497 add perm for kippy's marseybux printer 2022-10-05 20:26:39 -07:00
justcool393 f5996afc5a add some perm requirements and add agendaposter thing 2022-10-05 20:04:38 -07:00
justcool393 ae0c215af3 ... 2022-10-05 19:51:44 -07:00
justcool393 2fc3044d5b shadowban perms and stuff 2022-10-05 19:24:37 -07:00
justcool393 d5a48871f8 user ban and also fix global hole mod a bit i hope i didn't screw up the templates 2022-10-05 18:58:43 -07:00
justcool393 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
Snakes 3f338fc3f2 WPD: add login required explanatory text. 2022-10-05 19:17:42 -04:00
justcool393 4037eed228 use constant instead of literal 200 for poll bets 2022-10-04 23:07:53 -07:00
justcool393 78b668a870 don't duplicate checks for users 2022-09-30 15:51:17 -07:00
justcool393 40c2360d00 don't duplicate checks for comments 2022-09-30 15:51:17 -07:00
justcool393 057bc360bf don't duplicate get checks for posts 2022-09-30 15:51:17 -07:00
Aevann1 9e98494b65 fix betting rewards 2022-09-30 17:38:47 +02:00
Aevann1 51d7cd6d7e fix shit with hole logs 2022-09-29 12:18:27 +02:00
Aevann1 03e925fb3c use ban_reason column as a reason for shadowbanning too 2022-09-29 08:36:59 +02:00
Aevann1 7e4e98887b remove proxies from cloudflare 2022-09-26 04:39:03 +02:00
Aevann1 dd0f8fbed7 proxy all requests we make 2022-09-25 05:23:50 +02:00
Aevann1 d1bc2f3468 integrate check_ban_evade into check_for_alts 2022-09-23 14:33:58 +02:00
Aevann1 80f661f7fb remove unnecessary check 2022-09-23 14:09:33 +02:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 0df33c86a4 remove unnecessary deprected behavior in /distribute 2022-09-22 20:23:18 +02:00
scitzocel 610e1fbada
Sneed (#362) 
* MARSEYANTISCHIZO

Fixed betting that was fucked

* Update admin.py
 2022-09-22 02:22:08 +02:00
Aevann1 d22d60b5f7 fix typos 2022-09-22 01:52:39 +02:00
Aevann1 5526bcf79d make pcm jannies able to give all badges 2022-09-21 21:43:57 +02:00
Aevann1 f54791cc4c remove categories 2022-09-19 20:04:30 +02:00
Aevann1 6ff943914e testing done 2022-09-17 22:25:15 +02:00
Aevann1 f11dcf031b give notif on bagde removal 2022-09-13 12:27:09 +02:00
Aevann1 0302270e16 more detailed pin/unpin messages 2022-09-13 11:01:30 +02:00
Aevann1 4abf75edc0 add error codes 2022-09-12 11:52:07 +02:00
Aevann1 cc0f2059c3 more descriptive success messages 2022-09-12 07:23:08 +02:00
Aevann1 fbe7089d2a more detailed success message description 2022-09-11 16:32:00 +02:00
Aevann1 34f95d155c fix 500 error 2022-09-10 05:13:12 +02:00
Aevann1 6077f09ca9 make bets better 2022-09-08 20:25:45 +02:00
Aevann1 6e1b454d1c fix last commit 2022-09-08 19:57:20 +02:00
Aevann1 e382334c53 add description to new badge messages 2022-09-08 19:48:56 +02:00
Aevann1 e793a1ab3a show a list of blockers 2022-09-05 22:23:35 +02:00
Aevann1 0c32d56cd6 casino + style shit 2022-09-05 01:15:37 +02:00
Aevann1 88a2c69659
Hats (#348) 
* hat

* hats

* hats 2

* hats

* hats 4

* hats 5

* hats
 2022-09-03 01:58:55 +02:00
Aevann1 d9d017844a keep chat count when purging cache 2022-09-02 01:59:56 +02:00
Snakes 7e5378405f Remove redundant `if not user: abort()` checks. 2022-09-01 18:41:47 -04:00
Snakes c506ff0c40 Add admin mute for user reports and modmail. 2022-09-01 17:30:15 -04:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 45d5f52388 restore betting 2022-08-26 23:53:17 +02:00
Aevann1 3bff9489da exclude paypig badges from badge_grant 2022-08-25 19:57:15 +02:00
Aevann1 6a21dd347b Revert "Revert "Revert "restore autoflush""" 
This reverts commit d84b26fc77.
 2022-08-25 17:04:33 +02:00
Aevann1 d84b26fc77 Revert "Revert "restore autoflush"" 
This reverts commit 5aa03d87bb.
 2022-08-24 16:36:44 +02:00
Aevann1 5aa03d87bb Revert "restore autoflush" 
This reverts commit 687cd766b9.
 2022-08-23 17:17:37 +02:00
Aevann1 666b0cb063 comment betting code 2022-08-22 22:48:47 +02:00
Aevann1 a88b9d59c4 rename /h/chudtopia to /h/chudrama 2022-08-20 00:20:25 +02:00
Aevann1 4a8220d687 make chudtopians immune to chud effects 2022-08-20 00:12:53 +02:00
Aevann1 7ee7868185 restore the ability to permachud someone, apparently that stings less than being chudded for a month/year (fascinating) 2022-08-17 21:17:34 +02:00
Aevann1 05689c87f6 fix previous commit 2022-08-17 19:57:32 +02:00
Aevann1 687cd766b9 restore autoflush 2022-08-17 18:36:59 +02:00
Aevann1 539188ed85 fix revert_actions 2022-08-13 00:55:44 +02:00
Aevann1 1000f9c45e Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-08-11 06:05:26 +02:00
Aevann1 9341f2368a make some function names shorter 2022-08-11 06:05:23 +02:00
Aevann1 cfa17aaf68 rename some retarded ruqqus terminology 2022-08-11 06:04:41 +02:00
Aevann1 b79638b2dd fix 500 error in /revert_actions 2022-08-11 06:02:23 +02:00