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

760 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann 9f7a761b73 homoween III + other random shit 2023-09-29 02:58:09 +03:00
Aevann c3870505ea use get_user whenever possible instead of repeating code 2023-09-27 00:57:33 +03:00
Aevann a9b078007e refactor slurs and profanities and put them in their own file 2023-09-22 20:01:30 +03:00
Aevann ac6a71223d fix mp3 songs 2023-09-17 23:14:41 +03:00
Aevann 39642ec2b4 patch exploit 2023-09-15 01:40:25 +03:00
Aevann f392c6bb9c disallow permabanned-cels from all POST endpoints that require auth except /reply /contact /delete/post /delete/comment 2023-09-14 19:49:46 +03:00
Aevann 7bd582278d remove i.reddit.com for being deprecated 2023-09-14 03:09:19 +03:00
Aevann 6f88ef72f9 always use fake headers 2023-09-09 21:09:35 +03:00
Aevann 1dba2d7aa2 use undelete.pullpush.io 2023-09-09 18:44:47 +03:00
Aevann 9ee45b4a24 remove unnecessary spaces and tabs 2023-09-07 18:26:31 +03:00
Aevann b418364c58 rename 2 endpoints 2023-09-07 11:51:57 +03:00
Aevann d7eecbdc1a remove redundant shit 2023-09-07 11:51:51 +03:00
Aevann 7cd1fbd08f remove unnecessary graceful=True from get_user() usages 2023-09-06 21:13:32 +03:00
Aevann f2ed74ec6a dedup sorting in the jinja templates 2023-09-05 17:32:36 +03:00
Aevann 462bb23e6d remove unused JL0 perms (bloat) 2023-09-05 15:30:16 +03:00
Aevann 4ed9eb4277 allow ppl to empty their flair, pronouns, and checkmark text 2023-08-30 20:01:53 +03:00
Aevann 11cb3ab18f handle 500 error 2023-08-26 00:11:32 +03:00
Aevann 8d84748c42 add spaces for consistency 2023-08-24 00:57:39 +03:00
Aevann e1d6c97465 Revert "use gevent.with_timeout whenever u can" 
This reverts commit eb0af76e46.
 2023-08-20 19:24:53 +03:00
