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

497 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann 74587b12da use can_see_shadowbanned 2023-10-05 12:44:42 +03:00
Aevann 109b91e977 fix tabs and label 2023-09-29 09:31:01 +03:00
Aevann 8c8566dc56 fix audio 2023-09-29 03:12:03 +03:00
Aevann 60580cc6fa add orgy icon 2023-09-17 23:58:08 +03:00
Aevann c4dcb3e312 remove unnecessary ; 2023-09-15 14:28:43 +03:00
Aevann a1dea631f7 Revert "remove settings2.html for being an unnecessary artifact from times where our pages were much fewer" 
This reverts commit aec8d2bfb1.
 2023-09-08 20:07:40 +03:00
Aevann aec8d2bfb1 remove settings2.html for being an unnecessary artifact from times where our pages were much fewer 2023-09-07 12:09:48 +03:00
Aevann f8758170d4 fix page title 2023-09-05 21:38:18 +03:00
Aevann 8bae228129 add separate chatroom for orgies 2023-09-05 18:32:57 +03:00
Aevann 9297f88353 space consistency in jinja if statements 2023-08-16 23:41:25 +03:00
Aevann f0e6814384 add file orgies 2023-08-16 23:13:24 +03:00
Aevann a2215787db add CTRL+ENTER support in /admin/orgy 2023-08-16 22:18:05 +03:00
Aevann 39098fe323 kitchen sink commit 2023-08-12 00:50:23 +03:00
Aevann b91e3465bb we require ban reason now 2023-08-10 18:38:11 +03:00
Aevann 34860303fb fix emojis in shadowbanned tooltip 2023-08-10 18:37:29 +03:00
Aevann 93d89218b1 remove login_required from ddos_detected 2023-08-10 00:46:12 +03:00
Aevann 9a28e36265 remove login_required from ddos_detected effects 2023-08-10 00:41:51 +03:00
Aevann 66c2740a8a fix signup toggle 2023-08-10 00:22:46 +03:00
Aevann bda8b2b303 disable signups toggle too 2023-08-10 00:19:51 +03:00
Aevann 9712a195f8 add url requirement to 8 badges 2023-08-05 22:36:32 +03:00
Aevann 32966cbc62 add "give badge" button to profiles for easier badging 2023-08-05 13:24:37 +03:00
Aevann 16e6962f2d restore top margin in badge_admin.html 2023-08-04 19:50:29 +03:00
Aevann 52f9a99af1 add mass badge granting and removal 2023-08-03 07:42:58 +03:00
Aevann 47cfa0d922 Revert "Revert "move username in badge_admin.html to the bottom with the other fields"" 
This reverts commit 655f238156.
 2023-08-03 07:34:46 +03:00
Aevann 8caa93f9cd use {patron} 2023-08-02 00:56:17 +03:00
Aevann 8225e69cb0 cachebust badges 2023-08-01 10:44:35 +03:00
Aevann eebc6db138 use tabs not spaces 2023-08-01 10:38:30 +03:00
Aevann 69ec9dab2f fix top 10 patrons badge 2023-08-01 10:16:47 +03:00
Aevann 655f238156 Revert "move username in badge_admin.html to the bottom with the other fields" 
This reverts commit 9bb1482278.
 2023-08-01 04:36:17 +03:00
Aevann 65f9b986dd add button to claim paypig rewards for all users 2023-08-01 04:28:29 +03:00
Aevann 9bb1482278 move username in badge_admin.html to the bottom with the other fields 2023-08-01 01:27:53 +03:00
Aevann 12874150cc tell jannies which sites are supported for orgy 2023-07-26 02:25:51 +03:00
Aevann a72c18bed7 fix mention html (im retarded) 2023-07-22 21:12:04 +03:00
Aevann 988a14f187 use SITE_FULL_IMAGES whenever u possibly can 2023-07-22 19:24:16 +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
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 778f4f045e rename variable 2023-06-29 23:10:31 +03:00
Aevann 32fa466e6a rename submissions to posts 2023-06-08 02:26:32 +03:00
Aevann fd5cdf23d3 rename "Multi Vote Analysis" to "Alt Vote Analysis" 2023-06-06 22:15:25 +03:00
Aevann 0c2e0f0b67 restore transparency for namelock badge 2023-05-16 03:25:31 +03:00
Aevann 35ba2f7abb trim badges 2023-05-12 19:15:14 +03:00
Aevann dc55f4a5d0 complement 519fbef9a7 2023-05-12 18:42:21 +03:00
Aevann c7a7d6a2b9 complement 519fbef9a7 2023-05-12 18:35:31 +03:00
Aevann 519fbef9a7 rename dm_images to dm_media 2023-05-12 18:27:46 +03:00
Aevann 6116fdceb4 add tooltip to /admin/patrons 2023-05-11 17:30:57 +03:00
Aevann 88a8d6e03e fix sorting by tier 2023-05-11 17:27:48 +03:00
Aevann d123872dd5 fix last commit 2023-05-11 17:15:14 +03:00
Aevann a57d31a93f try something 2023-05-11 17:14:27 +03:00
Aevann e3f58e3e78 add lifetime donated column 2023-05-11 16:57:53 +03:00
Aevann 7ebfd9808d cachebust badges 2023-05-10 22:16:18 +03:00
Aevann d82f1161cf use new pagination system in removed posts and comments 2023-05-05 08:38:08 +03:00
Aevann 6ecfc32317 test smth in staging 2023-05-05 08:14:03 +03:00
Aevann ade4323edb paginate /admin/image_posts 2023-05-05 06:52:53 +03:00
Aevann 26dae77c86 easier panel 2023-05-05 04:32:57 +03:00
Aevann a0469edfc7 use new pagination system 2023-05-05 03:50:36 +03:00
Aevann 0dc8b5ccb1 don't use pomf for DM images anymore and allow for video and audio in DMs 2023-05-05 00:52:37 +03:00
Aevann f5a97ae709 add new patron tier for benefactor-cels 2023-05-03 18:29:31 +03:00
Aevann 514fb320cf show truescore in admin.patrons and order by it 2023-05-03 17:47:06 +03:00
Aevann 90127ffa27 rename path 2023-05-03 17:45:14 +03:00
Aevann f1c66a31e3 add P̵͇̕S̶̔̇Ȳ̴͙C̶͋͗H̵͒̉O̴̎̍ tier to WPD 2023-05-02 22:27:39 +03:00
Aevann 716e7f877e Revert "stop patron and house images from causing page jumps" 
This reverts commit aabeca66f0.
 2023-05-02 20:13:02 +03:00
