forked from rDrama/rDrama
1
0
Fork 0
Commit Graph

1836 Commits (1d7b4c18a586b4eb9bae197cbb27d67cf678e2ef)

Author SHA1 Message Date
Aevann 2b9647a37e try random bullshit to fix timeouts 2023-07-17 17:49:26 +03:00
Aevann 1e6b7d0def remove now-unnecessary line for award_count 2023-07-17 17:47:11 +03:00
Aevann 71c543c623 rename variable 2023-07-12 05:39:01 +03:00
Aevann 3d7c97214f remove the flush from pay_account 2023-07-10 15:33:45 +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 5b021432a4 in json, return author_id and ids of replies 2023-07-08 16:33:12 +03:00
Aevann fca27c37eb remove unnecessary v shit 2023-07-08 16:32:14 +03:00
Aevann 2154684751 remove now-unnecessary app_id column 2023-07-08 02:19:37 +03:00
Aevann cce4f2346c same as last commit + remove now-unnecessary scoped_session imports 2023-07-08 02:12:59 +03:00
Aevann 9b0dc1f44e same as last commit 2023-07-08 02:07:11 +03:00
Aevann 8b59589804 fix 500 errror 2023-07-08 02:04:21 +03:00
Aevann 154fb97a30 fix progstack and spider badges 2023-07-08 00:08:17 +03:00
Aevann bda1e1f7b6 don't send unecessary data 2023-07-07 21:55:04 +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 499781329f remove event_darkmode 2023-07-03 01:55:56 +03:00
Aevann 25b9a0f535 stop usage of .update 2023-07-03 00:42:34 +03:00
Aevann 9d2f855b8e remove wpd special condition 2023-07-02 23:03:31 +03:00
Aevann fb153e9a14 when u visit someone's profile, see who chudded them 2023-07-02 20:40:39 +03:00
Aevann eed7410277 make spam bans generate modlog items + dedup 2023-07-01 18:27:56 +03:00
Aevann 3cbea18327 make emoji search work on original usernames 2023-07-01 03:25:12 +03:00
Aevann 9974590a19 better user links in mod log 2023-06-30 19:19:05 +03:00
Aevann 30b46195ea don't show me comments from ppl i blocked 2023-06-30 19:02:08 +03:00
Aevann 6a59517efa do this https://rdrama.net/h/changelog/post/165657/changelog-megathread-marseynotes/4430937#context 2023-06-30 01:40:36 +03:00
Aevann 4692b558f1 show number of blockers and blockees in profiles 2023-06-30 00:04:59 +03:00
Aevann d417fe14f0 rename property 2023-06-29 23:52:07 +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 778f4f045e rename variable 2023-06-29 23:10:31 +03:00
Aevann 9519020de8 replace icon and headericon with carp 2023-06-28 17:31:41 +03:00
Aevann 8b5cda26bb carp pfps 2023-06-28 17:18:43 +03:00
Aevann 774c09387c make sure everyone is aware that they're a carp alt 2023-06-28 16:52:59 +03:00
Aevann 5abff86636 order badges in json 2023-06-28 16:13:22 +03:00
Aevann 60b5b33a79 Revert "remove poor mode"
This reverts commit 33d281cc2e.
2023-06-27 15:01:40 +03:00
Aevann aacffe0d1c Revert commit that caused disappearing currency
This reverts commit 06288f1c3e.
2023-06-26 18:16:33 +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 33d281cc2e remove poor mode 2023-06-26 13:55:38 +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 5308d5ca70 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4429297#context 2023-06-24 20:51:17 +03:00
Aevann 7cac2c19a1 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4378619#context 2023-06-24 20:16:24 +03:00
Aevann af1581be66 update emoji leaderboard description 2023-06-24 17:50:44 +03:00
Aevann 4760dcf3d3 allow spaces between the option symbols and the option text 2023-06-24 17:00:33 +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 ac4f9c1c01 expand emoji leaderboard 2023-06-24 16:14:18 +03:00
Aevann f88d65b003 add original usernames to popover 2023-06-23 20:12:51 +03:00
Aevann 5e8f04b2ac rename flags to reports 2023-06-23 19:49:26 +03:00
Aevann 955f29c7be don't count other emojis in the marsey leaderboard 2023-06-23 19:49:26 +03:00
Aevann 3894e18de2 fix badge 2023-06-23 19:49:26 +03:00
Aevann d9bed378a9 complement 32fa466e6a 2023-06-23 16:46:42 +03:00
Aevann e607c39d67 make chud effects not retroactive 2023-06-23 16:14:23 +03:00
Aevann 2452f94231 give new unlinked users award immunity in rdrama 2023-06-23 14:37:22 +03:00
Aevann a15d5eabef rename "agendaposter" to "chud" 2023-06-23 14:07:47 +03:00
Aevann 033c741de7 add timer to queen badge 2023-06-22 09:28:03 +03:00
HeyMoon b304d00169 Improve the Queen award (#156)
Fixed bugs:
 - Sometimes two people would get the same username
 - Sometimes a whole post would have the same prefix
 - Links would be broken
 - Greentext would be broken
 - strings of periods do not become "and, and, and, and,"

New stuff:
 - New girl catchphrases
 - New girl pfps
 - Catchphrases have a chance to not be applied (50%, but configurable)
 - A lot more regexes
 	- everyone => literally everyone (and others)
    - into => totally into
    - hello => hiiiiiiii (and others)
    - just => like just
    - i mean => i mean like
    - ! => !!!

Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#156
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
2023-06-22 05:20:33 +00:00
HeyMoon 5d53820515 Add the "Misogynist" award to harass incels (#154)
Whazzup? This PR is the final solution to the incel problem. There's an old indian proverb that says: "never judge a man until you've walked two moons in his mocassins". In this case, it should be: "never judge a woman until you've walked 24 hrs in her high-heels".

The misogynist award is a comment-transforming award that "feminizes" comments. It does the following:
 - makes text pink
 - makes text lowercase
 - removes "complicated" punctuation
 - makes paragraphs into run-on sentences
 - adds stereotypical girly remarks to the beginning or end of a paragraph.

For example:
INPUT

> What the fuck did you just fucking say about me, you little bitch? I'll have you know I graduated top of my class in the Navy Seals, and I've been involved in numerous secret raids on Al-Quaeda, and I have over 300 confirmed kills. I am trained in gorilla warfare and I'm the top sniper in the entire US armed forces. You are nothing to me but just another target. I will wipe you the fuck out with precision the likes of which has never been seen before on this Earth, mark my fucking words. You think you can get away with saying that shit to me over the Internet? Think again, fucker. As we speak I am contacting my secret network of spies across the USA and your IP is being traced right now so you better prepare for the storm, maggot. The storm that wipes out the pathetic little thing you call your life. You're fucking dead, kid. I can be anywhere, anytime, and I can kill you in over seven hundred ways, and that's just with my bare hands. Not only am I extensively trained in unarmed combat, but I have access to the entire arsenal of the United States Marine Corps and I will use it to its full extent to wipe your miserable ass off the face of the continent, you little shit. If only you could have known what unholy retribution your little "clever" comment was about to bring down upon you, maybe you would have held your fucking tongue. But you couldn't, you didn't, and now you're paying the price, you goddamn idiot. I will shit fury all over you and you will drown in it. You're fucking dead, kiddo.

OUTPUT
> im literally screaming, what the fuck did you just fucking say about me, you little bitch? ill have you know i graduated top of my class in the navy seals, and ive been involved in numerous secret raids on al-quaeda, and i have over 300 confirmed kills, i am trained in gorilla warfare and im the top sniper in the entire us armed forces, you are nothing to me but just another target, i will wipe you the fuck out with precision the likes of which has never been seen before on this earth, mark my fucking words, you think you can get away with saying that shit to me over the internet? think again, fucker, as we speak i am contacting my secret network of spies across the usa and your ip is being traced right now so you better prepare for the storm, maggot, the storm that wipes out the pathetic little thing you call your life, youre fucking dead, kid, i can be anywhere, anytime, and i can kill you in over seven hundred ways, and thats just with my bare hands, not only am i extensively trained in unarmed combat, but i have access to the entire arsenal of the united states marine corps and i will use it to its full extent to wipe your miserable ass off the face of the continent, you little shit, if only you could have known what unholy retribution your little clever comment was about to bring down upon you, maybe you would have held your fucking tongue, but you couldnt, you didnt, and now youre paying the price, you goddamn idiot, i will shit fury all over you and you will drown in it, youre fucking dead, kiddo

It also sets the user's pfp to a random white woman. Well, psuedorandom - it's based off of the user's id, so each user will only ever have one pfp assigned to them, which I think is nifty.

Finally, it changes the name of the user toa girly name.

There is one small problem with the PR, which is simply that I manually added a badge for testing purposes. If you like this PR, I will submit the badge throught the proper chanels and fix it.

![image](/attachments/641c7276-ffe4-4e69-b3e9-aec9f4f94191)

Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#154
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
2023-06-21 12:36:07 +00:00
Aevann 3ec950e3f5 add GLOBAL2 2023-06-20 11:36:25 +03:00
Aevann 746cf7e375 fix 500 error 2023-06-08 05:03:23 +03:00
Aevann fb42139f8c fix bec99392fe 2023-06-08 04:27:12 +03:00
Aevann d8bfc0a0a9 dont pass db session as an argument unless necessary 2023-06-08 03:49:37 +03:00
Aevann 32fa466e6a rename submissions to posts 2023-06-08 02:26:32 +03:00
Aevann 07dc5c5c5d Casino winnigs: None -> Casino winnigs: 0 2023-06-07 23:05:57 +03:00
Aevann 19c14d3e64 remove oudated slur filter 2023-06-07 08:12:13 +03:00
Aevann 06288f1c3e eliminate unnecessary db locks now that 1-second ratelimiting is universal (they cause timeouts sometimes) 2023-06-07 06:51:59 +03:00
Aevann bec99392fe hide christchurch posts in New Zealand 2023-05-27 02:29:34 +03:00
Aevann 0c2e0f0b67 restore transparency for namelock badge 2023-05-16 03:25:31 +03:00
Aevann 91987cd080 add code for namelock badge 2023-05-16 03:20:55 +03:00
Aevann 814bf0a5f3 same as last comit 2023-05-16 03:07:41 +03:00
Aevann 5c4e0a5b79 stacked changes 2023-05-15 12:27:24 +03:00
Aevann ca7db123b2 remove "at least" 2023-05-15 01:35:24 +03:00
Aevann 7251442a9d fix 500 error 2023-05-15 01:28:40 +03:00
Aevann 460a9a686a show tier name in tooltip + standardize patron constants 2023-05-15 01:17:22 +03:00
Aevann bbaa6cd6b0 1. tell jannies the location of the report that caused someone to get under-sieged
2. allow jannies to see reports by shadowbanned users
3. destroy the shadowbanned underworld for reports
4. dedup reports HTML code
5. show JL5 the message that caused someone to get under-sieged
2023-05-15 01:01:10 +03:00
Aevann 4e86e20a5a allow [patrons] 2023-05-14 19:57:25 +03:00
Aevann 37127c83f1 fix improper % placement 2023-05-14 18:59:30 +03:00
Aevann a0063bf6e7 show award discount on profiles and /shop/awards 2023-05-14 03:01:00 +03:00
Aevann 039bbf85a9 remove lifetime_donated from badge description 2023-05-13 19:00:17 +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 3c4c52dab4 fix G badge 2023-05-13 03:05:26 +03:00
Aevann 710f3ce5ee order more badges 2023-05-13 01:12:08 +03:00
Aevann f6708e8a1c put paypig badges before total contribution badges 2023-05-13 00:42:38 +03:00
Aevann 9c6a7a9cc7 fix 500 error 2023-05-13 00:28:46 +03:00
Aevann 0d4660c17f show lifetime_donated in the badge description 2023-05-13 00:16:37 +03:00
Aevann f3a3be1ef2 add lifetime_donated badges 2023-05-13 00:04:26 +03:00
Aevann 35ba2f7abb trim badges 2023-05-12 19:15:14 +03:00
Aevann c8d6872761 rename function 2023-05-11 17:03:51 +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 42f8b12ba1 give notif when someone gets their birthday badge 2023-05-10 00:48:19 +03:00
Aevann 619bdba5b2 fix this https://rdrama.net/post/168774/marseynull-jershs-manifesto-just-dropped-marseyveryworriedtrans/4111081#context 2023-05-07 22:44:34 +03:00
Aevann 2b04a09c03 do this https://rdrama.net/post/168554/proof-that-tradcaths-are-just-gay/4106019#context 2023-05-07 22:03:29 +03:00
Aevann 9c5015d662 im retarded 2023-05-07 20:28:35 +03:00
Aevann c8079e1d9d same as last commit 2023-05-07 20:25:42 +03:00
Aevann a4d1fb411f fix 2year badge 2023-05-07 20:22:40 +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 58a84e11fe Revert "fix hat ordering"
This reverts commit c196041f64.
2023-05-05 09:35:43 +03:00
Aevann c196041f64 fix hat ordering 2023-05-05 09:30:39 +03:00