Aevann eb0af76e46 use gevent.with_timeout whenever u can 2023-08-20 19:14:02 +03:00
Aevann bfa6aa5df4 restore accidentially deleted line 2023-08-18 22:01:56 +03:00
Aevann ac41cb9a82 add missing process_files to sigs 2023-08-17 02:46:42 +03:00
Aevann 2f555e87dd add missing pushnotif_url 2023-08-17 02:04:56 +03:00
Aevann f02029aab2 replace libreddit instance (old one stopped functioning 2023-08-15 22:45:38 +03:00
Aevann 1882653da6 addendum to 149095d91e 2023-08-12 17:56:39 +03:00
Aevann 39098fe323 kitchen sink commit 2023-08-12 00:50:23 +03:00
Aevann 6f5872cf62 remove \n 2023-08-11 16:36:43 +03:00
Aevann 0633c9b71d fix bug caused by 4602e374ee 2023-08-10 17:00:54 +03:00
G-tix 4602e374ee Remove unnecessary redirects and remove temp event stuff. (#183) 
Removing 400 redirects as this confuses users (including me lol). Also removed some event stuff which seems redundant.

Reviewed-on: rDrama/rDrama#183
Co-authored-by: G-tix <g-tix@noreply.fsdfsd.net>
Co-committed-by: G-tix <g-tix@noreply.fsdfsd.net>
 2023-08-10 12:37:57 +00:00
vasya 63f9d02abc Switch youtube_dl for yt_dlp (#178) 
See #3. Tested by uploading anthem to test account and playing it back.

Co-authored-by: vasya <vasya34@proton.me>
Reviewed-on: rDrama/rDrama#178
Co-authored-by: vasya <vasya@noreply.fsdfsd.net>
Co-committed-by: vasya <vasya@noreply.fsdfsd.net>
 2023-08-05 01:48:47 +00:00
Aevann 11b7c15758 move over_18 setting to cookies so ppl can have different settings for different devices 2023-08-04 00:17:55 +03:00
Aevann 54d7e1fe28 add cursormarsey toggle 2023-08-03 23:40:22 +03:00
Aevann 443615e14f better v.poor code 2023-08-03 23:40:22 +03:00
Aevann 9a527df75d add lifetimedonated_visible 2023-08-03 07:57:09 +03:00
Aevann bd942fe12e remove useless tabs 2023-08-01 10:38:58 +03:00
Aevann 201eec7aa5 allow paypigs to have 1-letter and 2-letter names 2023-08-01 09:46:12 +03:00
Aevann 6e9d3d68dc strip after not before 2023-07-30 09:20:02 +03:00
Aevann b6a02b0874 make sure all settings are visible + move the checkmark settings to their own section 2023-07-30 08:55:07 +03:00
Aevann 407eabf8f5 move profile background to the settings for consistency + improve banner-pic a bit 2023-07-30 08:36:57 +03:00
Aevann 8beb2d7e8e remove typing (useless code bloat) 2023-07-30 03:42:06 +03:00
Aevann 51d6d6f3cf remove leftover code causing error 2023-07-30 03:14:11 +03:00
Aevann 0a3fbaeb88 replace with sanitize_settings_text with much better process_settings_plaintext 2023-07-30 02:39:22 +03:00
Aevann 52a7a98970 fix profile songs 2023-07-28 03:27:01 +03:00
Aevann eb9e46b83d fix missing import 2023-07-26 20:27:30 +03:00
Aevann ffba8b3b2d only query the columns u need 2023-07-26 15:31:44 +03:00
Aevann a94dda90dd remove unnecessary flushes 2023-07-25 23:35:54 +03:00
Aevann 9a7b08ebac disallow 10489 from changing his name 2023-07-24 17:41:22 +03:00
Aevann c8a40deb97 fix this https://rdrama.net/h/toomanyxchromosomes/post/187815/footballer-cleared-of-rpe-for-the/4583480#context 2023-07-16 14:56:24 +03:00
Aevann ff67e30949 dont count failed requests towards ratelimit 2023-07-13 16:50:46 +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 86fa1090c3 remove edgy founder line 2023-07-05 19:17:04 +03:00
Aevann 499781329f remove event_darkmode 2023-07-03 01:55:56 +03:00
Aevann 8f323c3ec6 restore perma-marsify toggle for paypigs only 2023-07-02 23:07:31 +03:00
Aevann f4af0779fd add error for signatures for non-paypigs 2023-07-02 22:57:08 +03:00
Aevann 7f6675f7f9 remove unddit.com (RIP u will not be forgotten) 2023-07-01 19:41:59 +03:00
Aevann 5c0dcbf585 extend edgy founder deadline 2023-06-28 01:20:43 +03:00
Aevann 60b5b33a79 Revert "remove poor mode" 
This reverts commit 33d281cc2e.
 2023-06-27 15:01:40 +03:00
Aevann da9c19a54a make everyone who joins house edgy in the next 48hours a founder 2023-06-26 18:08:20 +03:00
Aevann 33d281cc2e remove poor mode 2023-06-26 13:55:38 +03:00
Aevann c8116a401a do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4439973#context 2023-06-26 13:35:42 +03:00
Aevann 5fe6c599df make the unblockable and fish notifs actually get sent 2023-06-24 20:34:07 +03:00
Aevann a15d5eabef rename "agendaposter" to "chud" 2023-06-23 14:07:47 +03:00
Aevann 57ac7f4f73 increase pronouns character limit from 11 characters to 15 characters 2023-06-22 15:57:36 +03: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 b3446f213d dont allow shadowbanned-cels to change their username 2023-06-06 22:09:48 +03:00
Aevann 864f770762 add namelock award 2023-05-13 07:53:14 +03:00
Aevann 2156f9ef03 restore blocks to its own page in the settings 2023-05-05 05:16:19 +03:00
Aevann a37fca393d combined buy button for awards and hats 2023-04-24 17:08:40 +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 f834514e1a fix deleting media 2023-03-25 17:07:12 +02:00
Aevann 1bce14efcd rename remove_media to remove_media_using_link for clarity 2023-03-17 12:25:49 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann 1e832b0027 Revert "remove hidevotedon" 
This reverts commit d8cf302a43.
 2023-03-15 08:03:11 +02:00
Aevann c6a7051200 flush instead of committing inside requests 2023-03-15 07:19:35 +02:00
Aevann a068d22213 more fixes 2023-03-15 06:47:47 +02:00
Aevann f768d81103 keep db sessions open 2023-03-15 05:58:00 +02:00
Aevann 9f66e33061 Revert "convert IS_FISTMAS and IS_HOMOWEEN from functions to variables" 
This reverts commit b45d845630.
 2023-03-08 08:51:40 +02:00
Aevann b45d845630 convert IS_FISTMAS and IS_HOMOWEEN from functions to variables 2023-03-08 08:10:18 +02:00
Aevann 20993c004c for house change, pool coins and mbux together 2023-03-07 07:09:17 +02:00
Aevann 873292d60d make remove_media() to fix 500 error 2023-03-06 21:32:08 +02:00
Aevann 2112626910 increase charlimit for bio, friends, and enemies to 5k 2023-03-03 06:19:52 +02:00
Aevann d7f42ac50a dont give shekels to ppl not notified bc of blocks + dont give shekels to ppl ALSO mentioned directly + prevent group double charging on edit + do this https://stupidpol.site/h/countryclub/post/79285/-/3695711#context 2023-03-02 21:56:43 +02:00
Aevann 308bb03125 add !everyone 2023-03-02 02:32:51 +02:00
Aevann 17bb6dad48 blackjack fix exploit 2023-02-27 07:33:45 +02:00
Aevann 6ac9b32834 allow positioning of files 2023-02-26 14:08:37 +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 8418e0075f move .cookies to /cookies 2023-02-25 19:45:13 +02:00
Aevann 3e7ccb7756 add push notifs to add_notif() 2023-02-24 04:28:10 +02: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
Aevann c3842b8bf8 remove unnecessary song change code 2023-02-17 18:42:55 +02:00
Aevann 92b77735ae fix profile songs in localhost 2023-02-17 17:20:51 +02:00
Aevann 8537dfbf21 dont commit on error 2023-02-17 16:49:23 +02:00
Aevann d027e51faa fix 500 error 2023-02-17 16:21:12 +02:00
Aevann e5343fb7a8 dont hang workers on youtube song change 2023-02-10 16:29:09 +02:00
Aevann 96b8afa617 use /temp_songs directory 2023-02-10 16:17:22 +02:00
Aevann 88814ee208 expand blackjack 2023-02-07 05:31:49 +02:00