Aevann 7e9e143642 cachebust house and patron images 2023-05-02 20:09:22 +03:00
Aevann aabeca66f0 stop patron and house images from causing page jumps 2023-05-02 19:48:49 +03:00
Aevann 869ccb6c68 expand all images 2023-04-27 15:02:46 +02:00
Aevann 93422e2be9 cache-bust all 2023-04-25 18:24:12 +02:00
Aevann 02427b6da0 same as last commit 2023-04-09 00:38:26 +02:00
Aevann 33464589aa add "offline mode" 2023-03-25 23:35:13 +02:00
Aevann 312abdee28 fix capitalizaation 2023-03-25 23:13:47 +02:00
Aevann 674c1594c9 remove typo'd class 2023-03-21 19:12:38 +02:00
Aevann ca99c46e12 make update_assets.html more self-explanatory 2023-03-21 19:02:30 +02:00
Aevann bdc5d8bd12 allow jannies to change the kind of emojis 2023-03-21 18:50:26 +02:00
Aevann a5d7cc63ed cachebust all assets 2023-03-21 15:58:14 +02:00
Aevann df1ebf7cad use SITE_FULL_IMAGES in more places 2023-03-19 18:30:22 +02:00
Aevann 91678f09de marsey -> emoji 2023-03-18 16:04:56 +02:00
Aevann dd54413cf3 convert marsey submission form to include all emojis 2023-03-18 15:34:04 +02:00
Aevann 70d8510122 move 2 js files to /admin folder 2023-03-17 16:22:29 +02:00
Aevann 3de34c9a65 Merge branch 'keep-session-open' of https://fsdfsd.net/rDrama/rDrama 2023-03-15 08:02:47 +02:00
Aevann 9f86dfad9e fix /admin 2023-03-15 06:51:36 +02:00
Aevann 7b65b062b1 fix /admin 2023-03-15 06:50:56 +02:00
Aevann da75577732 cachebust badges 2023-03-15 06:05:59 +02:00
Aevann 97608ea0a9 test getting rid of ![]( on devrama 2023-03-12 15:02:31 +02:00
Aevann 84cebda61f rename perm to be more clear 2023-03-11 06:53:54 +02:00
Aevann 964a3d3883 move IMAGE_FORMATS to root.html 2023-03-07 06:44:11 +02:00
Aevann b2c7ca31da move disabling buttons to bottom.js 2023-03-07 02:21:08 +02:00
Aevann b83aa1d82c better media code 2023-03-06 20:02:12 +02:00
Aevann 7417a115af combine 2 janny perms 2023-03-05 12:03:21 +02:00
Aevann 3a67c1647d fix bug with pasting in /submit + dedup 2023-03-04 21:54:06 +02:00
Aevann 0073c2224f move update_assets.html 2023-03-04 20:55:07 +02:00
Aevann fa2066117c remove unnecessary for attribute 2023-03-03 09:23:05 +02:00
Aevann ff4e04a926 add disable-sort-click to all empty <th>s 2023-02-24 23:55:01 +02:00
Aevann 03a82a0d4f delete code irrelevant now 2023-02-23 15:04:33 +02:00
Aevann b0fdd78d8b log timestamp in dm_images 2023-02-22 19:21:16 +02:00
Aevann bd97dc7d5f fix last commit 2023-02-22 16:43:39 +02:00
Aevann 42ed35770c paginate /admin/dm_images 2023-02-22 16:36:52 +02:00
Aevann b1d86491f8 fix page title 2023-02-21 22:18:41 +02:00
Aevann 288fcde832 add /admin/delete_media 2023-02-19 21:31:26 +02:00
Aevann 8d660cb49a add perms conditionals in /admin 2023-02-19 21:17:09 +02:00
Aevann d7d7a681f9 add 2 additional links in /admin 2023-02-18 23:07:37 +02:00
Aevann ef2bda6920 remove relinking 2023-02-18 16:55:18 +02:00
Aevann 44a80f0492 make under_attack a setting and use it in /submit for WPD 2023-02-09 05:50:30 +02:00