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

2308 Commits (972578e74a5daea46f2b3c6b47a3a503687da187)

Author SHA1 Message Date
justcool393 dcd875c40c max image and video size are constants now 
* the error pages still need to be fixed
 2022-10-11 23:27:17 -07:00
Aevann1 e1ee9a69e4 refactor seeing shadowbanned shit (untested) 2022-10-12 08:24:30 +02:00
Aevann1 318a20250c Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-12 08:10:15 +02:00
Aevann1 b1abd33835 refactor sorting 2022-10-12 08:10:11 +02:00
Snakes baf0386d8c
PCM: re-enable gambling. 2022-10-12 02:08:20 -04:00
justcool393 501fbbf5d3 move antispam code to actions 2022-10-11 22:34:55 -07:00
Aevann1 0cb2a56f5c fix last commit 2022-10-11 19:28:08 +02:00
Aevann1 a9dd6bf1e7 add a media check 2022-10-11 19:26:38 +02:00
Aevann1 b544171449 store the fullpath in the media table 2022-10-11 19:20:15 +02: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
Aevann1 06c858b6cf fix 500 error 2022-10-11 15:43:57 +02:00
Aevann1 998b966f2b remove unnecessary shit in wrappers 2022-10-11 15:19:55 +02:00
justcool393 01138ab592 bypass read only mode perm 2022-10-11 00:54:02 -07:00
justcool393 456dd43bba replace "if not FEATURES" with wrapper 2022-10-11 00:33:23 -07:00
justcool393 ab2ab2ddf9 improve wrappers so they can be used with others 2022-10-11 00:33:23 -07:00
justcool393 940f815f84 loudly tell users they can't do this while suspended 2022-10-10 23:15:09 -07: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
justcool393 1111932b8c remove weird random check if it's an issue we can readd it 2022-10-09 13:13:55 -07:00
justcool393 6d5dcaec9a fix long post bot lol 2022-10-09 09:40:20 -07:00
justcool393 a9064e7828 newline at eof 2022-10-09 06:52:41 -07:00
justcool393 56e800fd9d move basedbot to actions as well 2022-10-09 06:49:08 -07:00
justcool393 64cd774390 ree 2022-10-09 06:29:58 -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 8ea52ba95c constantify comment body length limit and transfer limit 2022-10-09 00:20:28 -07:00
Aevann1 b515b8bd15 change DOMAIN env var to SITE (for consistency) 2022-10-08 04:06:55 +02:00
Aevann1 cbbcbd570a Revert "fix WPD" 
This reverts commit 6750a156fd.
 2022-10-08 03:19:16 +02:00
