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

5019 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
justcool393 cc0c767877 static data as one function which is referenced 2022-10-17 05:08:09 -05:00
Aevann1 e54c4a1f15 require reason when banning a domain 2022-10-17 10:16:14 +02:00
Snakes 912560327f
Apply anti-grooming logic to chat. 2022-10-16 16:19:13 -04:00
Snakes 2efe5d1522
Fix changelog channel messaging on draft publish. 2022-10-16 13:49:24 -04:00
justcool393 e8329a12cc
remove unused routes 2022-10-16 08:01:59 -05:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
justcool393 4b2ce3b7a0 use perms constant for unclub_post 2022-10-16 03:41:54 -07:00
Aevann1 4355768995 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-16 11:56:15 +02:00
Aevann1 d1bcfa3f0c Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-16 11:54:40 +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 3f9b51f0c1 fix 500: abort 404 if not an integer 2022-10-16 02:18:23 -07:00
justcool393 24a4274ee1 fix upvoters/downvoters for comments and user voted 2022-10-16 01:17:20 -07:00
Aevann1 87852c6e65 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-16 10:10:52 +02:00
Aevann1 24e7828ae0 fix vote_dir in @user/voted/comments 2022-10-16 10:10:50 +02:00
justcool393 32a4693da9 fix a couple of potentially rare 500s 2022-10-15 14:35:24 -07:00
justcool393 6138c94a10 unduplicated alt adding code 
* should probably be part of the Alt or User class at some point but this is for a diff day
 2022-10-15 11:52:10 -07:00
justcool393 ef840c4afd make it so you can't vote on messages 2022-10-15 10:12:55 -07:00
Aevann1 129508b163 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-15 19:03:53 +02:00
Aevann1 f63bf4e718 restore old pin behavior 2022-10-15 19:03:51 +02:00
Snakes 616e15ebb9
Fix posting/commenting from API. 
The rework to v.client meant that `is_bot` on Submission and Comment
would attempt to be populated with a ClientAuth object when submitted
by a bot other than Snappy or bbbb. SQLAlchemy requires an actual
boolean, not just a truthy value.
 2022-10-15 10:11:14 -04:00
justcool393 c428a59397 v -> v and v.client 2022-10-15 04:18:07 -07:00
justcool393 c2b6c5903d fix 500 in search.py 2022-10-15 03:30:13 -07:00
Aevann1 6465982580 decouple v.last_active from the calc_users 2022-10-15 12:08:14 +02:00
justcool393 39aa59a37a add g.is_api_or_xhr so we can use it where we want to give API output 
* also use v.client for strict API clients
 2022-10-15 02:11:36 -07:00
Aevann1 b1efa072e6 rename /agendaposters to /chuds 2022-10-15 08:55:54 +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
justcool393 3b86227872 refactor asset submissions a bit 2022-10-14 11:03:47 -07: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
Aevann1 6a11de21e0 fix 500 error 2022-10-14 17:29:26 +02:00
Aevann1 5e55ff7f90 make the modlog note for updating assets link to te updated asset 2022-10-14 14:38:06 +02:00
Aevann1 89a0ff4a4b remove username reservation system 2022-10-14 14:01:06 +02:00
justcool393 2dd74d3acd don't constantly check for reposts when it's obvious there can't be one 
we currently spam the /is_repost api on every single character change in the URL box even though there is no way these URLs would ever be submitted to the site

introducing a frankly conservative limit to where we start actually pinging both the api and (on the backend) the database for reposts may help in some cases

the current constant was chosen by taking the length of "http://" and adding 2 to it
 2022-10-14 03:27:45 -07:00
Aevann1 6b0e6b49ee disallow discord links in DMs 2022-10-13 15:26:59 +02:00
Aevann1 7a6b4406ef remove redundant shadoban filters 2022-10-13 12:47:55 +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 2edeb48751
Refactor /comments to use single query. 2022-10-13 01:52:54 -04:00
Snakes ed27225d10
Disable Cloudflare API call timing out admin_home. 2022-10-13 00:47:37 -04:00
Snakes e5af46c4ae
Fix shadow visibility logic. 2022-10-13 00:10:34 -04:00
Aevann1 cdff11424f use charge_account everywhere 2022-10-12 18:33:00 +02:00
justcool393 ee85b5577a use error handlers in cases where we can 2022-10-12 08:55:42 -07:00
justcool393 c67406b84b use site specific patron name 2022-10-12 03:45:45 -07:00
justcool393 7b3361cfb7 temporary (maybe) sidebar and banner processing fn 
* also make existing badge return 409 instead of 403
 2022-10-12 03:04:34 -07:00
