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

9498 Commits (efc390e0c0dda47929b1419ddaa41cf354725386)

Author SHA1 Message Date
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
Aevann1 e9e8b5cc5a fix grammar (i think) 2022-09-25 06:45:22 +02:00
Aevann1 230b71c19b same as last commit 2022-09-25 06:22:33 +02:00
Outrun Colors c8b574906b
Fix button borders in dark theme 2022-09-24 22:13:42 -05:00
Aevann1 dd7145410f add spider toggle 2022-09-25 04:44:19 +02:00
Aevann1 a3a7ec6296 improve JC's previous cc PR 2022-09-25 04:32:51 +02:00
Snakes 6fceaf0e6f
Add exile time to sub exiles listing. 2022-09-24 14:18:00 -04:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Snakes 98936efe60
assetcache: apply to all CSS and JS assets. 2022-09-24 03:04:06 -04:00
Aevann1 a8c9851b94 sneed 2022-09-24 05:31:49 +00:00
Outrun Colors 34a515ca1f
Always scroll to the bottom for now 2022-09-24 00:00:20 -05:00
Outrun Colors 693457a393
Scroll to the bottom a single time 2022-09-23 23:50:21 -05:00
Outrun Colors 2282412327
Fix issue for iphone 2022-09-23 23:43:36 -05:00
Outrun Colors 29034785f8
Minor styling changes 2022-09-23 23:34:56 -05:00
Snakes 1fe02b7743
Chat rework deployment infra fixes. 2022-09-24 00:26:44 -04:00
outruncolors 484de39566
[DO NOT MERGE] Chat restructure (#360) 
* Create new subdirectory for chat-related stuff

* Gitignore

* Have new code show up on chat

* Have new code show up on chat

* Fix config issue

* More script stuff

* Create UserInput components

* More chat changes

* More updates to chat

* Add chat:watch script

* Move up state and pass down

* Match up existing functionality entirely

* Match up existing functionality entirely

* Send a message when hitting Enter

* feature based directories

* First crack at emoji drawer

* Leave everything in a fucked up state ugh

* Leave it in a better state

* Stop for the night

* Decouple by abstract chat functionality to provider

* Wait a minute...

* Small chat restructure

* Prepare for notifications

* Add root context

* Flash number of messages

* Read this and u die

* Add quote functionality

* Couple tweaks

* Shallowenize the features dir/

* Add activity list

* Ch-ch-ch-ch-ch-changes

* Enable moving drawer

* Hover style on activities

* UserList changes

* Add emoji processing logic

* Duhhhh

* Scroll to top when changing query

* Put the emoji in the drawer

* Improve emoji drawer

* Add emoji genres

* Do not show activities

* Add feature flag technology

* Fix issue where own messages were triggering notifications

* Adjust startup scripts

* Responsive part 1

* Styling changes for emoji genres

* More emoji drawer styling

* Add QuickEmojis

* Re-add classnames

* Set version

* Modify build script

* Modify build script

* Mild renaming

* Lots of styling changes

* Leggo.
 2022-09-23 22:49:40 -05:00
justcool393 a51bfa3d4c
country club leak fix (#370) 2022-09-24 02:37:32 +02:00
Aevann1 550e5636e9 same as last commit 2022-09-24 02:24:35 +02:00
Aevann1 1e1aca0fb5 fix width 2022-09-24 02:24:27 +02:00
Aevann1 33c715b89e fix /live 2022-09-24 02:20:02 +02:00
Aevann1 2baae488d1 fix /live 2022-09-24 02:18:24 +02:00
Aevann1 337e27ef84 fix 2022-09-24 02:16:21 +02:00
Aevann1 b32a399925 fix 2022-09-24 02:11:40 +02:00
Aevann1 d2021c3b94 add "are you sure?" to /live 2022-09-24 02:07:43 +02:00
justcool393 a1868750ee
show if user is shadowbanned for admins (#368) 
there's really no other indication in the UI except the unshadowban button
 2022-09-24 02:03:57 +02:00
Snakes 7b9ac8e13b
Fix Thin badge popover sizing; expand assetcache. 2022-09-23 18:38:53 -04:00
Snakes 74da6e602d Revert "PCM /live: fix hover border resizing table rows." 
This reverts commit baf93e4854.

Apparently the resizing was desired behavior.
 2022-09-23 17:49:51 -04:00
Snakes baf93e4854
PCM /live: fix hover border resizing table rows. 2022-09-23 17:42:21 -04:00
Snakes fc8c8b08a0
Add "Upvoted" post/comment lists on profile. 2022-09-23 17:33:46 -04:00
Aevann1 ea34a00571 fix collapsing happening in main notif page 2022-09-23 15:12:20 +02:00
Aevann1 ebf83048be add /blockers (thx JC <3) 2022-09-23 14:58:33 +02:00
Aevann1 67dcc87599 n-word 2022-09-23 14:39:59 +02:00
Aevann1 ba32ac8f3a cosmetic change 2022-09-23 14:18:24 +02:00
Aevann1 1de6ec7dc7 minor cosmetic changes in /live 2022-09-23 14:06:17 +02:00
Aevann1 1ec3755229 lazyload the streamer profile pics 2022-09-23 00:35:21 +02:00
Aevann1 8abafeec1b fix opening channels 2022-09-23 00:34:34 +02:00
Aevann1 495cc60a26 fix /live 2022-09-23 00:27:38 +02:00
Aevann1 ada5ab61a6 validate inputted channel id 2022-09-23 00:02:15 +02:00
Aevann1 2ef91698f4
allow PCM chadmins to add or remove channels (#365) 
* testing on devrama

* fix for devrama

* fix

* fix

* fix

* fix

* fix

* fix

* test

* fix

* test

* test

* commit
 2022-09-22 23:40:32 +02:00
Aevann1 d80a2f2331 add "are you sure?" to "declare winner" 2022-09-22 22:11:56 +02:00
Aevann1 40cd38d052 add padding to /live 2022-09-22 20:35:25 +02:00
Aevann1 ce30fa4064 add border-radius to streamer thumbnails 2022-09-22 20:30:51 +02:00
Aevann1 512d906970 slow down the blinking 2022-09-22 20:26:31 +02:00
Aevann1 227810dec9 add /live icon 2022-09-22 06:34:16 +02:00
Aevann1 0be4167069 revert last commit 2022-09-22 04:47:28 +02:00
Aevann1 b85c1940ed [pcm] cosmetic change 2022-09-22 04:46:44 +02:00
Aevann1 ddcebd10be cosmetic changes 2022-09-22 04:29:09 +02:00
Aevann1 1dfbad69b8 cosmetic changes 2022-09-22 04:27:41 +02:00
Aevann1 61f4ae8731 add a red circle to /live 2022-09-22 04:25:03 +02:00
Aevann1 d55438afad
Live (#364) 
* test on devrama

* fix prev commit

* fix prev commit

* try some shit

* try some shit

* try some shit

* fix

* make it easier to change notif colors with custom css

* de

* t

* fgddfg

* fds

* fix

* fds

* dfs

* pain

* sdfsdf

* df

* xcv

* fd

* vxc

* xcv

* c

* fgdfgd

* sdf

* fsd

* fds

* sfd

* fdsf

* fd

* fds

* fds

* fsd

* fds

* fds

* fds

* fds

* fsd

* fds

* df

* fds

* dfs

* fd

* fsd

* fsd

* dfs

* sdf

* fsd

* fsd

* df

* dfs

* fd

* fsd

* dfs

* sdf

* sdf

* sdf

* fsd

* fds

* sfd

* sdf

* fds

* dfs

* df

* sdf

* sdf

* /live
 2022-09-22 04:17:02 +02:00
Aevann1 88137c848e make it easier to change notif colors with custom css 2022-09-22 01:22:59 +02:00
gooseman 5348d50df0 fix spoiler issue on classic 2022-09-21 11:30:49 -07:00
Aevann1 97dc727e22 cachebust 2022-09-20 23:22:58 +02:00
Aevann1 8b93507b19 testing on devrama 2022-09-20 23:22:09 +02:00
Aevann1 56d1d7ccfe testing on devrama 2022-09-20 23:19:39 +02:00
Aevann1 25c6673f5c allow ppl to reply to DMs multiple times without refreshing 2022-09-20 21:06:26 +02:00
Aevann1 6f28acf4ae fix last commit 2022-09-20 20:58:20 +02:00
Aevann1 c10342e835 fix error in console 2022-09-20 20:54:52 +02:00
Aevann1 ad298b90e7 fix award modal on mobile 2022-09-20 20:46:41 +02:00
Aevann1 96887646a9 remove linebreak 2022-09-20 20:06:14 +02:00
Aevann1 20d5efa12e improve spider award badge 2022-09-20 20:04:42 +02:00
Aevann1 272e39ebf2 add spider award 2022-09-20 19:52:52 +02:00
Aevann1 aa5752530a make max num of fireflies same max num of bugs 2022-09-20 19:27:41 +02:00
Aevann1 cf7e0c8fe2 fix prev commit 2022-09-20 18:46:06 +02:00
Aevann1 ac984a092f dont show "None" on previews when user doesnt have a bio 2022-09-20 18:44:36 +02:00
Aevann1 fc79629184 cosmetic change 2022-09-20 17:44:45 +02:00
Aevann1 17dd6427d0 change merch link 2022-09-20 04:20:16 +02:00
Aevann1 9241779c06 add border to expanded image 2022-09-20 04:02:48 +02:00