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

21352 Commits (8c08818d35dccce42adb52c184bcb8e2de571512)

Author SHA1 Message Date
Aevann 8c08818d35 improve NOT_IN_CODE_OR_LINKS 2023-07-03 03:20:55 +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 499781329f remove event_darkmode 2023-07-03 01:55:56 +03:00
Aevann a5f21ea658 restore /update for !everyone since its needed 2023-07-03 00:48:23 +03:00
Aevann 25b9a0f535 stop usage of .update 2023-07-03 00:42:34 +03:00
Aevann a11c12ef77 remove unnecessary const 2023-07-03 00:41:35 +03:00
Aevann 4aedec05d1 increase session age 2023-07-03 00:21:35 +03:00
Aevann 8f323c3ec6 restore perma-marsify toggle for paypigs only 2023-07-02 23:07:31 +03:00
Aevann 9d2f855b8e remove wpd special condition 2023-07-02 23:03:31 +03:00
Aevann f4af0779fd add error for signatures for non-paypigs 2023-07-02 22:57:08 +03:00
Aevann dd37775c6b try moving _award_timers_task to every_1h 2023-07-02 22:51:16 +03:00
HeyMoon 331b35a3f9 fix Xmaxxing (and add badass images) (#164) 
Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#164
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
 2023-07-02 17:41:46 +00:00
SneedBot 731f5ecbef sneed 2023-07-02 17:41:21 +00:00
Aevann fb153e9a14 when u visit someone's profile, see who chudded them 2023-07-02 20:40:39 +03:00
Aevann 1cd13cf4da make jannies able to award shadowbanned-cels 2023-07-02 20:24:21 +03:00
Aevann 07695039d7 escape / 2023-07-02 20:24:21 +03:00
Aevann 11e8e93901 fix overflow 2023-07-02 17:31:13 +03:00
Aevann 4841ab1864 fix 500 error 2023-07-02 02:50:41 +03:00
Aevann ca375b72ca dont advertise push notifs 2023-07-02 02:35:14 +03:00
Aevann b072783887 remove now-unnecessary err,css 2023-07-02 02:27:29 +03:00
Aevann f1b9cdd701 add today tld 2023-07-02 02:26:57 +03:00
Aevann 3d1905d51c make error page prettier 2023-07-02 02:20:04 +03:00
Aevann 0b4ead5f81 fix 500 error 2023-07-02 02:14:57 +03:00
SneedBot 784de237db sneed 2023-07-01 23:05:09 +00:00
Aevann 1ec48ce9e8 remove exclamation mark 2023-07-02 02:04:51 +03:00
Aevann b58c09f374 restore app tooltip + add something for iphonecels on it 2023-07-02 02:03:41 +03:00
Aevann c1d7b9acc2 fix duplicate cookie issue 2023-07-02 02:00:56 +03:00
borntolurk 072010ff8a Fix PWA top padding (#163) 
Co-authored-by: borntolurk <borntolurk@rdrama.net>
Reviewed-on: rDrama/rDrama#163
Co-authored-by: borntolurk <borntolurk@noreply.fsdfsd.net>
Co-committed-by: borntolurk <borntolurk@noreply.fsdfsd.net>
 2023-07-01 22:14:59 +00:00
Aevann c69400482e make block button be red 2023-07-02 00:41:36 +03:00
SneedBot 6a4f978d14 sneed 2023-07-01 21:26:34 +00:00
Aevann f4d96c4e88 fis this https://rdrama.net/post/184174/hecko-its-independence-gay-weekend-grill/4483286#context 2023-07-02 00:22:13 +03:00
Aevann fb1f282804 remove unnecessary route 2023-07-01 22:37:43 +03:00
Aevann b2b5633c8b fix forgotten subdomain 2023-07-01 22:37:32 +03:00
Aevann 7f6675f7f9 remove unddit.com (RIP u will not be forgotten) 2023-07-01 19:41:59 +03:00
SneedBot 0d6cc6745c sneed 2023-07-01 16:35:05 +00:00
Aevann 8555e370be restore necessary xhr.withCredentials for WPD 2023-07-01 19:34:47 +03:00
Aevann 2dde07bf0f shorten profile background url on mobile too 2023-07-01 18:33:06 +03:00
Aevann ecb13538ec remove bard law sidebar for being insulting to treasured effortposters 2023-07-01 18:31:46 +03:00
Aevann eccea6347f add name notifs on wpd 2023-07-01 18:30:57 +03:00
Aevann eed7410277 make spam bans generate modlog items + dedup 2023-07-01 18:27:56 +03:00
SneedBot 864a6ff321 sneed 2023-07-01 15:14:57 +00:00
Aevann b7d089d0c3 Revert "change dramblr unread color" 
This reverts commit 848aa08e57.
 2023-07-01 18:14:40 +03:00
SneedBot adbdb4e395 sneed 2023-07-01 14:21:03 +00:00
Aevann e863d93b2b increase post ratelimit on WPD 2023-07-01 17:19:53 +03:00
Aevann d237d30bd7 make popover view button unbreakable 2023-07-01 04:29:40 +03:00
Aevann f6391c7997 fix birthgay 500 error 2023-07-01 04:13:41 +03:00
Aevann c0748c8a36 add guide to enabling push notifs 2023-07-01 04:11:21 +03:00
Aevann 6bd40e1c41 fix wrong condition 2023-07-01 04:05:37 +03:00
Aevann e8253b1240 hide app icon inside the PWA 2023-07-01 04:05:28 +03:00
Aevann 54a7a81469 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4421734#context 2023-07-01 03:51:38 +03:00