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

1114 Commits (e99fe52ab0e6aa7ee5a34124bf36f63b542922a0)

Author SHA1 Message Date
Aevann 8d84748c42 add spaces for consistency 2023-08-24 00:57:39 +03:00
Aevann c05a63b78c stop /admin/shadowbanned from taking so long 2023-08-23 14:13:35 +03:00
Aevann 8097c16b55 remove now-unnecessary lines relating to int vals 2023-08-20 19:03:34 +03:00
Aevann c7dee1ab56 remove url requirement for sk8r boi badge 2023-08-19 00:06:57 +03:00
Aevann d60c1b051a remove annoying ! 2023-08-17 03:07:29 +03:00
Aevann 88bfaa3326 allow carp to delete image assets 2023-08-17 03:07:13 +03:00
Aevann 2f555e87dd add missing pushnotif_url 2023-08-17 02:04:56 +03:00
Aevann f0e6814384 add file orgies 2023-08-16 23:13:24 +03:00
Aevann 577b1e3780 fix this https://rdrama.net/post/197158/pov-you-are-a-coyote-you/4809394#context 2023-08-16 01:02:02 +03:00
Aevann aee38394f8 remove the incentive for paypigs to enable perma-marsify to avoid ever getting chudded 2023-08-12 21:38:41 +03:00
Aevann 39098fe323 kitchen sink commit 2023-08-12 00:50:23 +03:00
Aevann e9edd9f89a use abort for cocnsistency 2023-08-11 19:57:41 +03:00
Aevann 3ec2038caf same as last commit 2023-08-11 16:15:34 +03:00
Aevann be796452db dedup DEFAULT_RATELIMIT 2023-08-06 10:30:34 +03:00
Aevann d9e0e83639 url limit 3 more badges 2023-08-06 00:23:21 +03:00
Aevann cf7b034cf2 make sure url is null not '' 2023-08-05 22:51:01 +03:00
Aevann 9712a195f8 add url requirement to 8 badges 2023-08-05 22:36:32 +03:00
Aevann ed34558f33 remove unnecessary .all() 2023-08-05 22:26:42 +03:00
Aevann 542e96585e remove unused imports 2023-08-05 22:03:48 +03:00
Aevann 87d0a14b37 notify ppl when they're muted or unmuted 2023-08-05 13:27:03 +03:00
Aevann 32966cbc62 add "give badge" button to profiles for easier badging 2023-08-05 13:24:37 +03:00
Aevann 85ee9cda7e fix 500 error 2023-08-04 19:15:51 +03:00
Aevann b2a3163a68 fix badge flow 2023-08-04 16:16:08 +03:00
Aevann df2b20c8dd unmute alts too so the mute doesnt propagate back 2023-08-04 00:27:59 +03:00
Aevann 05c04979ed rename 2 modactions 2023-08-04 00:07:57 +03:00
Aevann 52f9a99af1 add mass badge granting and removal 2023-08-03 07:42:58 +03:00
Aevann 65f9b986dd add button to claim paypig rewards for all users 2023-08-01 04:28:29 +03:00
Aevann 6e9d3d68dc strip after not before 2023-07-30 09:20:02 +03:00
Aevann 8beb2d7e8e remove typing (useless code bloat) 2023-07-30 03:42:06 +03:00
Aevann 0a9b19bb15 delete redis cache on post deletion/removal/undeletion/unremoval 2023-07-29 01:51:54 +03:00
Aevann 7000e1b07e remove a now-unnecessary line 2023-07-28 01:58:38 +03:00
Aevann 16dfd64cdc add spaces 2023-07-27 22:49:36 +03:00
Aevann a94dda90dd remove unnecessary flushes 2023-07-25 23:35:54 +03:00
Aevann 1cacedf72e remove mass_css_validation_holes 2023-07-14 14:43:40 +03:00
Aevann de61601bf5 add - 2023-07-14 14:40:14 +03:00
Aevann edfe63b100 validate hole css 2023-07-14 14:38:48 +03:00
Aevann ff67e30949 dont count failed requests towards ratelimit 2023-07-13 16:50:46 +03:00
Aevann 02c5494703 remove mass_css_validation 2023-07-12 05:12:41 +03:00
Aevann 10e5d52e48 mass css validation 2023-07-12 05:02:31 +03:00
Aevann dc43bca129 consistency 2023-07-11 20:58:01 +03:00
Aevann ee12cd9d66 Revert "minor improvement" 
This reverts commit 2831ae0ccb.
 2023-07-11 20:54:32 +03:00
Aevann 2831ae0ccb minor improvement 2023-07-11 15:27:19 +03:00
HeyMoon abd91f81ac Orgies: Support Rumble and Twitch and Mobile Viewing (#169) 
Hell yeah

 - Rumble.com, basically youtube for rightoids (so you can do more edgy streams)
 - Twitch
 - Mobile orgy support, it's pretty bad thoever
 - Button to switch back to normalchat for phonefags

Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#169
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
 2023-07-10 00:38:02 +00:00
Aevann 43ff6a4b7e give ppl flairlocked by jannies the flairlock badge 2023-07-08 00:01:47 +03:00
Aevann 3e6622c511 cleanup in aisle 4 2023-07-03 03:26:20 +03:00
HeyMoon 7c040367fa Bring back orgies (watchparties), now controllable by admins, and generally better in all ways (#165) 
This PR adds orgies back into rdrama. Long ago, snakes made the original orgy code, and it was super fun. But he had to rush it out, and ended up making it a bit unsustainable, and had a couple questionable coding decisions, which meant that it had to be removed. Hey, the man literally did it in a few hours before the DB trial continued, lmao.

Anyways, I took my own approach to it. I do not use iframes, i just just repurpose code from /chat window. Because I had that freedom, I also moved things around to make the user experience a bit better. I also added a title to give users some context about what's happening. Check it out

![image](/attachments/6719146c-4922-4d75-967d-8d424a09b198)

Most importantly, this is all configurable from the site. Admins with the permission "ORGIES" will see this in their control panel

![image](/attachments/423d6046-a11d-4e84-bd2c-a2a641afd552)

Nigga, idk where to put it, so I made my own category.

If there is no orgy in progress, admins will see this:

![image](/attachments/7c64b9fa-cdf4-4986-a0c4-f2324878062e)

Click the button, and, viola, the orgy begins.

If there is an orgy in progress, the page will look like this:

![image](/attachments/b65be4b3-5db1-43cb-8857-7d3a8ea24ca7)

Click the button, and the orgy stops.

If an orgy is in progress, navigating to /chat will take the user to the orgy seemlessly. But what if they don't want to participate, liek some kind of spoilsport? Just navigate to /old_chat.

That's just about it, it's really that simple. I have lots of ideas for the future, but I'll let that wait til later :).

A few notes about implementation:
 - I moved some functionality out of /templates/chat.html and into /templates/util/macros.html. This is just so I could reference the code directly from my new template, /templates/orgy.html.
 - The orgy is stored as a single row in the new table "orgies". Okay, I know this is a little silly, but you know what they say: "if it's stupid and it works, it's not stupid". (tbf the oceangate ceo also said that)

Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#165
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
 2023-07-02 23:55:37 +00:00
Aevann 15415a2c5a shorten password length 2023-06-30 19:51:59 +03:00
Aevann ed322add97 use more secure token_urlsafe 2023-06-30 19:51:14 +03:00
Aevann 8d608e2939 add "reset password' button to JL-5 2023-06-30 19:39:24 +03:00
Aevann f22df30161 add forgotten clarification in notification 2023-06-30 19:21:18 +03:00