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

4846 Commits (64659825801b52624b6faa9af786844766530ca0)

Author SHA1 Message Date
justcool393 eebef17e8d another dumb syntax error 2022-10-11 08:40:19 -07:00
justcool393 2004278791 syntax error fix 2022-10-11 08:40:19 -07:00
justcool393 39e49a508f add 409 to errors 
* also move check for AUTOJANNY_ID to before has_blocked
 2022-10-11 08:40:19 -07:00
justcool393 c0acb1722b abort a bunch of stuff where we manually returned JSON 2022-10-11 08:40:19 -07:00
justcool393 64cd11377e fix 500 werkzeug description, add note, and remove unused import 2022-10-11 08:40:19 -07:00
justcool393 665e6e4b21 handle 500 and 401 (when using API) with our handlers 
* 401 had sign up and login buttons on their page, but the page was never visible, we only show this when the API is being used
 2022-10-11 08:40:19 -07:00
justcool393 e364ce8043 add 417 and fix 414 2022-10-11 08:40:19 -07:00
justcool393 ac011a77b9 remove unneeded templates, use custom handler for 500, and 401 is "Unauthorized," not "Not Authorized" 2022-10-11 08:40:19 -07:00
justcool393 fd25809cac rework errors 2022-10-11 08:40:19 -07:00
Aevann1 8032b9d5a4 allow me to ban (((🐟))) 2022-10-11 15:48:49 +02:00
justcool393 9ec3fb3b51 use proper get function 2022-10-11 06:37:40 -07:00
Aevann1 998b966f2b remove unnecessary shit in wrappers 2022-10-11 15:19:55 +02:00
justcool393 b398420246 i'm gonna hit sneks with a giant foam s 2022-10-11 00:52:01 -07:00
justcool393 456dd43bba replace "if not FEATURES" with wrapper 2022-10-11 00:33:23 -07:00
Snakes 33d99f86e6
Temporary deletion special case by Carp request. 2022-10-10 23:48:16 -04:00
Snakes 69f1b09a76
Restrict editing old posts (harmonize comments). 2022-10-10 23:40:08 -04:00
Aevann1 c381466389 tweak asset notifs 2022-10-10 14:13:43 +02:00
justcool393 75e593da00 Revert "feature required wrapper" 
This reverts commit 8700bcc5ee.
 2022-10-10 02:54:47 -07:00
Aevann1 30813fc719 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-10 11:06:32 +02:00
Aevann1 00b045c464 tweak env again 2022-10-10 11:06:27 +02:00
justcool393 f872f734ec constantify a bunch of things 
* sign up follow id is now a thing (if not specified will just msg carp instead)
* notification thread id is also a constant now
* blackjackbtz id is a constant, used for i think special PM handling
 2022-10-09 23:37:42 -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 472aedb14e remove log items generated by awards for JL3 (since they cant print anymore) 2022-10-10 06:40:48 +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
justcool393 d6f4e20f7d use constant for BBBB_ID instead of 12125 2022-10-09 07:03:21 -07:00
justcool393 56e800fd9d move basedbot to actions as well 2022-10-09 06:49:08 -07:00
justcool393 63c7fe0c29 move zozbot and longpostbot into the actions helpers 2022-10-09 06:28:18 -07:00
justcool393 87fd8ee57a comment sanity checks and constantization 
* make HTML body length a constant and use it
* abort before uploads and other tasks if comment level is too deep
* what a nightmare of two functions, please do better next time
 2022-10-09 05:54:46 -07:00
justcool393 c9ab2c515b remove some more vestiges 
get_post and get_comment both handle this
 2022-10-09 01:25:21 -07:00
justcool393 52472b838d don't allow banned users to join 2022-10-09 00:34:22 -07:00
justcool393 d8927294f4 fix 500 when no state is passed in to discord redirect function 2022-10-09 00:31:56 -07:00
justcool393 8ea52ba95c constantify comment body length limit and transfer limit 2022-10-09 00:20:28 -07:00
justcool393 b96d6a1ccb scope variables properly 🤤 2022-10-08 23:44:09 -07:00
justcool393 1ad12e0524 deduplicate more of this page's code 2022-10-08 23:44:09 -07:00
justcool393 13446a4708 remove duplicate code in the template 2022-10-08 21:26:41 -07:00
Snakes 10921331fa
Move user hat properties for userpage to model. 2022-10-08 16:30:27 -04:00
Snakes 8bb145d23c
Fix userpage hats owned display. 2022-10-08 16:12:03 -04:00
justcool393 360723f761 num hats fix (and pct fix too?) 2022-10-08 10:53:54 -07:00
justcool393 491d71a9b5 add owned hats to user page per fish request 2022-10-08 10:37:44 -07:00
justcool393 7025cbe983 don't include sbed users in songs 2022-10-08 10:14:17 -07: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
Snakes f7a52ddb8c
PCM live: stop infinite recursion on invalid input. 2022-10-07 22:32:33 -04:00
Snakes 1966ccec6c
Fix incorrect identifier in create_hole. 
Looks to have been accidentally introduced in 9575e11b8b, because
for some reason this is the only route that uses `name` instead of
`sub`. Weird. Perhaps worth changing to sub for consistency, but
surely there's some reason it's like this.
 2022-10-07 21:28:13 -04:00
