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

9565 Commits (eb98740f972fe3e87e1b7d6757a0afa6792031a6)

Author SHA1 Message Date
Aevann1 b7ef01d4fc revert the voting thing i did for myself 2022-10-18 17:16:16 +02:00
Aevann1 3e45e9da67 add a bigger margin between "reply" and "mute" 2022-10-18 15:57:56 +02:00
Aevann1 d7012e141a replace telegram link with preview version 2022-10-18 13:38:56 +02:00
Snakes 3b185a3844
Fix incorrect site-specific award modal procoins. 2022-10-18 07:34:26 -04:00
Aevann1 d32341e7b9 add a bottom margin to post embeds 2022-10-18 13:18:06 +02:00
Aevann1 f9841bf049 remove 2 vestigal if statements 2022-10-18 13:17:54 +02:00
Aevann1 eff2d35a00 remove telegram chat link 2022-10-18 12:23:22 +02:00
Aevann1 6e65a0c198 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-18 12:20:35 +02:00
Aevann1 3490f3d74d cosmetic change 2022-10-18 12:20:33 +02:00
justcool393 39545e556f WPD: disable /logged_out on .co, fixing infinite loop 
WPD: fix bad asset link
WPD: redirect on migration login and failed migration login
 2022-10-17 19:11:50 -05:00
justcool393 be6fa59e13 fix host bug, do a absolute redirect instead of a relative one, and make wpdco page essentially static 2022-10-17 18:40:09 -05:00
justcool393 96d63ed5de banner text and also rename variable 2022-10-17 18:40:09 -05:00
justcool393 6d538e2cd3 WPD migration code 2022-10-17 18:40:09 -05:00
Aevann1 44fca7f086 ripbozo 2022-10-17 21:13:33 +02:00
Aevann1 9358b75027 fix prev commit 2022-10-17 20:22:29 +02:00
Aevann1 bf859b0e3a sneed 2022-10-17 18:58:15 +02:00
Aevann1 cbbc0ea2e5 limit size of images in preview 2022-10-17 10:51:22 +02:00
Aevann1 3ee85d524b limit height of bio in popover to 50vh 2022-10-17 10:51:16 +02:00
Aevann1 3150714c2e only calc_users when we need to show them 2022-10-16 19:08:38 +02:00
justcool393 aa508fc076 remove discord 2022-10-16 05:42:52 -07:00
Aevann1 da49350b2b increase margin for "forgot password?" 2022-10-16 10:26:19 +02:00
Aevann1 c24851dbb3 only calculate users when we actually need them 2022-10-15 09:31:24 +02:00
Aevann1 5b1e3b7aff Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-15 08:55:56 +02:00
Aevann1 b1efa072e6 rename /agendaposters to /chuds 2022-10-15 08:55:54 +02:00
Snakes b6703595da
Revert "make 819.webp the only sidebar image for a couple of days to hopefully piss off someone" 
This reverts commit d244124d47.

It's been a few days, reverted upon Carp request.
 2022-10-14 15:34:20 -04:00
