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

563 Commits (cca6aabf94a7c9f60d666773a842e35d5919031e)

Author SHA1 Message Date
SneedBot 5722f7bdba sneed 2023-10-04 15:32:00 +00:00
SneedBot d904559538 sneed 2023-10-02 13:41:33 +00:00
Aevann 9f7a761b73 homoween III + other random shit 2023-09-29 02:58:09 +03:00
SneedBot 9a0684fe31 sneed 2023-09-20 13:14:06 +00:00
SneedBot 2911ee2f0a sneed 2023-09-07 08:57:57 +00:00
SneedBot 5ee3a46b82 sneed 2023-09-02 08:44:03 +00:00
SneedBot c1405734ae sneed 2023-08-17 00:08:11 +00:00
SneedBot 4728691986 sneed 2023-08-15 20:18:04 +00:00
SneedBot 5d92d1e428 sneed 2023-08-14 12:27:36 +00:00
SneedBot 751818ee9f sneed 2023-08-13 20:25:30 +00:00
SneedBot 18f3dd86cc sneed 2023-08-09 08:35:51 +00:00
SneedBot d9a1a71c64 sneed 2023-08-04 16:16:19 +00:00
SneedBot 5769acfc34 sneed 2023-08-04 13:33:33 +00:00
SneedBot 83fe2b5670 sneed 2023-08-04 13:13:50 +00:00
SneedBot ff2df23cee sneed 2023-08-04 00:11:54 +00:00
SneedBot 1e323cccee sneed 2023-08-03 13:51:29 +00:00
SneedBot 46c889f0c0 sneed 2023-08-03 08:02:50 +00:00
Aevann 144d7a31be rename is_activated to email_verified 2023-08-03 11:02:31 +03:00
SneedBot d927b4cf5b sneed 2023-08-02 07:29:09 +00:00
SneedBot 12755d1be2 sneed 2023-08-01 07:14:23 +00:00
SneedBot dfd76ab6da sneed 2023-07-26 01:15:02 +00:00
SneedBot 04691e9a8f sneed 2023-07-22 21:00:52 +00:00
Aevann a030f63c2e sneed 2023-07-17 17:46:29 +03:00
SneedBot f2f0a313db sneed 2023-07-14 12:13:17 +00:00
SneedBot 37a0c7f0d8 sneed 2023-07-14 10:51:09 +00:00
SneedBot fc928a7288 sneed 2023-07-14 10:21:43 +00:00
SneedBot 20c08e1e61 sneed 2023-07-10 12:35:58 +00: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
SneedBot 3d05461dfd sneed 2023-07-08 13:09:28 +00:00
SneedBot 05ca1b7143 sneed 2023-07-07 19:10:20 +00:00
SneedBot 469d4a8e62 sneed 2023-07-03 23:44:25 +00:00
SneedBot 76bcb30d87 sneed 2023-07-03 00:38:06 +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
SneedBot 7823df8f0c sneed 2023-06-30 16:39:43 +00:00
SneedBot 41ab593621 sneed 2023-06-26 17:57:52 +00: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
SneedBot 75052ec3d6 sneed 2023-06-25 17:00:16 +00:00
SneedBot db5ce8b635 sneed 2023-06-24 08:22:00 +00:00
SneedBot 5c891c32d8 sneed 2023-06-23 14:26:07 +00:00
SneedBot ae13ad2664 sneed 2023-06-23 13:54:02 +00:00
SneedBot 683c640e32 sneed 2023-06-22 16:15:23 +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
SneedBot 0bca73563a sneed 2023-06-07 23:51:39 +00:00
SneedBot 5805e85e9c sneed 2023-06-07 23:36:47 +00:00
SneedBot 77ad1928e0 sneed 2023-05-26 23:36:03 +00:00
SneedBot ea6386cefd sneed 2023-05-20 00:08:38 +00:00
SneedBot c21b3909f9 sneed 2023-05-13 16:01:15 +00:00
SneedBot f353ebcf6b sneed 2023-05-13 04:54:16 +00:00
SneedBot f9c83b0a83 sneed 2023-05-12 15:28:10 +00:00
SneedBot 5f98f25de9 sneed 2023-05-09 18:40:22 +00:00
Aevann 73520f288c admin 2023-05-07 01:02:56 +03:00
SneedBot 169d4d80af sneed 2023-05-01 17:16:04 +00:00
Aevann de47c992fa remove !wordle since nobody uses it (only 2 ppl used it last 30 days in rdrama and WPD) 2023-04-29 23:27:45 +02:00
SneedBot 5915c0ffaf sneed 2023-03-31 20:00:06 +00:00
SneedBot 1fa41e8b78 sneed 2023-03-31 16:00:05 +00:00
SneedBot 0e666d7278 sneed 2023-03-24 20:00:06 +00:00
SneedBot 8f90386cc5 sneed 2023-03-21 16:35:03 +00:00
Aevann 6cb43bb32c reduce max length of agendaposter_phrase to 50 2023-03-21 16:15:43 +02:00
SneedBot f80821a09e sneed 2023-03-21 11:14:42 +00:00
SneedBot cbef608cb2 sneed 2023-03-19 11:54:15 +00:00
SneedBot 0980f36ad7 sneed 2023-03-18 14:11:15 +00:00
SneedBot f7a2a549ba sneed 2023-03-18 13:35:40 +00:00
SneedBot 3ff204a444 sneed 2023-03-16 10:24:38 +00:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
SneedBot 785ac08460 sneed 2023-03-15 13:49:43 +00:00
Aevann 1e832b0027 Revert "remove hidevotedon" 
This reverts commit d8cf302a43.
 2023-03-15 08:03:11 +02:00