justcool393 96879894af remove 417 (use 409) and reword 418 msg 2022-10-12 02:00:18 -07:00
Snakes 3482f97bfb
Remove accidentally sneeded debug code. 
We were experiencing errors on prod where is_repost would not have
either g or g.db available on request teardown, which would eventually
culminate in errors.py:error_500. These haven't reoccurred for nearly
16hrs now, and the test code got caught in a 'sneed' commit. Best to
have it gone.
 2022-10-12 04:32:18 -04:00
justcool393 eaf361ad91 API: set the status code on errors 2022-10-12 01:17:48 -07:00
Snakes 166e33dc38
Clarify architecture of sort_objects. 2022-10-12 04:05:26 -04:00
Aevann1 d18e247513 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-12 09:03:30 +02:00
Aevann1 2aa281e8c8 refactor sorting again (untested) 2022-10-12 09:03:28 +02:00
justcool393 bb1658e0a0 WPD: remove vestigial social and music filer code 2022-10-12 00:03:08 -07:00
Aevann1 925ec12141 more shadowban refactor 2022-10-12 08:53:32 +02:00
justcool393 941b5fa82d vote realness is in user model 2022-10-11 23:47:47 -07:00
Aevann1 e1ee9a69e4 refactor seeing shadowbanned shit (untested) 2022-10-12 08:24:30 +02:00
Aevann1 b1abd33835 refactor sorting 2022-10-12 08:10:11 +02:00
justcool393 7ee3c78b2e ree 2022-10-11 22:51:04 -07:00
justcool393 501fbbf5d3 move antispam code to actions 2022-10-11 22:34:55 -07:00
justcool393 5591d7d574 fix real votes 2022-10-11 22:27:27 -07:00
Aevann1 04ecef4214 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-12 04:06:44 +00:00
Aevann1 46b310cdf3 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-12 06:06:18 +02:00
Aevann1 cdfbbd0217 fix wrong name for feature 2022-10-12 06:06:11 +02:00
Aevann1 9ef74dd642 sneed 2022-10-12 00:00:04 +00:00
justcool393 9044548630 forgot to actually execute the query 2022-10-11 12:05:00 -07:00
justcool393 65e4a179b0 remove vote code duplication 2022-10-11 12:05:00 -07:00
justcool393 71759e6afa 400 -> 409 2022-10-11 09:55:24 -07:00
Aevann1 466867afd1 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-11 18:41:12 +02:00
Aevann1 e3a3cbd358 add "hot" comment sorting 2022-10-11 18:41:09 +02:00
justcool393 63215b8888 move messages to constant file and also remove special logic for PCM, instead opting to modify the constant instead 2022-10-11 08:40:19 -07:00
justcool393 3a5c90e6d3 change 409 msg 2022-10-11 08:40:19 -07:00
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
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 a22c426310
fix unblocking (type error) 2022-10-05 20:45:03 -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 c0f753e101 asset submissions permissions 2022-10-05 20:15:10 -07:00
justcool393 c2109fd611 modmail viewing perm 2022-10-05 20:10:57 -07:00
justcool393 d709334180 lottery permissions 2022-10-05 20:09:20 -07:00
justcool393 f5996afc5a add some perm requirements and add agendaposter thing 2022-10-05 20:04:38 -07:00
justcool393 970a7adfbd buy ghost award permission 2022-10-05 19:57:31 -07:00
justcool393 0349862531 view pending submitted marseys and hats perms 2022-10-05 19:55:54 -07:00
justcool393 ae0c215af3 ... 2022-10-05 19:51:44 -07:00
justcool393 43f137208a bypass pin limit perm and also fix a shadowban perm 2022-10-05 19:51:30 -07:00
justcool393 d8610b34b6 changelog permission and don't query db for badges if admin with perm level 2022-10-05 19:45:05 -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 591e6342bb editing permissions 2022-10-05 18:24:37 -07:00
justcool393 4b78ed176a global moderation perm and add some more checks for const perm 2022-10-05 18:16:52 -07:00
justcool393 0dfff1f4f6 editing posts to JL3 (will be constantified soon) 2022-10-05 18:03:23 -07:00
justcool393 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
justcool393 2a66104d8b improve body for edit_post 2022-10-05 16:35:44 -07:00
justcool393 d58351637c use constants 2022-10-05 16:35:44 -07:00