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

20361 Commits (5f28a8f4e71bc10d7a4b580b38b681cfb826bd4f)

Author SHA1 Message Date
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