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

16329 Commits (f4542db86feea5201cac63531243925303d37b49)

Author SHA1 Message Date
justcool393 db587a2501 i forgot a bloody comma ok 2022-10-28 12:36:18 -07:00
justcool393 0b61a83270 this leaderboard code is affecting my mental sanity 
idk maybe this'll fix it it's 1 am who knows anything about coding anymore
 2022-10-28 12:36:18 -07:00
justcool393 67768bf44d fix prev commit 2022-10-28 12:36:18 -07:00
justcool393 b2cfabf244 i don't think the person who worked on either this template or the leaderboard python function has ever thought about the idea of code reuse 
(make this template smaller by 3/4ths)
 2022-10-28 12:36:18 -07:00
justcool393 76855fed36 fix prev commit redux 2022-10-28 12:36:18 -07:00
justcool393 5ec48141bb fix prev commit 2022-10-28 12:36:18 -07:00
justcool393 ff639ce94b i wish the person who wrote the initial version of this leaderboard code a very lovely day 
i definitely don't want to cry myself to sleep because of this god awful mess
it's a little bit better now though
<3
 2022-10-28 12:36:18 -07:00
Aevann1 aadd054bc3 remove role="button" from button HTML tags 2022-10-28 21:30:08 +02:00
Aevann1 4a43bc239d remove formatting buttons (useless bloat) 2022-10-28 21:09:56 +02:00
Aevann1 fc6be1d959 per janny poll, make cosmetic awards 150 DC 2022-10-28 21:04:29 +02:00
Aevann1 449c8b51cb Revert "add another ratelimit by username" 
This reverts commit 4385bafa85.
 2022-10-28 20:25:14 +02:00
Aevann1 4385bafa85 add another ratelimit by username 2022-10-28 20:22:51 +02:00
Aevann1 e1dc790165 tighten from 15/day to 10/day 2022-10-28 20:13:37 +02:00
Aevann1 e41ee21f2b remove redundant ratelimits in /login 2022-10-28 20:13:23 +02:00
Aevann1 b816973f38 ignore subdomains in banned_domains logic 2022-10-28 20:12:40 +02:00
Snakes 1f27b0fb2f
Rate limit failed logins. 2022-10-28 14:07:24 -04:00
Aevann1 6271588056 small cosmetic change 2022-10-28 19:59:56 +02:00
Aevann1 180163e05e remove bad slur filter 2022-10-28 19:35:37 +02:00
Aevann1 94d1a7d98d fix 2022-10-28 19:13:24 +02:00
SneedBot fbab681b43 sneed 2022-10-28 17:09:07 +00:00
Aevann1 8999a6ea29 fix 2022-10-28 19:08:52 +02:00
justcool393 68451513b0 get: use a single function to sanitize usernames 2022-10-27 21:39:57 -05:00
justcool393 ea46bafce2 get: List -> Iterable, we accept lists, sets, etc 2022-10-27 19:30:53 -07:00
justcool393 8a8e6f2233 get: functions to add blocks and vote properties 
get: don't attempt to re-query if blocks or voted properties are already present
 2022-10-27 19:30:53 -07:00