Aevann1 0753d73f32 fix wrong js func name 2022-10-14 20:43:01 +02:00
Aevann1 c49ae42205 fix for joan 2022-10-14 20:41:03 +02:00
justcool393 85d2994cce pin_post -> pinPost 2022-10-14 11:34:31 -07:00
Aevann1 2411053d55 add tiered pins 2022-10-14 20:28:20 +02:00
Aevann1 661bf3af67 remove unnecessary margin in /transfers 2022-10-14 17:31:35 +02:00
Aevann1 4cbe5c41eb even higher margins 2022-10-14 17:31:02 +02:00
Aevann1 efe0ff091a increase margins in log 2022-10-14 17:28:07 +02:00
Aevann1 89a0ff4a4b remove username reservation system 2022-10-14 14:01:06 +02:00
Aevann1 6c2f2c5404 fix expanded images 2022-10-14 13:44:03 +02:00
justcool393 2559794135 Move stuff we put in bootstrap.js to a new core.js file 2022-10-14 02:50:39 -07:00
Aevann1 caf5034608 same last commit 2022-10-13 21:43:48 +02:00
Aevann1 de6de0acae fix security policy in chat.html 2022-10-13 20:42:46 +02:00
Aevann1 3888b29983 potential solution to the chat docker problem 2022-10-13 20:21:02 +02:00
Aevann1 e0559301d5 restore horizontal margin for expanded images 2022-10-13 19:34:31 +02:00
Aevann1 73bd39835b fix cursor on comment and post scores 2022-10-13 16:44:05 +02:00
Aevann1 86d5da7de6 fix this https://rdrama.net/post/112582/chudded-award-now-destroys-hours-of 2022-10-13 13:55:29 +02:00
Aevann1 5849def6c1 dont show vote creation times if they're under 1599343262 2022-10-12 11:04:26 +02:00
Aevann1 2aa281e8c8 refactor sorting again (untested) 2022-10-12 09:03:28 +02:00
Aevann1 e1ee9a69e4 refactor seeing shadowbanned shit (untested) 2022-10-12 08:24:30 +02:00
Aevann1 87578283d2 show the time a hole was created on 2022-10-12 07:40:59 +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 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 ec610e99c5 add details and tell jinja that variables have kept themselves safe 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 d244124d47 make 819.webp the only sidebar image for a couple of days to hopefully piss off someone 2022-10-11 15:54:11 +02:00
Aevann1 998b966f2b remove unnecessary shit in wrappers 2022-10-11 15:19:55 +02:00
Aevann1 592c144454 make the button for removing streamers have a constant width 2022-10-10 07:42:04 +02:00
Aevann1 c2a5231ab5 remove trailing slashes in html files (I dont like them) 2022-10-10 07:40:33 +02:00
Aevann1 5451b126a6 better system for 502.html 2022-10-10 07:32:08 +02:00
Aevann1 1b61d523fa minor cosmetic change 2022-10-10 07:25:32 +02:00
Aevann1 83aa914865 more consistency in templates 2022-10-10 07:23:02 +02:00
Aevann1 a20f5723bf make sure all external urls have rel="nofollow noopener noreferrer" 2022-10-10 07:22:18 +02:00
Aevann1 db929c7615 simplify 3 js functions 2022-10-10 06:56:39 +02:00
Nekobit 02d377307a
use theme 2022-10-09 19:38:10 -04:00
Nekobit 75a605195b
Fix default css 2022-10-09 19:33:28 -04:00
Nekobit abef674662
Main dev, Login, signup 2022-10-09 19:19:48 -04:00
Snakes cf1844d6a4
Fix hat counter logic breaking Simps listing. 2022-10-08 23:55:40 -04: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 4baf7cfa42 make text gold when owned all hats 2022-10-08 10:44:39 -07:00
justcool393 d05cb09040 fix some minor formatting 2022-10-08 10:39:36 -07:00
justcool393 491d71a9b5 add owned hats to user page per fish request 2022-10-08 10:37:44 -07:00
justcool393 8292ef8e7e fix clubbing posts 2022-10-08 08:59:31 -07:00
justcool393 fb3dc1706e one missing </div> seriously 
okay and some formatting
 2022-10-08 08:53:34 -07:00
justcool393 57a917339d gonna try and make it not broken 
i think whitespace is the issue here
also fix grant- and bar- classes
 2022-10-08 02:31:18 -07:00
Aevann1 1236d7bcd5 fix "remove" button in /live 2022-10-08 08:13:35 +02:00
Aevann1 745184acc6 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-08 08:08:35 +02:00
Aevann1 acbfbb07ce rework "are you sure?" and make it work on subscribing to posts and reverting admin actions 2022-10-08 08:06:46 +02:00
justcool393 1f996662d4 end if 2022-10-07 23:02:21 -07:00
justcool393 a910cede78 userBanBlock block was incorrect on mobile 2022-10-07 22:43:36 -07:00
justcool393 437f7e63d7 upper admin tools macro 
also we change the remove admin and revert admin actions button to be red
 2022-10-07 22:43:36 -07:00
justcool393 45a52e96f4 some small whitespace changes 2022-10-07 22:43:36 -07:00
justcool393 8f2d656bb3 rename page and also add macro for ban area 2022-10-07 22:43:36 -07:00
Snakes 3949670088
WPD: sidebar update for flair & rule changes. 2022-10-08 01:10:39 -04:00
Snakes d1e065460e
Fix hole modlog pagination. 2022-10-08 00:32:03 -04: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
Aevann1 137fa7c6d6 remove unused blocks + allow banners to be expandable everywhere 2022-10-08 04:04:46 +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
Aevann1 e89eae1ec4 same as last commit 2022-10-08 01:01:26 +02:00
Aevann1 d85c3d8797 make WPD banners clickable 2022-10-08 01:01:04 +02: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 91cb50db38 import with context 2022-10-07 01:18:20 -07:00
justcool393 7a0692b16a minor whitespace change 2022-10-07 01:11:59 -07:00
justcool393 96bd7d65b4 correct form name 2022-10-07 01:11:59 -07:00
justcool393 6b037f26e0 spaces -> tabs here 
idk if that's the "accepted" code style but i'm using it here for consistency
 2022-10-07 01:11:59 -07:00
