MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity
26,529 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

3755 Commits (0cac3ed55f5fe0307af3fedc8bb4c76a5a551f93)

Author SHA1 Message Date
Aevann 37c9307fc4 better handling of large emojis in places where they're not allowed 2023-07-22 13:10:27 +03:00
Aevann d865e1e86a fix this https://rdrama.net/post/189576/rplace-just-expanded/4629703#context 2023-07-22 13:03:57 +03:00
Aevann 0d7283392e fix minor annoyance 2023-07-21 17:44:33 +03:00
Aevann f0b51ed2c0 make !jannies dynamic 2023-07-21 17:27:49 +03:00
Aevann ff860f096c another carp easteregg 2023-07-21 16:08:21 +03:00
float-trip a4d19ec391 Add Marseygen exception. (#171) 
I'll submit a rollback tomorrow for this.

Co-authored-by: float-trip <float-trip@fsdfsd.net>
Reviewed-on: rDrama/rDrama#171
Co-authored-by: float-trip <float-trip@noreply.fsdfsd.net>
Co-committed-by: float-trip <float-trip@noreply.fsdfsd.net>
 2023-07-20 21:26:59 +00:00
Aevann 16fb709c00 boost /h/countryclub by x2 2023-07-20 19:54:59 +03:00
Aevann e8b28dc3b3 reduce CC minimum from 100 TS to 0 2023-07-20 16:47:36 +03:00
Aevann 3be01ba40a dont filter slurs in code 2023-07-18 16:00:37 +03:00
Aevann bdd6df2016 more understandable syntax 2023-07-18 14:35:27 +03:00
Aevann 367c683aab add statement timeout to sqlalchemy 2023-07-18 12:18:55 +03:00
Aevann 3e215ba6c2 reduce number of stars 2023-07-18 11:40:50 +03:00
Aevann dc5c746e15 make JL3 able to ignore award immunity 2023-07-17 20:45:28 +03:00
Aevann 3570c2304f add timestamp 2023-07-17 20:30:38 +03:00
Aevann 883b553c7a fix snappy ping cost 2023-07-17 20:24:22 +03:00
Aevann 2b9647a37e try random bullshit to fix timeouts 2023-07-17 17:49:26 +03:00
Aevann 21fa8c7996 remove unused --every-1h cron flag 2023-07-17 17:47:46 +03:00
Aevann 9bf90ee660 boost trustcafe.io 2023-07-16 13:29:56 +03:00
Aevann 8c1c1d83c9 fix this https://watchpeopledie.tv/h/aftermath/post/49260/male-wanting-to-commit-suicide-ends/1251440#context 2023-07-14 17:47:06 +03:00
Aevann ee55030480 much better poll system 2023-07-14 17:46:35 +03:00
Aevann 5fb7bf95f0 fix this https://rdrama.net/post/187626/fbi-gets-its-buttplug-pushed-in/4579645#context 2023-07-14 16:35:33 +03:00
Aevann ffbb465d15 add fark.com to boosted sites 2023-07-14 15:54:26 +03:00
Aevann 39f1bbf0d7 fix manually applied errors not working 2023-07-14 15:07:21 +03:00
Aevann 1fd74a450b add i.giphy.com/media to approved_embed_hosts 2023-07-14 14:43:06 +03:00
Aevann 134568954e fix commenting on localhost 2023-07-14 14:14:02 +03:00
Aevann 4f84e2d3fe fix this https://rdrama.net/post/187155/introducing-pullpush-restoring-blocked-cow-tools/4565609#context 2023-07-14 14:13:54 +03:00
Aevann 756ba8861c fag -> strag 2023-07-14 12:23:56 +03:00
Aevann 6395092618 kill all forgetful cunts 2023-07-14 06:53:18 +03:00
Aevann a94a955081 fix error 2023-07-14 06:33:36 +03:00
Aevann e15effe223 move boosted_sites to its own file so i can link to it 2023-07-14 06:32:52 +03:00
Aevann ae7a87a56f change boosted sites 2023-07-14 06:30:24 +03:00
Aevann c119de1ed2 add boosted sites 2023-07-14 06:24:33 +03:00
Aevann 54ace27323 remove every-1mo flag 2023-07-13 15:52:49 +03:00
Aevann 8c2401a848 fix stats 2023-07-13 15:51:42 +03:00
Aevann 66d409944e remove breached.vc 2023-07-13 15:19:44 +03:00
Aevann ddc811c856 remove 2 sites recommended by destroyercarbine 2023-07-13 15:02:38 +03:00
Aevann efc13e4144 add threads.net to boosted sites 2023-07-13 15:02:21 +03:00
Aevann a3f6a47611 remove marsey.club 2023-07-13 15:01:02 +03:00
Aevann d26dfcc84a add 3 more boosted sites + remove rdrama.cc 2023-07-13 14:58:37 +03:00
Aevann d96b2ff11a add more tlds 2023-07-13 14:25:50 +03:00
Aevann 4300008ea4 consistency 2023-07-13 14:23:44 +03:00
Aevann 75d3eea134 change lemmy boosting 2023-07-13 14:22:22 +03:00
Aevann b2b79f8076 add more boosted sites 2023-07-13 14:17:07 +03:00
Aevann 0a2065e7cb add lowendtalk.com to boosted sites 2023-07-13 13:58:23 +03:00
Aevann a0f3866193 more extensible ADMIGGER_THREADS 2023-07-12 14:59:27 +03:00
Aevann 5b03b9a793 fix 2023-07-12 04:25:18 +03:00
Aevann ef5709030b ping gaypoon 2023-07-12 04:08:17 +03:00
Aevann f1b1e6afc4 fix 2023-07-12 04:07:27 +03:00
Aevann 8a82e7ebd7 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4557200#context 2023-07-11 15:31:43 +03:00
Aevann 74d979ef4e add beauty and camp to tlds 2023-07-11 07:02:12 +03:00
Aevann 8387e54413 slur consistency 2023-07-11 06:16:13 +03:00
Aevann 59dde6cfbc stop worker timeouts 2023-07-11 05:24:17 +03:00
Aevann 8a6f05c9b8 fix import error 2023-07-10 16:29:36 +03:00
Aevann 5a54a30892 same as last comit 2023-07-10 03:53:06 +03:00
Aevann c043cc6f59 completely unnecessary commit 2023-07-10 03:52:24 +03:00
Aevann 13c99ec9ad fix claim_rewards by not importing Transaction from sqlalchemy which overrides my Transaction class 2023-07-10 03:49:08 +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 957000b212 fix !scandicks 2023-07-10 03:19:13 +03:00
Aevann 17fba73b59 fix birthgay 2023-07-10 01:29:36 +03:00
Aevann 64b6f4895e remove "or True" 2023-07-10 01:18:00 +03:00
G-tix b658ce95d9 Prevent dylan autojanny overwrite (#168) 
Autojanny overwrites the 'Dylan' shadowban with an 'Under Siege' shadowban. Rechecking "if v.shadowbanned: return" will prevent this, I guess.
As usual, please quadruple check my code.

Reviewed-on: rDrama/rDrama#168
Co-authored-by: G-tix <g-tix@noreply.fsdfsd.net>
Co-committed-by: G-tix <g-tix@noreply.fsdfsd.net>
 2023-07-09 22:17:35 +00:00
Aevann 70e1904f8c hello -> hecko 2023-07-08 19:17:33 +03:00
Aevann f22a362f37 fix bug when both queen and namelock expire at the same time 2023-07-08 19:11:29 +03:00
Aevann bc419a52da restore shit i accidentially removed :marseybrainlet: 2023-07-08 18:58:16 +03:00
Aevann 36ff17a7d5 print-debug smth on wpd 2023-07-08 18:31:47 +03:00
Aevann 3964a27281 fix worker timeouts 2023-07-08 17:03:58 +03:00
Aevann 683d722426 move _award_timers_task() under everything else cuz it tends to break the most 2023-07-08 16:07:06 +03:00
Aevann 517ed8a9d3 disallow ALL bots from voting 2023-07-08 02:18:03 +03:00
Aevann cce4f2346c same as last commit + remove now-unnecessary scoped_session imports 2023-07-08 02:12:59 +03:00
Aevann ecf3e1133f exempt kaamrev from 1week edit limit 2023-07-08 00:28:08 +03:00
Aevann 42847cf5ca revert 2023-07-07 22:24:02 +03:00
Aevann 6dacba53b6 tinker with cache to stop insane cpu usage by redis-server 2023-07-07 22:08:23 +03:00
Aevann 4d1b00d780 fix ./magick: error while loading shared libraries: libMagickCore-7.Q16HDRI.so.10: cannot open shared object file: No such file or directory 2023-07-07 02:30:46 +03:00
Aevann 783c90f9d3 do this https://rdrama.net/h/countryclub/post/79285/-/4494243#context 2023-07-05 23:44:50 +03:00
Aevann 31b685db57 boost all stealth holes by x2 2023-07-05 23:39:15 +03:00
Aevann 9aea183438 fix my mention 2023-07-05 21:50:21 +03:00
Aevann 97d6ba5d48 dont leave transactions open in cron 2023-07-05 20:01:39 +03:00
Aevann fcb74c7c9b convert /marseys into /emojis 2023-07-05 00:40:00 +03:00
Aevann 225c63af0b same as last commit 2023-07-04 23:59:42 +03:00
Aevann ca2f50f7ce same as last commit 2023-07-04 23:52:00 +03:00
Aevann f249b1e158 fix i think 2023-07-04 23:44:41 +03:00
Aevann 8c526576ad fix repeated mentions 2023-07-04 02:43:29 +03:00
Aevann 963223495c urgent fix for cron award shit 2023-07-03 04:58:05 +03:00
Aevann 3e6622c511 cleanup in aisle 4 2023-07-03 03:26:20 +03:00
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 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
Aevann 07695039d7 escape / 2023-07-02 20:24:21 +03:00
Aevann f1b9cdd701 add today tld 2023-07-02 02:26:57 +03: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 7f6675f7f9 remove unddit.com (RIP u will not be forgotten) 2023-07-01 19:41:59 +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
Aevann e863d93b2b increase post ratelimit on WPD 2023-07-01 17:19:53 +03:00
Aevann f0cfa8c916 fix this https://rdrama.net/post/173066/my-im-starting-to-believe-rightoid/4217124#context 2023-07-01 02:59:42 +03:00
Aevann 3c07d4bcd8 remove unnecessary lookaround groups 2023-07-01 01:52:11 +03:00
Aevann 486bacf5e6 use error()instead of abort() in sanitize 2023-06-30 23:34:29 +03:00
Aevann 243368c106 add padding 2023-06-30 23:32:36 +03:00
Aevann 6d23974d58 add padding 2023-06-30 23:31:24 +03:00
Aevann c721b26b61 dylan 2023-06-30 23:17:56 +03:00
Aevann e4662247b7 revert commit that caused pat emojis not to get mirrored 
This reverts commit 3a3615d292.
 2023-06-30 22:54:36 +03:00
Aevann daedb5f047 nasty hack to stop underscores being interpreted as italic which breaks mentioning users with two underscores and links sometimes 2023-06-30 22:47:38 +03:00
Aevann d003822dc0 constantify frequently-used regex negative lookahead group 2023-06-30 21:29:53 +03:00
Aevann 8d608e2939 add "reset password' button to JL-5 2023-06-30 19:39:24 +03:00
Aevann 9974590a19 better user links in mod log 2023-06-30 19:19:05 +03:00
Aevann eca2a84e75 boost exploding-heads.com 2023-06-30 01:53:10 +03:00
Aevann 27c78f55f7 fix weird slur filter bug https://i.imgur.com/WjmZuzu.png 2023-06-30 01:05:21 +03:00
Aevann b2ac0efc8c make link posts look visited when u visit them from notifs 2023-06-30 01:00:05 +03:00
Aevann 10a715302f show !everyone's cost 2023-06-29 23:48:27 +03:00
Aevann eeb975b177 cachebust everything 2023-06-29 23:14:30 +03:00
Aevann 348f16266f remove carprama 2023-06-29 23:14:24 +03:00
Aevann bac356db1d make sure all usages of subprocess have timeout duration 2023-06-29 22:38:55 +03:00
Aevann 1b48488996 expand slur filter 2023-06-29 20:47:19 +03:00
Aevann 9519020de8 replace icon and headericon with carp 2023-06-28 17:31:41 +03:00
Aevann a017fdfbb9 add new taglines and titles 2023-06-28 17:03:14 +03:00
Aevann 2494b78116 increase COSMETIC_AWARD_COIN_AWARD_PCT from 10% to 50% 2023-06-28 00:32:34 +03:00
Aevann a8eae44c25 make a bunch of awards cheaper 2023-06-28 00:04:54 +03:00
Aevann cc5a8db4e7 reduce marsey award price from 3000 to 2000 2023-06-27 20:25:25 +03:00
Aevann 60933a7d67 disable y'all seeing eye award 2023-06-27 20:25:14 +03:00
Aevann 1633f090c8 order by price 2023-06-27 20:25:04 +03:00
Aevann c865a6adba do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4453698#context 2023-06-27 20:08:30 +03:00
Aevann 6f1c7c69ac reduce house racist award price to 100 2023-06-27 17:38:00 +03:00
Aevann f3df1d4a8a shiogu -> chiobu 2023-06-27 17:34:30 +03:00
Aevann 7164d1ccf8 reduce price of femboy, racist, edgy awards from 500 to 200 2023-06-27 17:18:40 +03:00
Aevann f3276b8c4e same as last commit 2023-06-26 20:58:47 +03:00
Aevann a284bfd470 fix invalid url 2023-06-26 20:56:56 +03:00
Aevann 5b86ee21b0 fix bug that caused urls with quoted spaces to not work https://i.imgur.com/RFyI9jB.png 2023-06-26 18:28:07 +03:00
Aevann 3d3e517a4c Add House Edgy 2023-06-26 18:05:27 +03:00
HeyMoon 36779a7ad1 Add the edgy award (and some other goodies) (#157) 
# The Edgy Award
* Makes text bold, italic, and red, symbolizing the fire that burns within.
* Adds "fucking" to various places, after articles and prepositional phrases (I think) (tbh I just eyeballed it). EX: He is the fucking best
* Adds "motherfucker" and "bitch" to exclamations and questions, respectively.

# Goodies
* For the queen award:
	* based => comfy
    * Xpilled => x vibes
    * Xmaxxing => normalizing X

Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#157
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
 2023-06-26 14:38:48 +00:00
Aevann 4849ac724f complement c8116a401a 2023-06-26 15:38:36 +03:00
Aevann 4380afb8b2 increase the price of non-event cosmetic awards from 200 to 500 2023-06-26 13:41:49 +03:00
Aevann 9d9c77bc4b do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4442782#context 2023-06-26 13:24:38 +03:00
Aevann 58c8b80b8a fix last commit 2023-06-26 13:08:57 +03:00
Aevann fb09af232c limit confetti award to birthgay event only 2023-06-26 13:08:51 +03:00
Aevann b4e8d0aad4 cats -> marseys 2023-06-25 20:40:36 +03:00
Aevann f57c909610 change rdrama's default theme back to midnight 2023-06-25 20:35:30 +03:00
Aevann 6958b70975 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4197134#context 2023-06-24 23:31:12 +03:00
Aevann 883c96a830 fix 500 erro 2023-06-24 21:54:36 +03:00
Aevann dce087fed0 allow emojis in link text 2023-06-24 19:03:07 +03:00
Aevann e2629bc523 fix last commit 2023-06-24 18:01:22 +03:00
Aevann 7f17b2eaa8 better slurs and profanities 2023-06-24 17:54:27 +03:00
Aevann ab20350059 cat -> marsey 2023-06-24 17:40:23 +03:00
Aevann bc0763591e fix this https://rdrama.net/post/175307/pol-ugandans-are-officially-based-white/4269362#context 2023-06-24 17:25:05 +03:00
Aevann 9ef00b7f0e fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4198466#context 2023-06-24 16:29:28 +03:00
Aevann daeaff2f02 support .m4a audio 2023-06-24 11:25:28 +03:00