justcool393 16ba59d8b3 get: check stripped out names before querying the db and return None if graceful in other places 2022-10-27 19:30:53 -07:00
justcool393 5ff6fea4dc get: add type annotations everywhere 2022-10-27 19:30:53 -07:00
justcool393 308e9cbbd6 get: remove weird vestigal load_parent part of get_comment 2022-10-27 19:30:53 -07:00
Aevann1 5d9ddcc0f4 fix quoting on selection 2022-10-28 01:19:44 +02:00
Aevann1 834516cd51 fix prev commit 2022-10-28 00:42:32 +02:00
Aevann1 1a35e2ec6a refactor banned domains 2022-10-28 00:37:29 +02:00
Snakes be7be28182
Fix comment search query ampersand bug. 2022-10-27 18:24:12 -04:00
Aevann1 8e2c869c84 fix last commit 2022-10-27 19:56:11 +02:00
Aevann1 ad358650e1 remove retarded bullshit I wasn't consulted about 2022-10-27 19:53:08 +02:00
Aevann1 2937872035 minor grammar change 2022-10-27 17:43:48 +02:00
Aevann1 98bae12134 show the time on which ppl blocked/followed the hole 2022-10-27 17:38:54 +02:00
Aevann1 8e84e3893e same as last commit 2022-10-27 17:38:39 +02:00
Aevann1 28cf9b66f9 minor grammer change + delete unused template 2022-10-27 17:37:40 +02:00
Aevann1 35ea423f35 cosmetic change 2022-10-27 10:38:11 +02:00
justcool393 c6d3f2a582 antispam: make bypass ids a set 2022-10-26 22:28:21 -05:00
Snakes d626ae7f6b
Add login required signup blurb for rDrama. 2022-10-26 20:10:21 -04:00
justcool393 50482c9b0e T to t 2022-10-26 18:41:29 -05:00
justcool393 e4d50be763 stickies: fix logic error i reintroduced that @Aevann1 has earlier fixed 2022-10-26 18:32:30 -05:00
Snakes 6a021c4736
PCM /live: scraping scheduled streams revision. 2022-10-26 17:03:21 -04:00
Snakes 895f0c9714
PCM /live: improve scraping robustness. 2022-10-26 16:14:16 -04:00
justcool393 e6f735b8ca security: be slightly more generous with login ratelimits 2022-10-26 14:18:21 -05:00
justcool393 782a4494da login: create invalid file if doesn't exist 2022-10-26 14:11:30 -05:00
justcool393 03cf8038f3 security: log invalid password attempts for admins 
security: reduce login ratelimits from 1/second ->1/10 seconds
security: reduce login ratelimits from 200/hr -> 100/hr
security: reduce login ratelimits from 1000/day -> 500/day
 2022-10-26 13:31:17 -05:00
justcool393 31eb387c8d pins: remove unnecessary code 2022-10-26 12:23:26 -05:00
Aevann1 8795ecfb58 fix thumbnails 2022-10-26 16:34:33 +02:00
Aevann1 b9d7b4e027 sneed 2022-10-26 16:33:50 +02:00
Snakes f42d861cae
Add entry to journoid banner. 2022-10-26 01:33:58 -04:00
Snakes 9bfb121d2f
WPD: update sidebar rule #1. 2022-10-26 00:35:20 -04:00
justcool393 548f2613c7 pinprovements 2022-10-25 17:48:10 -05:00
Aevann1 a25169cbea remove makeQuote() from reply buttons 2022-10-25 23:16:34 +02:00
Aevann1 e4c7a588ca add hat preview in /submit/hats 2022-10-25 23:12:52 +02:00
Aevann1 eba9666dd6 add ml-5 mr-5 mx-5 2022-10-25 23:12:37 +02:00
Aevann1 e182ddc738 fix orientation (thx sneks my love) 2022-10-25 22:19:16 +02:00
justcool393 f9343d3db1 full_name -> fullname 2022-10-25 15:05:37 -05:00
Aevann1 033738342a add tooltip to jigsaw tier [WPD] 2022-10-25 22:03:07 +02:00
Aevann1 16c7c07e7d stop changing extension 2022-10-25 22:01:38 +02:00
Aevann1 100f546f67 strip metadata 2022-10-25 21:58:02 +02:00
justcool393 56c1b64ec2 via @Aevann1: add selection quoting feature to mobile 2022-10-25 14:57:43 -05:00
Aevann1 3eb364b143 restore -coalesce 2022-10-25 21:00:09 +02:00
Aevann1 75ee126b61 specify method in imagemagick 2022-10-25 20:48:45 +02:00
Aevann1 0119c2b424 specify quality in imagemagick 2022-10-25 20:45:32 +02:00
Aevann1 883ab31cc9 Describe what Poor Mode does 2022-10-25 20:20:43 +02:00
Aevann1 b92aaa972e remove 'aev' mentions 2022-10-25 18:20:26 +02:00
Aevann1 fbeac461ca refactor poorcel mode 2022-10-25 18:07:44 +02:00
justcool393 ac43522570 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-25 11:05:42 -05:00
justcool393 ff81af326e fix issue where unable to self remove posts 2022-10-25 11:05:34 -05:00
Aevann1 be83829911 trim all marseys that arent alphabet or animated 2022-10-25 18:00:50 +02:00
Aevann1 aa282cf622 remove 2 broken marseys 2022-10-25 17:49:09 +02:00
Aevann1 b9d998bdbe use imagemagick in all cases 2022-10-25 17:41:23 +02:00
Aevann1 3b16c8f3e3 close image files after ur done 2022-10-25 17:41:23 +02: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 887bb64483 remove forgotten console.log(e) 2022-10-25 15:58:38 +02:00
Aevann1 69648de587 minor change to /remove_post 2022-10-25 15:45:44 +02:00
Aevann1 8e257d2376 fix removing posts 2022-10-25 15:41:49 +02:00
Aevann1 a390f3d917 refactor my prev commit 2022-10-25 00:36:54 +02:00
justcool393 d8070625d8 split hosts by comma 2022-10-24 15:28:43 -07:00
gooseman 67826a52e0 remove hw 2022-10-24 15:28:43 -07:00
gooseman 8b98eabbb9 simultaneous hosts 2022-10-24 15:28:43 -07:00
Aevann1 ae3831efb5 another small js fix 2022-10-25 00:02:44 +02:00
Aevann1 9dd9329c32 small js fix 2022-10-25 00:00:19 +02:00
Aevann1 b2317a4563 pause background music when a video or audio is played 2022-10-24 23:16:41 +02:00
justcool393 67a6676bf8 env: don't crash the server if TELEGRAM_LINK isn't present 2022-10-24 15:58:23 -05:00
Aevann1 03cd4246ff switch the position of "reply" and "mute" 2022-10-24 22:39:48 +02:00
Aevann1 2d0879ec3e allow admins to unmute users from modmail 2022-10-24 22:38:54 +02:00
Aevann1 10ba986957 update 2 capys 2022-10-24 22:33:54 +02:00
Aevann1 2a05363a2d exclude me from discord filter 2022-10-24 21:22:08 +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
justcool393 0f8ecd48dc antispam: add antispam bypass 2022-10-24 12:27:25 -05:00
Aevann1 baba11676a convert all webp to be actually webp 2022-10-24 19:16:51 +02:00
Aevann1 745f0200dd fix marseycapymerchant 2022-10-24 19:16:40 +02:00
Snakes 97eb823ed0 Fix janny pinning. 2022-10-23 19:47:53 -04:00
Snakes d869353fdf
Track coins awarded with votes. 
Supports more complicated double XP shenanigans without creating
any cycles of user actions that create positive DC.
 2022-10-23 18:23:51 -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