Aevann1 6750a156fd fix WPD 2022-10-08 03:14:54 +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
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
justcool393 26fbf726a4 remove unused permission 2022-10-06 23:24:00 -07:00
justcool393 e372158729
Merge branch 'frost' into permissions-refactor 2022-10-06 19:05:42 -07:00
Aevann1 01071a20e8 add banner_thread to PCM 2022-10-07 03:32:08 +02:00
Aevann1 6bdb0d792b fix my mentions 2022-10-06 21:52:57 +02:00
Snakes 60e4e92e90
Suppress ffmpeg progress output, fix trailing flag. 2022-10-06 15:17:36 -04:00
Aevann1 3cf838af29 fix thumbnails and add opera-proxy to docker 2022-10-06 21:07:45 +02:00
justcool393 d4b3e4ac5b fix some stuff in the user page template including add mute to user page properly 2022-10-06 03:05:18 -07:00
justcool393 2b51b13dcc user moderation tools visible permission 2022-10-06 02:37:41 -07:00
justcool393 eeca9617bd post comment moderation tools visible permission 2022-10-06 02:33:46 -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
justcool393 397cf68abd view vote buttons on user page 2022-10-06 01:14:32 -07: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 6e33531be3 remove a _FOR_ 2022-10-06 00:38:33 -07:00
Aevann1 79960d58be ping me for "aev" 2022-10-06 09:33:47 +02:00
justcool393 767093d060 add perms for things we don't really know what they are 2022-10-06 00:32:05 -07:00
Aevann1 96f4f8499f fix 500 errors 2022-10-06 09:30:38 +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
official-techsupport 4e23161f11
Re-enable showmore_regex for Snappy (#389) 
* Re-enable showmore_regex for Snappy

* showmore a bit more aggressively
 2022-10-06 02:17:28 -04:00
justcool393 4fdccc331a view last active in template 2022-10-05 23:02:27 -07:00
Aevann1 3a4aa3f3af fix bugs 2022-10-06 08:00:41 +02: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
Aevann1 42344cb76f add media table 2022-10-06 07:54:04 +02:00
justcool393 f2f954e0dd add note about marseybux printing disabled on rDrama 2022-10-05 22:50:42 -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
Aevann1 1d666b3569 fix prev commit 2022-10-06 07:23:05 +02:00
Aevann1 4563a2b18a fix prev commit 2022-10-06 07:16:24 +02:00
justcool393 38f3c7ed55 view sorted admin list and message blocked users 2022-10-05 22:16:09 -07:00
Aevann1 168f18893f change wording of an error msg 2022-10-06 07:08:48 +02:00
justcool393 68851ed986 profile views and modmail/hole creation notifications 2022-10-05 22:07:38 -07:00
Aevann1 f52d6258ae fix prev commit 2022-10-06 07:07:24 +02:00
Aevann1 d832e195a7 same as last commit 2022-10-06 07:05:03 +02:00
justcool393 f531b12727 alt seeing eye 2022-10-05 22:01:02 -07:00
justcool393 d78d57ec79 all seeing eye permission 2022-10-05 21:59:06 -07:00
Aevann1 304c65d303 convert webm to mp4 2022-10-06 06:54:05 +02:00
justcool393 5739f128cf club and chudrama permissions 2022-10-05 21:52:15 -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
Snakes 3c261f19cd
Add JC to NOTIFIED_USERS. 2022-10-05 23:59:33 -04: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 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 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
justcool393 d58351637c use constants 2022-10-05 16:35:44 -07:00
justcool393 093ced7b20 introduce constant for post and title length 2022-10-05 16:35:44 -07:00
justcool393 88ae00deef sanitize raw bodies 2022-10-05 16:35:44 -07:00
justcool393 19b2f71c3b improve raw title sanitization and don't check the same thing like 5 times 2022-10-05 16:35:44 -07:00
Aevann1 045dac01a5 reduce NOTIFICATION_SPAM_AGE_THRESHOLD from 3 days to 0.5 days 2022-10-06 01:29:30 +02:00
Snakes 3f338fc3f2 WPD: add login required explanatory text. 2022-10-05 19:17:42 -04:00
Aevann1 9134a91481 add jigsaw tier 2022-10-06 00:47:12 +02:00
justcool393 9575e11b8b add get_sub_by_name function 2022-10-05 03:37:29 -07:00
justcool393 4037eed228 use constant instead of literal 200 for poll bets 2022-10-04 23:07:53 -07:00
justcool393 b0da0ac604 fix regex capturing groups 2022-10-04 17:58:51 -07:00
justcool393 d564592276 revert per aevann. (why are we replacing www.reddit.com) 2022-10-04 17:32:08 -07:00
justcool393 775686028b
use reddit regex from snapshillbot 
reference: https://github.com/justcool393/SnapshillBot/blob/master/snapshill.py#L30
 2022-10-04 16:05:14 -07:00
justcool393 f901d5af05
show raw unicode codes instead of the actual characters 2022-10-04 15:29:00 -07:00
Aevann1 243cf4eaf8 Revert "improve fishylinks_regex" 
This reverts commit 88c1f1b233.
 2022-10-05 00:19:50 +02:00
justcool393 4c71bd6b5c
fake colon 2022-10-04 14:33:23 -07:00
Aevann1 88c1f1b233 improve fishylinks_regex 2022-10-04 23:31:23 +02:00
Aevann1 d203b22461 fix "iibertarianphile" for real this time 2022-10-04 22:12:18 +02:00
Aevann1 ed6b7f1a10 fix "iibertarianphile" 2022-10-04 21:54:45 +02:00
Aevann1 337e5d59c5 Revert "make house holes immune from deletion" 
This reverts commit 7defcd07cf.
 2022-10-04 15:48:08 +02:00
justcool393 7defcd07cf
make house holes immune from deletion 2022-10-03 20:22:16 -07:00
Aevann1 13f5ab7c07 remove long slur filters 2022-10-02 12:33:01 +02:00
Aevann1 dee46a9306 revert an earlier change for video and audio files in sanitize() 2022-10-01 19:42:34 +02:00
Aevann1 fbaa3984a0 small adjustment to prev commit, making it an "elif" 2022-10-01 19:37:59 +02:00
Aevann1 15e0447826 ban ppl for 14 minutes if snappy comments ":marseyban:" on their post 2022-10-01 19:37:25 +02:00
Aevann1 2cf9c7560f remove unused legacy function 2022-10-01 18:29:16 +02:00
Aevann1 a7acbe9831 show our email to loggedout visitors in /contact 2022-10-01 12:14:46 +02:00
Aevann1 e9ffc02fb9 tweak slur filter to stop repititive bug reports 2022-10-01 11:56:31 +02:00
justcool393 fc623b7201 get id fix for sbs 2022-09-30 22:16:15 -07:00
justcool393 50689c9298
remove early life badge if status expired 2022-09-30 16:20:53 -07:00
justcool393 057bc360bf don't duplicate get checks for posts 2022-09-30 15:51:17 -07:00
justcool393 7e3f43c9ab
unperson shadowbanned users (#373) 
* unperson shadowbanned users
if a shadowbanned user copes, does anyone hear them seethe?

* unperson shadowbanned users (by id)

* don't import that

* Add include_blocks.
We don't always want to request blocks from the db when we have a user set

* block shadowbanned users from hole mod tools

* don't allow awarding shadowbanned things

* fix conflict

* gracefully use get_account when specified and also add include_blocks flag to get_account as well
 2022-09-30 14:00:58 -07:00
Snakes 60d6f8b20d WPD: add revolving banner selection. 2022-09-29 14:09:26 -04:00
Snakes e52fc4eb9e cron: commit roulette txn early for long tasks. 2022-09-29 14:09:26 -04:00
Aevann1 ff12923eb1 revert back to old welcome msg 2022-09-29 16:27:50 +02:00
Aevann1 3006da3f8f increase sanitize timeout limit from 2 seconds to 5 seconds 2022-09-29 12:34:09 +02:00
Aevann1 94f0789827 fix 500 error 2022-09-29 12:21:55 +02:00
justcool393 57ce828af4
add 1 words to filter (#379) 
* add 2 words to filter

* Update const.py
 2022-09-29 11:38:37 +02:00
Aevann1 cc38a82587 remove discord from image host whitelist (they delete images) 2022-09-29 10:24:12 +02:00
Aevann1 b9d3336a9e nitter shit 2022-09-29 07:53:37 +02:00
Snakes 4a54c6219a
Add trailing final newlines to source files. 
Touched a ton of files to finally standardize on having trailing
final newlines, as best practice recommends and so our devs stop
accidentally fighting each other over it.

This was performed automatically with the following:
git ls-files -z '*.py' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
git ls-files -z '*.css' | while IFS= read -rd '' f; \
    do tail -c1 < "$f" | read -r _ || echo >> "$f"; done
 2022-09-29 01:43:29 -04:00
Snakes f05ec93b95
Add gambling wager badge logic. 
This commit touches more files than it ought to because this change
required untangling some circular imports, notably a lingering import
of files.helpers.slots in helpers.actions (presumably from old Snappy
gambling logic) and the User.active_blackjack_game accessor. Otherwise,
the logic is fairly straightforward.
 2022-09-29 00:26:50 -04:00
Aevann1 0b5293d8e7 test stagger again 2022-09-27 12:56:57 +02:00
Aevann1 85653b0438 testing worker reloading 2022-09-27 12:55:20 +02:00
Aevann1 0686cdbcf6 remove testing print statement 2022-09-27 12:52:48 +02:00
Aevann1 c882b366a1 testing smth 2022-09-27 08:41:23 +02:00
Snakes d0d67085e3
Rebuild assetcache on inotify events. 2022-09-27 02:07:32 -04:00
Aevann1 faf4403e26 check for duplicate images when admigger threads for banners/sidebar/badges are used 2022-09-27 03:24:20 +02:00
Aevann1 fa4dee419d remove unnecessary imports 2022-09-27 02:47:52 +02:00
Aevann1 574040c3f5 add furry and pony image hosts 2022-09-26 11:02:39 +02:00
Snakes 0b416dcf2c
Revise marsify logic. 2022-09-26 02:09:26 -04:00
Snakes 742093aeae
Revert "Revert "WPD: enable rotating sidebar art & admin thread."" 
This reverts commit 74db58e54b.
 2022-09-26 01:19:37 -04:00
Aevann1 37e1f25624 make using proxies only happen in 3 circumstances again 2022-09-26 06:01:25 +02:00
Aevann1 517e62e61b add proxies on pushshift requests 2022-09-26 04:40:31 +02:00
Aevann1 0a83feb966 add proxies on lain.la requests 2022-09-26 04:40:21 +02:00
Aevann1 6158cf632a add proxies on discord requests 2022-09-26 04:40:08 +02:00
Aevann1 05079a40f4 limit banners to 1MB 2022-09-26 03:41:03 +02:00
Snakes b0529716bc Remove voluntary marsify toggle. 2022-09-25 21:32:36 -04:00
Aevann1 4c26a7cd02 limit sidebar and badge images to 1MB 2022-09-26 03:27:31 +02:00
Aevann1 e4f14c57de make holes cost 50k again 2022-09-25 13:34:34 +02:00
Aevann1 4212cfa0b2 testing on pcm 2022-09-25 06:11:06 +02:00
Aevann1 dd0f8fbed7 proxy all requests we make 2022-09-25 05:23:50 +02:00
Aevann1 f4b41f0049 make addition and removal of channels happen instantly (testing in devrama) 2022-09-25 05:08:44 +02:00
official-techsupport bd8b96c1f5
fix the TLD matching to exclude numbers (#371) 2022-09-24 18:06:53 -04:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Snakes ac66eb07e9
Implement hash-based cachebusting module. 
Adds the files.helpers.assetcache module, which runs on worker startup
to compute CRC digests of files in given asset directories and provides
a Jinja filter to create cachebusted URLs based on those hashes.
This alleviates the need to increment cachebusting counters in query
strings entirely for files it is applied to.
 2022-09-24 02:40:26 -04:00
official-techsupport 0ff839d396
Accept any TLDS (#369) 2022-09-24 02:04:09 +02:00
Aevann1 d1a8aeb3db allow some ppl to have spider permenantly 2022-09-24 02:02:27 +02:00
Snakes 2e464e307d
Make forced banned hat respect unban_utc. 2022-09-23 17:47:32 -04:00
Aevann1 a63d4940ae fix PCM /live list 2022-09-23 22:58:10 +02:00
Snakes 1cf5ec9e0d Revert "PCM: update live list in background." 
This reverts commit 3acdb44a98.
 2022-09-23 15:41:04 -04:00
Aevann1 c7b41f3b57 update pin/unpin award description 2022-09-23 16:43:45 +02:00
Aevann1 bb4e21b2f0 fix utm regex 2022-09-23 15:23:11 +02:00
Aevann1 0db9bf14b9 add the expiry code for spider award lol 2022-09-23 15:15:56 +02:00
Aevann1 d1bc2f3468 integrate check_ban_evade into check_for_alts 2022-09-23 14:33:58 +02:00
Aevann1 182b851e58 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-09-23 14:01:46 +02:00
Aevann1 08e4d04c92 minor change to silence warnings 2022-09-23 14:01:42 +02:00
Snakes 3acdb44a98
PCM: update live list in background. 2022-09-22 19:39:26 -04:00
Aevann1 cd5d0c7c92 dont archive rdrama.org 2022-09-22 22:45:26 +02:00
Aevann1 f9fdeed771 fix 2022-09-22 21:42:09 +02:00
Aevann1 8a8a67a059 remove ban_evade logic 2022-09-22 21:40:14 +02:00
Aevann1 d8ac954d53 remove unnecessary execution of function 2022-09-22 07:26:48 +02:00
Aevann1 55ca68e6fb same as last commit 2022-09-22 07:17:16 +02:00
Aevann1 40485e9ab6 fix cron (im stoopid) 2022-09-22 07:15:55 +02:00
Aevann1 c02e1bd76f fix cron 2022-09-22 07:11:50 +02:00
Aevann1 9220424324 fix cron 2022-09-22 07:08:58 +02:00
Aevann1 77fa9de79a fix cronjob 2022-09-22 07:02:10 +02:00
Aevann1 553218aaa5 make /live a cached cron job 2022-09-22 04:33:45 +02:00
Aevann1 61739b765e made spider award not give any notifs 2022-09-21 22:27:12 +02:00
Aevann1 62527f4239 fix spider award 2022-09-20 20:00:03 +02:00
Aevann1 272e39ebf2 add spider award 2022-09-20 19:52:52 +02:00
Aevann1 6e3e05c6e1 tweak last commit 2022-09-20 04:55:38 +02:00