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

1191 Commits (132bc76dc220f1d5e8ea1cd6d695004927baf03b)

Author SHA1 Message Date
Aevann f15c8ed3d4 temp fix 2023-10-07 03:05:40 +03:00
Aevann c7c3999223 add orgy modactions 2023-10-05 19:28:17 +03:00
Aevann 0867c47d9c rename customtitle to flair 2023-10-05 13:39:12 +03:00
Aevann b24be481d7 new_name->new_flair, title->flair 2023-10-04 15:29:41 +03:00
Aevann e266fc85e9 add end_utc to manual file orgies too 2023-10-03 10:43:43 +03:00
Aevann edd07137f7 add end_utc to file orgies 2023-10-02 07:21:04 +03:00
Aevann 636f30d0cf better regex syntax 2023-09-29 06:59:38 +03:00
Aevann 8e27789847 make sure to wipe stickied_utc too 2023-09-29 04:24:36 +03:00
Aevann fb0b92364a fix /refresh_chat once and for all 2023-09-26 23:59:56 +03:00
Aevann 89df128827 more trying 2023-09-26 23:55:45 +03:00
Aevann 6c46de47de try smth on devrama to fix chat refreshing 2023-09-26 23:45:16 +03:00
Aevann 4f227e5c8b use POST instead of GET 2023-09-26 18:19:29 +03:00
Aevann c9f3b95f86 refresh chat automatically when orgy starts 2023-09-26 15:29:36 +03:00
Aevann d089d18e2d merge /chat and /orgy again 2023-09-25 01:12:42 +03:00
Aevann a9b078007e refactor slurs and profanities and put them in their own file 2023-09-22 20:01:30 +03:00
Aevann b3ef4734a5 more accurate function name 2023-09-15 03:07:17 +03:00
Aevann a22c14f21c remove unnecessary shit 2023-09-15 02:19:44 +03:00
Aevann 51494a7440 allow all video formats in orgies 2023-09-13 20:44:19 +03:00
Aevann 420af5ce3d add ban reason to bannedfor tooltip 2023-09-08 22:57:15 +03:00
Aevann 52974641e3 dedup reason variable 2023-09-08 22:51:59 +03:00
Aevann 7cd1fbd08f remove unnecessary graceful=True from get_user() usages 2023-09-06 21:13:32 +03:00
Aevann 8bae228129 add separate chatroom for orgies 2023-09-05 18:32:57 +03:00
Aevann f2ed74ec6a dedup sorting in the jinja templates 2023-09-05 17:32:36 +03:00
Aevann 7ce0345bb2 remove unused imports 2023-09-04 18:05:37 +03:00
Aevann d12b33ba55 order banned domains by time banned 2023-09-02 10:35:27 +03:00
Aevann 61a656b43c add space 2023-08-30 19:50:33 +03:00
Aevann 73e2e474b3 handle 500 error 2023-08-24 09:22:10 +03:00
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
Aevann 778f4f045e rename variable 2023-06-29 23:10:31 +03:00
Aevann af0c8a702b same as last commit 2023-06-26 21:02:15 +03:00
Aevann 8769023985 order /admin/shadowbanned by ban reason 2023-06-24 21:18:17 +03:00
Aevann 0750bd365f hide alts in /admin/shadowbanned 2023-06-24 21:02:25 +03:00
Aevann fe5261df36 make chudding affect the comment its applied on 2023-06-23 20:47:57 +03:00
Aevann 5e8f04b2ac rename flags to reports 2023-06-23 19:49:26 +03:00
Aevann 3dfd56c352 delete alt cache when delinking alts 2023-06-23 14:45:17 +03:00
Aevann a15d5eabef rename "agendaposter" to "chud" 2023-06-23 14:07:47 +03:00
Aevann cc7176868d fix ban_reason getting wiped accidentially 2023-06-22 14:24:03 +03:00
Aevann 9c6c264307 limit the "show more" button to comments only 2023-06-08 04:36:41 +03:00
Aevann ee92098abe fix this https://rdrama.net/post/174840/according-to-siteindicescom-rdramanet-has-a 2023-06-08 03:32:33 +03:00
Aevann 32fa466e6a rename submissions to posts 2023-06-08 02:26:32 +03:00
Aevann 2067638d4c Revert "migrate images again" 
This reverts commit 240bd7354c.
 2023-05-17 09:12:17 +03:00
Aevann 66c1baf13c same as last commit 2023-05-16 11:48:48 +03:00
Aevann 240bd7354c migrate images again 2023-05-16 11:47:16 +03:00
Aevann 1fc0681093 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4151551#context 2023-05-14 19:13:00 +03:00
Aevann 864f770762 add namelock award 2023-05-13 07:53:14 +03:00
Aevann 50b23a064a move award timers to cron 2023-05-13 05:00:54 +03:00
Aevann 519fbef9a7 rename dm_images to dm_media 2023-05-12 18:27:46 +03:00
Aevann f3a0080698 remove useless tabs 2023-05-06 00:47:07 +03:00
Aevann 92f0154e67 use new pagination system everywhere it isnt used 2023-05-06 00:47:07 +03:00
Aevann d82f1161cf use new pagination system in removed posts and comments 2023-05-05 08:38:08 +03:00
Aevann 75c9c69bf7 paginate reported/comments 2023-05-05 08:26:53 +03:00