Snakes 7e4b35bc78
Disable Homoween awards on frost. 2022-10-23 17:53:12 -04:00
Aevann1 0b851d237c remove exploit allowing jannies to unpin award pins 2022-10-23 23:52:11 +02:00
Snakes 1496f43ba6
Port Homoween 2022 awards into frost const. 2022-10-23 17:49:12 -04: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 8f6950a49b fix prev commit 2022-10-23 14:44:02 -05:00
justcool393 050917515d hats: fix hat ratelimit 2022-10-23 14:43:32 -05:00
justcool393 f2ad34496b Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-23 13:29:04 -05:00
justcool393 e248295880 lawlzposts: fix a couple of bugs 2022-10-23 13:28:51 -05:00
Aevann1 b563b7af30 stop using "d-none d-md-block" 2022-10-23 19:57:38 +02:00
justcool393 0a9e7b3ef4 lawlzposts: don't allow unpin awards 
lawlzposts: disable if pins feature flag is off
 2022-10-23 12:14:27 -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 5d846e64c7 same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 25e50be552 same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 eafbebbdf1 same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 e99aa6fd0e same as last commit 2022-10-23 18:24:22 +02:00
Aevann1 a040b6779b same as last commit 2022-10-23 18:24:21 +02:00
Snakes ab194a6ad2
Add more shit emoji. 2022-10-23 12:14:24 -04:00
Aevann1 9b47ad166b small refactor to approving psots and comments 2022-10-23 17:51:49 +02:00
justcool393 ff84f32e45 make stats charts tight 2022-10-23 10:46:03 -05:00
Aevann1 096828dc1c add some padding to admin tools 2022-10-23 17:24:41 +02:00
justcool393 c8324f87ff Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-23 10:07:14 -05:00
justcool393 09e5bb6b03 ping me with jc and off site mention update 2022-10-23 10:06:59 -05:00
Aevann1 14b0d77f7a reduce normal cosmetic awards from 500 back to 300 2022-10-23 16:41:57 +02:00
Aevann1 834f70fd2d only check duplicates for banners, sidebar images, and badges 2022-10-23 11:27:40 +02:00
Aevann1 77e5da55ef fix behavior that would replace marsey tags with "none" if we didn't specify them on update 2022-10-23 11:27:20 +02:00
Aevann1 c8f24eab1b fix videos 2022-10-23 10:57:13 +02:00
Aevann1 0f4462ca5b increase pin limit to 4 on WPD 2022-10-23 10:48:24 +02:00
justcool393 a2c16534a4 admin pings: truescore requirement and exclude shadowban and make a permission 2022-10-22 19:45:15 -05:00
justcool393 cc3fb59ccd html head: fix default theme 2022-10-22 19:11:07 -05:00
Aevann1 c4103cfaf4 add @jannies to notify all jannies 2022-10-23 01:50:56 +02:00
Aevann1 27c1970575 add a "!" in PCM welcome message 2022-10-23 01:02:31 +02:00
Aevann1 b83f9bcfb1 fix prev commit 2022-10-23 00:12:46 +02:00
Aevann1 78e1bf9784 clear message field after submitting it 2022-10-23 00:10:36 +02:00
Aevann1 c2bb3303e1 fix prev commit 2022-10-22 23:13:37 +02:00
Aevann1 fb6825ab58 add the redbubble megathread to the index 2022-10-22 23:12:23 +02:00
justcool393 a5799b222e hats: fix 2 500s (SQL errors) 2022-10-22 15:37:22 -05:00
justcool393 60dd29bc6b Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-22 12:26:52 -05:00
justcool393 db95ff7f43 head: temporarily use userpage's head tags instead of overwriting our own 2022-10-22 12:25:44 -05: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 1b00b172e4 reduce frames on 3 hats 2022-10-22 18:32:19 +02:00
Aevann1 07228a2708 fix cookies on localhost 2022-10-22 17:26:39 +02:00
Aevann1 2dcf6bcb0f make sure all images with resize parameter are under 500KB 2022-10-22 17:24:07 +02:00
justcool393 49b12f220c sessions: set cookie domain properly 2022-10-21 23:39:23 -05:00
justcool393 62e9ef7009 hats: massively raise ratelimit 2022-10-21 22:31:58 -05:00
Aevann1 411a92f8f4 sneed 2022-10-21 23:58:32 +00:00
Snakes 333c36f6b7
Update homoween badges, cachebust badges. 2022-10-21 19:57:59 -04:00
Snakes e9b648dcb5
Support for multiple WPD sites on one master. 2022-10-21 19:33:43 -04:00
Snakes 45ff9d80e5
Permit serving multiple hosts from one instance. 
In service of tidying up WPD application servers. Also includes a
closely related change of letting nginx do the redirects to root.
 2022-10-21 19:12:36 -04:00
