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

928 Commits (f97be253e7132a0bb6968c8523d59b5f5dcc214d)

Author SHA1 Message Date
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
Snakes 1411018f8d Add post categories. 
Implemented for LGB but can likely be used for WPD and other future
sites. Similar to a reddit post flair. Provides:
  - Admin panel for Category management.
  - Category selection on post submission.
  - 'Recategorize' post action.
 2022-08-07 02:57:30 -04:00
Aevann1 0429da4493 mod action notifs rework 2022-08-05 23:50:30 +02:00
Aevann1 ad3ca4eb12 increase max duration for chudding from 1 month to 1 year 2022-08-05 20:49:44 +02:00
Aevann1 9a2b80e374 spam carp inbox 2022-08-04 23:20:29 +02:00
Aevann1 f0816853da make ban_reason logic a little better 2022-07-30 00:43:25 +02:00
Aevann1 68c07b77bb move site_settings.json out of the repo 2022-07-30 00:14:25 +02:00
Aevann1 07be18cd1b fix 500 errors 2022-07-28 16:23:38 +02:00