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

1177 Commits (72613cdbd72e2151040c1ab0e1b7ab8f18604ffb)

Author SHA1 Message Date
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
Aevann d9aeb1f111 dedup page defining 2023-05-05 08:23:59 +03:00
Aevann f3ec963708 add pagination to reported posts 2023-05-05 08:16:50 +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 a0469edfc7 use new pagination system 2023-05-05 03:50:36 +03:00
Aevann c6cdf9fdca minor fixes to last couple of commits 2023-05-03 19:06:14 +03:00
Aevann f5a97ae709 add new patron tier for benefactor-cels 2023-05-03 18:29:31 +03:00
Aevann 156d0a7058 no chud+marsify 2023-04-03 02:59:24 +02:00
Aevann 5bc6597188 add 1/1 second ratelimiter for user ids to fix blackjack exploit 2023-04-02 08:52:26 +02:00
Aevann eddea21c43 minor devrama fix 2023-03-25 23:42:42 +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 96330210e8 use SITE as a prefix for flask_cache 2023-03-25 22:57:27 +02:00
Aevann f834514e1a fix deleting media 2023-03-25 17:07:12 +02:00
Aevann a93c5ed0e5 clearer chud message to chudded user 2023-03-24 13:51:25 +02:00
Aevann a9a6d1dd1b stop /edit_rules from generating mod action temporarily 2023-03-23 22:22:46 +02:00
Aevann ca4f6c5102 include "trans lives matter" in janny chud message 2023-03-23 20:53:11 +02:00
Aevann 333f536f1a Revert "send me the notifs i need" 
This reverts commit 415a24e625.
 2023-03-23 17:25:01 +02:00
Aevann 415a24e625 send me the notifs i need 2023-03-23 17:05:18 +02:00
Aevann 0fc5d3bd7c Revert "add /admin/agendaposter_all" 
This reverts commit 5325e17771.
 2023-03-23 15:50:43 +02:00
Aevann 5325e17771 add /admin/agendaposter_all 2023-03-23 15:20:05 +02:00
Aevann 4f788cb909 dedup chud-checking logic 2023-03-23 14:50:01 +02:00
Aevann f78cd322d1 much better chud award logic 2023-03-22 23:39:25 +02:00
Aevann 50680e0fa8 cut down on chud award evasion 2023-03-21 23:33:43 +02:00
Aevann 4c47cc5d63 stop implementing BAN_EVASION_DOMAIN since nobody actually uses it https://camas.unddit.com/#{%22searchFor%22:1,%22resultSize%22:100,%22query%22:%22stupidpol.site%22} 2023-03-21 17:39:26 +02:00
Aevann d6804a6489 fix 500 error 2023-03-21 13:03:27 +02:00
Aevann b004617695 customizable chud phrases 2023-03-19 19:13:45 +02:00
Aevann 4fc5e2aa8d fix badge_grant errors for the api 2023-03-17 19:59:55 +02:00
Aevann 2cf2d869de refactor banning and chudding on posts/comments 2023-03-17 16:37:13 +02:00
Aevann 1bce14efcd rename remove_media to remove_media_using_link for clarity 2023-03-17 12:25:49 +02:00
Aevann a95cf32735 fix badge_granting via the api 2023-03-16 15:38:18 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann f768d81103 keep db sessions open 2023-03-15 05:58:00 +02:00
Aevann a2e926ef17 minor fix 2023-03-15 04:13:39 +02:00
Aevann d2ccce4dba allow making bets in comments 2023-03-12 19:36:35 +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 514b7bfa7f ratelimit /delete_media and notify me of its usage 2023-03-09 22:50:12 +02:00
Aevann 873292d60d make remove_media() to fix 500 error 2023-03-06 21:32:08 +02:00
Aevann 30a8de0126 restore login_required mod log 2023-03-01 22:45:42 +02:00
Aevann 17bb6dad48 blackjack fix exploit 2023-02-27 07:33:45 +02:00
Aevann fe0b8887bc change 1/second ratelimit to 1/2 second 2023-02-26 12:26:26 +02:00
Aevann 82a73392a9 fix errors 2023-02-26 10:49:09 +02:00
Aevann 8c495c914a default ratelimit doesnt apply implicitly if theres other @limiter.limit before the function, so add it explicity before all functions 2023-02-26 10:41:04 +02:00
Aevann 4c35f0b07f remove unnecessary line 2023-02-26 08:35:59 +02:00
Aevann 7aaeedea36 better ratelimiting 2023-02-26 03:42:39 +02:00
Aevann 3e7ccb7756 add push notifs to add_notif() 2023-02-24 04:28:10 +02:00
Aevann a395c18955 remove unnecessary tabs 2023-02-22 19:27:33 +02:00
Aevann 9de379d72f give error when jannies attempt to chud a perma-chudded user or ban a permabanned-user 2023-02-22 19:11:29 +02:00
Aevann e5b9009dc2 notify users when their flair gets changed by jannies 2023-02-22 19:00:38 +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 fd1f253ede check for ban_reason length after sanitizing 2023-02-21 16:30:31 +02:00
Aevann 288fcde832 add /admin/delete_media 2023-02-19 21:31:26 +02:00
Aevann 472bed996f add button to remove progstack 2023-02-19 16:02:30 +02:00
Aevann b819fa51d0 make it possible for jannies to stack chuds and bans 2023-02-19 15:23:08 +02:00
Aevann 57e9cb3428 remove .deleted column for alts 2023-02-18 17:19:14 +02:00
Aevann ef2bda6920 remove relinking 2023-02-18 16:55:18 +02:00
Aevann 2da4d08ad0 remove print debugging 2023-02-09 06:05:34 +02:00
Aevann 463a32e021 print debugging in devrama 2023-02-09 06:03:20 +02:00
Aevann fc9b55c776 allow me to change settings in devrama 2023-02-09 06:02:39 +02:00
Aevann a9ec1735c9 fix typo 2023-02-09 06:00:37 +02:00
Aevann 44a80f0492 make under_attack a setting and use it in /submit for WPD 2023-02-09 05:50:30 +02:00
Aevann 88814ee208 expand blackjack 2023-02-07 05:31:49 +02:00
Aevann 95938ee3ec make sure all comment links have #context 2023-02-07 04:34:11 +02:00
Aevann 925fd0497a disable showmore button in sidebars 2023-02-06 05:34:09 +02:00
Aevann 0b30067876 tweak admin perms 2023-01-29 10:28:29 +02:00
Aevann 3b4211e8e1 stop using nullslast rDrama/rDrama#102 2023-01-28 10:25:19 +02:00
Aevann c45cd0fde8 make a UI for /admin/dm_images 2023-01-27 14:24:39 +02:00
Aevann 349fa17836 use exlamation marks instead of dots in responses to users 2023-01-27 13:57:29 +02:00
Aevann ceee02fbce add button to blacklist users from restricted holes 2023-01-25 17:41:46 +02:00
Aevann 94d7042512 add progstack btn to comments 2023-01-25 13:35:37 +02:00
Aevann b23dc76d78 fix muting linking alts 2023-01-25 04:53:52 +02:00
Aevann 680135755e Revert "get rid of get_alt_graph" 
This reverts commit e2e3da4bda.
 2023-01-25 04:51:48 +02:00