justcool393 a96bf4f81e favicon: add back to all pages properly 2022-10-21 17:46:17 -05:00
justcool393 b6ad3555b2 chat: add favicon to HTML 2022-10-21 17:42:28 -05:00
justcool393 2792a06c21 CSP: content security policies are safe 2022-10-21 17:31:31 -05:00
justcool393 0495d00629 chat fix i think? 2022-10-21 17:24:17 -05:00
justcool393 347a751481 WPD: redirect unlogged users to new site 2022-10-21 16:10:06 -05:00
Aevann1 570f72563f sneed 2022-10-21 19:01:16 +00:00
justcool393 2e087dc09f set session cookie domain to SITE 2022-10-21 14:00:41 -05:00
justcool393 c4b2c6f3f5
html head refactor (#412) 
* start html head refactor
this is a bit of a doozy tbh and will probably take a while. the templates are very highly duplicated but not duplicated enough to be an easy little thing

oh well, so it goes.

* some easier html head ones

* add chat, html_head, sign_up_failed_ref, sign_up, submit

* CSP: put it in const.py instead of this weird thing we did before

* fix syntax error

* better call the actual macros

* fix prev commit

* import into settings2

* fix prev commit

* set CSP properly if localhost

* some title fixes i think

* login page

* fix prev commit

* hacky thing to get titles to work i think

* {{stylesheets()}}

* fix prev commit

* title stuff

* cries uncontrollably

* submission fixes i think

* fix prev commit i think

* submission fixes ekfjdhfkdjf

* submission fixes 4

* this may fix submissions idk tbh

* default template: make it a little better on post pages

* default template: some efficiency
 2022-10-21 13:39:45 -05:00
Aevann1 360aa99fe1 small adjustments 2022-10-21 17:11:12 +02:00
Aevann1 5ba33396d5 add tags 2022-10-21 16:51:39 +02:00
Aevann1 04aa88f71f fix jigsaw WPD tier 2022-10-21 16:44:31 +02:00
Aevann1 26e2143514 marsey.world 2022-10-21 16:32:23 +02:00
Aevann1 824cc1ba81 sneed 2022-10-21 12:00:05 +00:00
Aevann1 2a2141a41f sneed 2022-10-21 11:32:29 +00:00
Aevann1 81a929c2e1 on harpooner's request, allow hole jannies to exile JL3 2022-10-21 13:32:21 +02:00
Aevann1 7733449169 fix 500 error 2022-10-21 13:30:32 +02:00
Aevann1 05e8dec716 allow multiple hosts (thanks JC I love you) 2022-10-21 13:15:29 +02:00
justcool393 37af363a47 remove duplicate message 2022-10-20 19:31:03 -05:00
justcool393 790a569072 don't check if body is empty 2022-10-20 19:29:20 -05:00
justcool393 8fe73cb68e refactor blackjack a bit 2022-10-20 19:28:05 -05:00
justcool393 c0fe4d03c0 message: sanitize replies too 2022-10-20 18:24:03 -05:00
justcool393 52b8a22917 messages: use sanitize_raw_body 2022-10-20 18:18:47 -05:00
justcool393 578e1896fd sanitize: strip out html comments 
they're unnecessary and never get rendered
 2022-10-20 18:06:55 -05:00
justcool393 360cff7e8f add post bypass checking perm 2022-10-20 17:51:29 -05:00
Aevann1 c78579ec5a refactor banned domains a little bit 2022-10-21 00:14:28 +02:00
Aevann1 25c5c8fb7d better js for follower pages 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
justcool393 5f16356d7a use showToast in some areas where we weren't before 2022-10-20 15:45:56 -05:00
Aevann1 3c3950adb0 change video tags 2022-10-20 22:26:43 +02:00
Aevann1 2d41118f39 sneed 2022-10-20 20:00:05 +00:00
Snakes 75a1a9c6c8
Fix profile viewers last visit timestamp. 2022-10-20 14:29:58 -04:00
Snakes 496d7ba6c6
WPD: update sidebar post flairs. 2022-10-20 14:25:53 -04:00
justcool393 4f35819fee assets: use .get where we can instead of .query 2022-10-20 13:00:14 -05:00
justcool393 05ba34973f log: update_marsey actions aren't always updating the image itself 2022-10-20 11:45:25 -05:00
justcool393 fc4e9866eb fix the fix 2022-10-20 09:59:14 -05:00
justcool393 cb35480ee6 sanitize: replace cuneiform ban with an overline ban 2022-10-20 09:44:32 -05:00
Snakes 9b81bc8a9d
WPD: expand post title editing to JL2+. 2022-10-20 10:42:52 -04:00
justcool393 d14eb65056 fix name bug with hats 2022-10-20 09:14:18 -05:00
Aevann1 5efb51ca57 sneed 2022-10-20 12:00:03 +00:00
Aevann1 c6daf73054 sneed 2022-10-20 08:00:03 +00:00
Aevann1 df1ae154bf sneed 2022-10-20 04:00:06 +00:00
justcool393 546883dcd5
fix fish's 500 
im commiting this on my phone lol
 2022-10-19 18:03:56 -07:00
Aevann1 cbfb2c2c99 sneed 2022-10-20 00:00:05 +00:00
justcool393 6fca874acf only show tags field on marsey update page 2022-10-19 18:45:44 -05:00
justcool393 ffdf810aa9 fix 500 and populate page on error 2022-10-19 18:38:25 -05:00
justcool393 9627c6db01 don't pass for no reason and also marsey -> existing 2022-10-19 18:38:25 -05:00
justcool393 62bd5a34e8 g.db.query not g.db.get 2022-10-19 18:38:25 -05:00
justcool393 99f66c8d31 Add UI for updating marsey tags and also allow me to do it 2022-10-19 18:38:25 -05:00
Aevann1 e16ebf8749 fix 500 error 2022-10-20 00:28:07 +02:00
Aevann1 e4fb158125 update the WPD app 2022-10-19 23:42:27 +02:00