Snakes 556b3e3c4e
PCM: don't rescale uploaded banners. 2022-10-07 21:16:56 -04:00
Aevann1 897885316f disable asset submissions in WPD and PCM 2022-10-08 03:00:27 +02:00
Aevann1 2a638f71c3 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-08 02:44:06 +02:00
Aevann1 cfd4b6399f use mailgun again 2022-10-08 02:44:02 +02:00
Aevann1 aa8e7055fb rework env vars a bit 2022-10-08 02:43:04 +02:00
Snakes 7ea61f423d
PCM: disable gambling; extend FEATURES['GAMBLING']. 2022-10-07 20:31:46 -04:00
Snakes f4a722d151
Fix lootbox purchasing identifier conflict. 2022-10-07 17:01:29 -04:00
justcool393 0627a12bc5 don't let users comment on things they can't see 2022-10-07 03:22:07 -07:00
justcool393 48384ba8e5 convert a couple of the old constantified permissions to the new system 
i don't want to break something so i'm keeping one of them for now but it just links
 2022-10-07 01:50:20 -07:00
Aevann1 b608a514e4 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-07 05:25:37 +02:00
Aevann1 2d2a35d7ca make giving awards not refresh the page 2022-10-07 05:25:34 +02:00
justcool393 d9cc95dd71 fix global hole mod and template error 2022-10-06 20:06:22 -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
Aevann1 3ecb1b4f9a generate a mod log for CCing or unCCing posts and notify OP 2022-10-07 04:48:31 +02:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
Aevann1 9d6dcca07a remove duplicate function 2022-10-07 00:59:50 +02:00
Aevann1 4ed67a6bef same ast last commit 2022-10-07 00:50:36 +02:00
Aevann1 c20b0c795b put the "??? ago" streamers last 2022-10-07 00:49:43 +02:00
Aevann1 dc93b5b7d2 get rid of the downvote table 2022-10-07 00:21:24 +02:00
Aevann1 0848008c8d fix prev leaderboard commit 2022-10-07 00:10:10 +02:00
Aevann1 ea30e3f3e7 convert snakes leaderboard downvote code to ORM 2022-10-06 23:57:46 +02:00
Aevann1 3cf838af29 fix thumbnails and add opera-proxy to docker 2022-10-06 21:07:45 +02:00
justcool393 523eb1c03d conflict resolution 2 2022-10-06 03:37:45 -07:00
Snakes 24167b1d09
Fix thumbnail_thread passing uploader to media. 2022-10-06 05:15:21 -04:00
justcool393 8db6b3f7fd improve POST_TO_CHANGELOG check 2022-10-06 02:09:46 -07:00
Snakes 7eefcf5308
Stopgap optimize leaderboard received downvotes. 2022-10-06 04:57:21 -04:00
justcool393 d0534897ec ... 2022-10-06 01:40:33 -07:00
justcool393 e93e2d9ca9 convert some more >s to >=s 2022-10-06 01:40:21 -07:00
Aevann1 e071f9c81b remove leaderboard_thread 2022-10-06 10:23:29 +02:00
justcool393 8bed8c64e8 rearrange and rename a couple of permissions 2022-10-06 00:55:54 -07:00
justcool393 02d0e2043e rename APPS_MODERATE to APPS_MODERATION 2022-10-06 00:40:36 -07:00
justcool393 ad7f3b7363 > to >= 2022-10-06 00:34:57 -07:00
Aevann1 96f4f8499f fix 500 errors 2022-10-06 09:30:38 +02:00
justcool393 f1275b90eb filter properly per poll: https://rdrama.net/post/79285/-/2845495 2022-10-06 00:04:46 -07:00
justcool393 6c3b0f13da search and stuff 2022-10-05 23:45:27 -07:00
Aevann1 fea0ce115f do the result of this poll https://rdrama.org/post/79285/-/2845495?context=8#context 2022-10-06 08:41:48 +02:00
Aevann1 fbd815f54e fix this https://rdrama.org/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2847925?context=8#context 2022-10-06 08:26:10 +02:00
justcool393 039fa606d6 streamer permissions 2022-10-05 23:22:42 -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 6401f9e9c2 shadowban log 2022-10-05 22:56:19 -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 047013f92b patron perm and also move them around 2022-10-05 22:48:55 -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 20bd38b5d3 add oauth permissions 2022-10-05 22:33:55 -07:00
justcool393 dc5a132583 mop visibility, WPD notifications, and a fix with shadowbans 2022-10-05 22:25:45 -07:00
justcool393 38f3c7ed55 view sorted admin list and message blocked users 2022-10-05 22:16:09 -07:00
justcool393 68851ed986 profile views and modmail/hole creation notifications 2022-10-05 22:07:38 -07:00
justcool393 d78d57ec79 all seeing eye permission 2022-10-05 21:59:06 -07:00
justcool393 06f88e8a4a post based permissions mostly 2022-10-05 21:45:54 -07:00
justcool393 57b08043a4 notification settings and admin setting 2022-10-05 21:40:02 -07:00
Aevann1 0c8ead2e7d stop using lain.la 2022-10-06 06:31:08 +02:00