Aevann 585d8f9695 fix make admin button 2023-01-25 03:53:20 +02:00
Aevann 947be4fef6 fix missing perm 2023-01-25 03:07:49 +02:00
Aevann e2e3da4bda get rid of get_alt_graph 2023-01-25 03:07:30 +02:00
Aevann 7e8329c296 remove account merging stuff 2023-01-24 14:20:30 +02:00
Aevann 95674fa39a fix /admin/alts 2023-01-24 12:32:06 +02:00
Aevann 757c244f65 allow JL4 to unpin award pins 2023-01-24 12:24:27 +02:00
Aevann c1268d396b make it not possible to sticky removed comments 2023-01-24 12:23:19 +02:00
Aevann f1bdfa8eda disable modaction for login_required 2023-01-24 07:48:27 +02:00
Aevann 223909a2f8 fix 500 error on muting 2023-01-24 06:53:07 +02:00
Aevann d1ee3ba0a3 fix 500 error 2023-01-23 14:44:30 +02:00
Aevann bdaced6c10 allow admins to apply progstack 2023-01-23 14:40:44 +02:00
Aevann 8396126606 add dm images 2023-01-23 11:58:38 +02:00
Aevann 11aef2ae3d make mutes propagate 2023-01-23 10:06:32 +02:00
Aevann 7f1ddf5c0c fix delinking alts 2023-01-22 10:20:38 +02:00
Aevann 24edb49f3b add jl5 (for me) 2023-01-22 10:04:49 +02:00
Aevann 35808e9fd7 use username instead of id in linking/delinking mod notes 2023-01-21 07:54:29 +02:00
Aevann e3fc980984 order /banned and /admin/shadowbanned by ban reason 2023-01-21 07:50:48 +02:00
Aevann a40dee5bd8 improve user ratelimiting 2023-01-21 06:39:46 +02:00
Aevann d82835a968 same as last commit 2023-01-20 03:31:51 +02:00
Aevann dd3dfa5197 make users list viewable by everypony 2023-01-01 16:52:16 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 78351abc4c clean up legacy stuff 2023-01-01 03:17:07 +02:00
Aevann 7a529e70f8 disallow chudding and banning ppl for negative days 2023-01-01 02:58:37 +02:00
Aevann af59e82528 restore banning domains 2022-12-30 18:24:20 +02:00
Aevann 5c13700080 hide ghost identity leak in dev console 2022-12-30 18:22:57 +02:00
Aevann e0e8eb3dd6 fix mod log links 2022-12-30 18:10:29 +02:00
Aevann 0bbe5d5ddd show live commit to everyone 2022-12-30 15:32:58 +02:00
Aevann 909e3f5f29 use a cool flask feature i didnt know about 2022-12-29 12:39:10 +02:00
Aevann 1ec32c3895 combine 2 replace statements 2022-12-29 12:35:49 +02:00
Aevann f7aa7d8dfd better error messages 2022-12-28 11:50:48 +02:00
Aevann 53fcc2ac40 fix reverting admin actions showing wrong username in toast 2022-12-28 11:47:30 +02:00
Aevann 7b71c36e3f require reason for banning 2022-12-28 11:31:27 +02:00
Aevann 181a660760 comment domains for now 2022-12-28 06:12:57 +02:00
Aevann bf00867fe8 fix devrama settings 2022-12-27 15:35:14 +02:00
Aevann 68c00456f0 patch another janny xss 2022-12-27 08:11:44 +02:00
Aevann 5fdec63e8c disallow changing site settings in devrama 2022-12-27 07:25:29 +02:00
Aevann 512c864327 fix xss on banning domains (only admins could use it) 2022-12-27 07:18:46 +02:00
Aevann 465565f26c give error when domain ban reason too long 2022-12-27 07:02:14 +02:00
Aevann 84bff9cb44 fix 2022-12-27 06:32:53 +02:00
Aevann d607e57c92 fixes 2022-12-27 06:24:25 +02:00