Aevann 3de34c9a65 Merge branch 'keep-session-open' of https://fsdfsd.net/rDrama/rDrama 2023-03-15 08:02:47 +02:00
Aevann a5d5e8e3b8 Revert "remove hidevotedon" 
This reverts commit d8cf302a43.
 2023-03-15 07:22:13 +02:00
Aevann a068d22213 more fixes 2023-03-15 06:47:47 +02:00
Aevann d8cf302a43 remove hidevotedon 2023-03-15 06:21:52 +02:00
SneedBot 44d3e1988b sneed 2023-03-15 04:01:52 +00:00
SneedBot 241685dab4 sneed 2023-03-14 06:23:53 +00:00
SneedBot 90691d0755 sneed 2023-03-14 06:22:53 +00:00
SneedBot e1dccb37c0 sneed 2023-03-12 00:06:42 +00:00
SneedBot bd6babb0d9 sneed 2023-03-11 21:21:42 +00:00
SneedBot ff8be30a2f sneed 2023-03-11 06:52:12 +00:00
SneedBot ec1bfb311e sneed 2023-03-06 20:24:29 +00:00
SneedBot 3d61a5aa3b sneed 2023-03-03 21:39:49 +00:00
Aevann 2112626910 increase charlimit for bio, friends, and enemies to 5k 2023-03-03 06:19:52 +02:00
SneedBot bd800cbbdf sneed 2023-03-02 19:57:05 +00:00
SneedBot 8d48793c8a sneed 2023-03-01 00:00:47 +00:00
Aevann 55c8a51a1d make it possible to position poll options 2023-03-01 00:09:16 +02:00
SneedBot 833f8c12ee sneed 2023-02-28 20:07:37 +00:00
Aevann 24c298f329 do this https://stupidpol.site/h/countryclub/post/79285/-/3681172#context 2023-02-28 21:36:14 +02:00
SneedBot c03d4fb0ba sneed 2023-02-27 13:10:44 +00:00
SneedBot 086cc2d441 sneed 2023-02-24 04:00:07 +00:00
SneedBot 63fa92710b sneed 2023-02-24 00:00:10 +00:00
SneedBot 3268ce6dac sneed 2023-02-23 16:00:43 +00:00
SneedBot 56ebd70c8a sneed 2023-02-23 12:00:07 +00:00
SneedBot b9a64f1ec5 sneed 2023-02-23 04:00:43 +00:00
SneedBot 3c2e6df655 sneed 2023-02-23 00:00:10 +00:00
SneedBot 8d9006ce3c sneed 2023-02-22 08:00:45 +00:00
SneedBot ec5fe67f08 sneed 2023-02-22 04:00:09 +00:00
root a890115467 sneed 2023-02-21 21:14:14 +00:00
SneedBot 7fa150a27f sneed 2023-02-20 00:00:10 +00:00
SneedBot 8f4ba57b6f sneed 2023-02-19 12:00:11 +00:00
Aevann 8158b70c20 apparently cardview toggle got removed from the settings, so might as well remove it from the code 2023-02-19 11:20:16 +02:00
SneedBot aac781cd2c sneed 2023-02-18 20:00:11 +00:00
Aevann 4e9eb9b710 Merge branches 'master' and 'master' of https://fsdfsd.net/rDrama/rDrama 2023-02-18 18:33:21 +02:00
Aevann d4210c2710 renamed p.embed_url to p.embed 2023-02-18 18:33:19 +02:00
SneedBot 5944531ab9 sneed 2023-02-18 16:00:11 +00:00
SneedBot c852ad8adb sneed 2023-02-11 08:00:06 +00:00
SneedBot 2c7181896a sneed 2023-02-07 08:00:09 +00:00
SneedBot 40b3dbd29b sneed 2023-01-29 16:00:10 +00:00
SneedBot eb72692e2a sneed 2023-01-25 16:00:13 +00:00
SneedBot da5b89b30c sneed 2023-01-24 12:00:09 +00:00
SneedBot b2c8c36ba7 sneed 2023-01-20 08:00:09 +00:00
Aevann f17fade8a6 purge discord from site code 2023-01-20 07:31:53 +02:00
SneedBot 93aa16d535 sneed 2023-01-01 12:23:47 +00:00
Aevann 93e9a42fa3 stop using inline style/script elements 2022-12-29 16:20:27 +02:00
SneedBot 41467a4d11 sneed 2022-12-26 20:16:47 +00:00
SneedBot fc4e40c6a9 sneed 2022-12-26 02:38:58 +00:00
SneedBot 227b6ec5d3 sneed 2022-12-25 01:01:13 +00:00
SneedBot cef1227361 sneed 2022-12-23 00:00:11 +00:00
SneedBot 23d64fc691 sneed 2022-12-20 04:00:12 +00:00
SneedBot 0d0eed9d39 sneed 2022-12-19 01:32:50 +00:00
SneedBot 2153666d89 sneed 2022-12-14 00:00:11 +00:00
Aevann1 c10c00473a make is_banned fkey on user id 2022-12-14 00:02:53 +02:00
SneedBot 7ce7841fe6 sneed 2022-12-13 20:00:08 +00:00
SneedBot 6a8e36caef sneed 2022-12-11 23:59:59 +00:00
SneedBot c27f7df6d1 sneed 2022-12-10 20:00:06 +00:00
Aevann1 b2d457c028 increase css limit from 4000 to 10000 2022-12-10 20:30:19 +02:00
SneedBot 5b870f06af sneed 2022-12-07 08:16:11 +00:00
Aevann f8aa67fb9a add button on profile to upload profile background (#48) 
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Reviewed-on: rDrama/rDrama#48
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-05 04:16:45 +00:00
SneedBot 1bfa783023 sneed 2022-12-04 23:46:06 +00:00
Aevann e105035272 remove country club system and replace it with a 3 tier thing: (#41) 
- /h/masterbaiters: 1 TS - for gayops

- /h/countryclub: 1000 TS - for anything requiring secrecy and doesnt need critical mass - have to make it a rule that u cant post gayops in /h/countryclub

- /h/chudrama: 5000 TS - for chad+stud posts

EDIT: i removed the /h/masterbaiters gate, but u can bring it back if u want
Co-authored-by: Aevann1 <randomname42029@gmail.com>
Co-authored-by: Snakes <duolsm@outlook.com>
Reviewed-on: rDrama/rDrama#41
Co-authored-by: Aevann <aevann@noreply.fsdfsd.net>
Co-committed-by: Aevann <aevann@noreply.fsdfsd.net>
 2022-12-04 18:39:06 +00:00
SneedBot e32f3d70bc sneed 2022-12-02 22:30:56 +00:00
SneedBot e4e9d613e4 sneed 2022-12-01 00:57:29 +00:00
SneedBot 23f94b3f5d sneed 2022-11-26 23:27:47 +00:00
justcool393 272e2ee936
sneed (rename procoins to marseybux) (#472) 
* sneed (rename procoins to marseybux)

* literally unusable

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 18:08:29 -05:00
Aevann1 2f31fdfdd7 Revert "remove User.newtab and see if anyone complains" 
This reverts commit 787c89961f.
 2022-11-21 18:55:13 +02:00
Aevann1 787c89961f remove User.newtab and see if anyone complains 2022-11-21 16:36:17 +02:00
SneedBot 377c31371f sneed 2022-11-14 07:43:53 +00:00
SneedBot 0eefc9803c sneed 2022-11-09 17:23:31 +00:00
SneedBot 6bca53d395 sneed 2022-11-07 07:09:27 +00:00
justcool393 8725a0cc55 fix .sql files 2022-11-07 01:08:26 -06:00
justcool393 2c532af1ce set defaults in user class and schema.sql 2022-11-06 20:06:37 -08:00
SneedBot 40e39caf4d sneed 2022-11-05 14:08:43 +00:00
justcool393 08d19c7e5a schema: update schema to add chuddedfor 2022-11-04 21:00:01 -05:00
SneedBot 0e9ac3fff4 sneed 2022-11-04 00:28:18 +00:00
justcool393 339d5fe8f1 users: add profanity filter to censor our gosh darned potty mouthes 2022-11-03 17:59:18 -05:00
Snakes 6f91e77338
Port sneeds from spooky-22. 2022-11-01 00:17:20 -04:00
Aevann1 fbeac461ca refactor poorcel mode 2022-10-25 18:07:44 +02:00
Aevann1 aabb762378 sneed 2022-10-19 20:01:37 +00:00
Aevann1 fe7b1f7aa0 sneed 2022-10-19 19:23:19 +00:00
Aevann1 50e80874b7 sneed 2022-10-19 04:00:06 +00:00
Aevann1 9e6fe3063f sneed 2022-10-18 08:00:02 +00:00
Aevann1 f9840d5c71 sneed 2022-10-14 16:00:08 +00:00
Aevann1 89a0ff4a4b remove username reservation system 2022-10-14 14:01:06 +02:00
Aevann1 677043827d sneed 2022-10-11 20:00:09 +00:00