justcool393 d3712f0378 correct class names in javascript 2022-10-07 01:11:59 -07:00
justcool393 9874470065 lower userpage admin tools as a macro 2022-10-07 01:11:59 -07:00
justcool393 26fbf726a4 remove unused permission 2022-10-06 23:24:00 -07:00
justcool393 1e585c07fa
p author id 2022-10-06 21:36:31 -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 c5fa8a9e0c sb fix 2022-10-06 20:20:51 -07:00
justcool393 2d66363fed fix mobile template 2022-10-06 20:19:39 -07: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 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
justcool393 35162a4899 submission: change ADMIN_HOME_VISIBLE permissions to can view post mod tools perm 
user: make so user can't moderate themselves at least in the UI
 2022-10-06 18:44:33 -07:00
Aevann1 e0b1d7968a fix prev commit 2022-10-07 03:35:21 +02:00
Aevann1 01071a20e8 add banner_thread to PCM 2022-10-07 03:32:08 +02:00
justcool393 9b705fc23e check proper permissions 2022-10-06 18:31:40 -07:00
Aevann1 d1f52447b1 remove old earlylife css code 2022-10-07 01:45:23 +02:00
Aevann1 4d15d76dfa show the earlylife parantheses in more places 2022-10-07 01:31:09 +02:00
Aevann1 dc93b5b7d2 get rid of the downvote table 2022-10-07 00:21:24 +02:00
Aevann1 ec58f10733 make capitalization consistent in leaderboard template 2022-10-06 23:59:49 +02:00
Aevann1 9bff6a682e fix margins for award_modal and emoji_modal and popover 2022-10-06 23:16:16 +02:00
Snakes c7ef508c2f
PCM: update sidebar with livelist link. 2022-10-06 14:02:01 -04:00
justcool393 7fa874fd84 check current user's admin level not the victim's 2022-10-06 03:34:12 -07:00
justcool393 5e821add4a i don't know why this is different but fix an missing endif 2022-10-06 03:17:45 -07:00
justcool393 b7580e788b change whitespace just so i can read this darn page 2022-10-06 03:13:30 -07: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 931cee2393 fix syntax error 2022-10-06 02:41:03 -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
justcool393 30f3321218 mobile post admin actions 2022-10-06 02:20:38 -07:00
justcool393 941bf69227 syntax error 2022-10-06 02:06:48 -07:00
Aevann1 e071f9c81b remove leaderboard_thread 2022-10-06 10:23:29 +02:00
justcool393 397cf68abd view vote buttons on user page 2022-10-06 01:14:32 -07:00
justcool393 02d0e2043e rename APPS_MODERATE to APPS_MODERATION 2022-10-06 00:40:36 -07:00
justcool393 767093d060 add perms for things we don't really know what they are 2022-10-06 00:32:05 -07:00
justcool393 f5be49c336 some template end stuff 
i feel like this one is ehhhh and might have to be fixed at some point
i'm not sure where some of these things are used, the templates really need to be refactored
 2022-10-06 00:17:12 -07:00
justcool393 b58b506014 lottery admin templateend 2022-10-05 23:59:52 -07:00
justcool393 9b8a3f21ab templateend hats, marseys, apps, notifications, etc 2022-10-05 23:56:37 -07:00
justcool393 d04e5a188c streamer moderation templateend 2022-10-05 23:46:37 -07:00
justcool393 6c3b0f13da search and stuff 2022-10-05 23:45:27 -07:00
justcool393 45f40f32b7 admin user page fix 2022-10-05 23:33:39 -07:00
justcool393 98397e7d3f admin home and user last active viewing 2022-10-05 23:27:34 -07: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 8d51980dca rename cache purge things to include prefix 2022-10-05 23:21:04 -07:00
justcool393 22af7f3bfc admin home page modifications 2022-10-05 23:18:08 -07:00
justcool393 4fdccc331a view last active in template 2022-10-05 23:02:27 -07:00
justcool393 0c0fa68cb4 title change permission 2022-10-05 22:45:44 -07:00
justcool393 dc5a132583 mop visibility, WPD notifications, and a fix with shadowbans 2022-10-05 22:25:45 -07:00
justcool393 f531b12727 alt seeing eye 2022-10-05 22:01:02 -07:00
Aevann1 0c8ead2e7d stop using lain.la 2022-10-06 06:31:08 +02:00
justcool393 9bb7b3758f distinguish stuff 2022-10-05 21:19:11 -07:00
justcool393 976f1808c3 templates for admins... 
we REALLY should do something about that gigantic code duplication
 2022-10-05 21:03:24 -07:00
Aevann1 dd950c96f6 Merge branch 'frost' of https://github.com/Aevann1/rDrama into frost 2022-10-06 05:37:54 +02:00
Aevann1 140db5052c remove shit i accidentially committed :marseybrainlet: 2022-10-06 05:37:52 +02:00
Snakes 7f81f62bb3
Amend ebf83687948: that was r-slurred. 2022-10-05 23:17:09 -04:00
Snakes ebf8368794
WPD: fix mobile header logo sizing. 2022-10-05 23:11:59 -04: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
Aevann1 94e441a23b decrrease max-width for a bunch of modals from 90% to 85% 2022-10-06 03:01:52 +02:00
justcool393 04f24cd8fd content moderation permission level 
holy crap there's a lot
 2022-10-05 17:57:08 -07:00
Snakes bfc6ff3122
Make WPD login text typography improper for Carp. 2022-10-05 19:26:49 -04:00
Snakes 3f338fc3f2 WPD: add login required explanatory text. 2022-10-05 19:17:42 -04:00
Aevann1 d57d4c9864 swap banner for PCM 2022-10-06 00:19:06 +02:00
Aevann1 3cd21e8899 got rid of printi awards 2022-10-05 23:23:00 +02:00
Aevann1 fabbc7a1a3 allow hole jannies to mark posts and comments in their holes as +18 2022-10-04 22:10:59 +02:00
Aevann1 d98e4c9c1c convert repo from CRLF to LF 2022-10-04 17:24:58 +02:00
Snakes e05b1197c6
Identify benefactors in listing. 2022-10-02 15:37:22 -04:00
Snakes 701f64c91b
Change comment search to use tsvector. 2022-10-02 04:55:39 -04:00
Snakes cd0b564401
Add 'added' column to /marseys. 2022-10-01 18:27:51 -04:00
Aevann1 a7acbe9831 show our email to loggedout visitors in /contact 2022-10-01 12:14:46 +02:00
Snakes fab2359256
Fix userpage template logic for mobile ban display. 2022-09-30 17:49:47 -04:00
Aevann1 30d4f5e902 allow carp and snakes to see /patrons 2022-09-30 23:07:53 +02:00
Snakes feb5d25e83
Add "banned by" to userpage ban string. 2022-09-29 23:38:26 -04:00
Snakes 60d6f8b20d WPD: add revolving banner selection. 2022-09-29 14:09:26 -04:00
Aevann1 c628e4448e cosmetic change 2022-09-29 13:50:03 +02:00
Aevann1 b93b96bb77 cosmetic change 2022-09-29 12:30:17 +02:00
Aevann1 2dd2da1ba7 cosmetic change 2022-09-29 12:28:52 +02:00
Aevann1 51d7cd6d7e fix shit with hole logs 2022-09-29 12:18:27 +02:00
Aevann1 09cc43060d
add hole mod logs (#380) 2022-09-29 11:39:37 +02:00
Aevann1 03e925fb3c use ban_reason column as a reason for shadowbanning too 2022-09-29 08:36:59 +02:00
Aevann1 b9d3336a9e nitter shit 2022-09-29 07:53:37 +02:00
Aevann1 6c1237eaa6 remove hand pointer from exile symbol 2022-09-29 07:53:36 +02: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
Outrun Colors 8ac70df325 Add optimistic messages 2022-09-27 19:06:44 -05:00
Outrun Colors 411ff5293e
Re-add lite-youtube script 2022-09-27 17:17:42 -05:00
Outrun Colors 2e9c774a5d
Re-add expanded image and emojimodal 2022-09-26 20:28:39 -05:00
Snakes dcf689527b
WPD: restrict rotating sidebars to logged-in. 2022-09-26 01:43:57 -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 0ee100895a fix prev commit 2022-09-26 06:24:52 +02:00
Aevann1 305f17a8aa test yarn 2022-09-26 06:20:27 +02:00
Aevann1 69ec89375f fix tall emojis in emoji modal 2022-09-26 06:17:52 +02:00
Aevann1 9d3c337eb3 500 -> 502 2022-09-26 05:03:01 +02:00
Aevann1 a33c06f9e0 reduce margin 2022-09-26 05:02:29 +02:00
Aevann1 38a829f1e4 make description better 2022-09-26 05:01:53 +02:00
Aevann1 ba0ca7649f stop misleading ppl in 502.htmo 2022-09-26 05:00:59 +02:00
Snakes b0529716bc Remove voluntary marsify toggle. 2022-09-25 21:32:36 -04:00
Aevann1 8269b0dc0f make it look better 2022-09-25 09:09:48 +02:00
Aevann1 5a97a6f6e6 allow pcm /live to enter channel link 2022-09-25 08:45:19 +02:00
Aevann1 10d09f076c fix 2022-09-25 08:18:03 +02:00
Aevann1 03f9a69a0d same as last commit 2022-09-25 08:15:30 +02:00
Aevann1 10d06b7ba9 same as last commit 2022-09-25 08:15:17 +02:00
Aevann1 164b583e7c added "watching" in /live 2022-09-25 08:00:02 +02:00