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

204 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
Aevann a1de1cf7c8 "Disable NSFW Warnings" -> "NSFW Warnings" 2023-10-05 13:29:23 +03:00
Aevann bb7192c929 rename over_18 to nsfw 2023-10-05 13:19:50 +03:00
Aevann ff155f0499 put the cost in the house change warning 2023-10-04 19:58:10 +03:00
Aevann 5c1a2ac7a1 18+ -> NSFW 2023-10-04 17:04:06 +03:00
Aevann b24be481d7 new_name->new_flair, title->flair 2023-10-04 15:29:41 +03:00
Aevann f4104aa875 dedup perma-slur and perma-profanities 2023-10-02 09:10:24 +03:00
Aevann 5c80f0017f no more href="#" 2023-10-02 09:06:29 +03:00
Aevann 776d9fc091 revert the modal change 2023-10-02 09:04:05 +03:00
Aevann 92a5174466 use my own modal system instead of bootstrap in preparation for potentially not using bootstrap.js anymore (also I like it more and wanna see if anybody notices any changes at all) 2023-10-01 15:03:52 +03:00
Aevann bc8427d932 +18 -> 18+ 2023-09-29 23:57:58 +03:00
Aevann e08c608288 make referral links use id instead of original_username 2023-09-29 08:06:07 +03:00
Aevann 14df8b5223 remove ns. where it isnt needed 2023-09-29 04:52:14 +03:00
Aevann 39c210c153 fix error 2023-09-29 03:40:53 +03:00
Aevann 9f7a761b73 homoween III + other random shit 2023-09-29 02:58:09 +03:00
Aevann 455fb1260f make referrals og_username by default since we change name a lot 2023-09-27 00:48:57 +03:00
Aevann b3a34843b4 fix this https://watchpeopledie.tv/h/meta/post/61549/megathread-for-bugs-and-suggestions/1726806#context 2023-09-21 22:19:01 +03:00
Aevann cc32dfafe9 consistent capitalization in settings 2023-09-15 18:37:12 +03:00
Aevann fc70ce65dc make it appear to everyone 2023-09-15 18:21:40 +03:00
Aevann e33e0558f5 show referred_users in /settings/personal 2023-09-15 18:20:04 +03:00
Aevann c4dcb3e312 remove unnecessary ; 2023-09-15 14:28:43 +03:00
Aevann 7cbe28a84f dont show blahblahblah donate service 2023-09-14 22:37:35 +03:00
Aevann 425b6e90e1 remove unnecessary part 2023-09-14 21:47:03 +03:00
Aevann df4f694d8e fix 2fa image not working 2023-09-14 21:44:35 +03:00
Aevann 7bd582278d remove i.reddit.com for being deprecated 2023-09-14 03:09:19 +03:00
Aevann 1dba2d7aa2 use undelete.pullpush.io 2023-09-09 18:44:47 +03:00
Aevann a5d01a4572 spaces -> tabs 2023-09-07 18:28:08 +03:00
Aevann d7eecbdc1a remove redundant shit 2023-09-07 11:51:51 +03:00
Aevann 2ba4233115 add no-visited to DONATE_SERVICE link 2023-09-06 19:36:11 +03:00
Aevann f2ed74ec6a dedup sorting in the jinja templates 2023-09-05 17:32:36 +03:00
Aevann a3125de6bf use better link 2023-08-24 01:13:58 +03:00
Aevann 9a093579e2 restore JC blurp (it was better) 2023-08-24 01:06:08 +03:00
Aevann b0f256f8b6 add padding 2023-08-24 01:02:11 +03:00
Aevann ba47449685 use solid icons instead of regular 2023-08-23 03:52:50 +03:00
Aevann 79f2f81ea7 fix tabs 2023-08-23 02:59:17 +03:00
Aevann 0ac19b8af0 use nitter.net again 2023-08-20 05:03:31 +03:00
Aevann 9f30662bb0 should be "Upload" instead of "Update" 2023-08-18 22:04:06 +03:00
Aevann 9297f88353 space consistency in jinja if statements 2023-08-16 23:41:25 +03:00
Aevann f02029aab2 replace libreddit instance (old one stopped functioning 2023-08-15 22:45:38 +03:00
Aevann 49605990bb rename show_marseys to show_emojis 2023-08-14 17:29:50 +03:00
Aevann 416ecf3558 dedup some html code 2023-08-14 17:28:27 +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
KindaCrayCray 5cf680ebf5 Fix issue #4, Cursor Marsey in settings, and permanent settings for slur/profanity filters (#180) 
* Settings toggles now reverse themselves if the setting fails to update
* Cursor Marsey was broken in settings due to an id overlap
* Permanent setting option for slur/profanity would not appear unless the setting was enabled before page load

Reviewed-on: rDrama/rDrama#180
Co-authored-by: KindaCrayCray <kindacraycray@noreply.fsdfsd.net>
Co-committed-by: KindaCrayCray <kindacraycray@noreply.fsdfsd.net>
 2023-08-06 20:01:59 +00:00
Aevann 854b9de703 clarify the setting description 2023-08-04 00:22:27 +03:00
Aevann 54d7e1fe28 add cursormarsey toggle 2023-08-03 23:40:22 +03:00
Aevann 144d7a31be rename is_activated to email_verified 2023-08-03 11:02:31 +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 f4be316f36 fix namechange requirements for paypigs 2023-08-01 09:56:24 +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 abd11a8db7 minor cosmetic fix 2023-07-27 03:27:03 +03:00
Aevann 988a14f187 use SITE_FULL_IMAGES whenever u possibly can 2023-07-22 19:24:16 +03:00
Aevann 379836cad2 remove weird margin clipping user banners on mobile 2023-07-22 14:02:03 +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 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 97188519a7 add confirmation for changing houses 2023-06-28 00:56:23 +03:00
Aevann 3a21c7d2ed disable spider toggle when awarded 2023-06-28 00:04:53 +03:00
Aevann 60b5b33a79 Revert "remove poor mode" 
This reverts commit 33d281cc2e.
 2023-06-27 15:01:40 +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 8bd657b726 add /blockers and /blocking to profile pages 2023-06-24 20:39:50 +03:00
Aevann c097a7c244 fix error msgs in /settings/blocks 2023-06-24 20:36:27 +03:00
Aevann 57ac7f4f73 increase pronouns character limit from 11 characters to 15 characters 2023-06-22 15:57:36 +03:00
Aevann f1e9f3e466 recrease margin 2023-06-22 15:57:11 +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 6a5c09136e fix pronoun description 2023-06-16 06:03:53 +03:00
Aevann da104a1f21 do this https://rdrama.net/post/170794/psa-u-can-completely-disable-18/4160823#context 2023-05-16 03:45:23 +03:00
Aevann 460a9a686a show tier name in tooltip + standardize patron constants 2023-05-15 01:17:22 +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 744c95f7ca lock user profiles from logged-out-cels 2023-05-03 17:50:42 +03:00
Aevann dce3b56a13 make the event music description for poor mode permanent (so ppl understand why music for new events dont play for them) 2023-04-29 00:48:46 +02:00
Aevann 16766981bc DKD 2023-04-25 16:34:09 +02:00
Aevann 674c1594c9 remove typo'd class 2023-03-21 19:12:38 +02:00
Aevann dd54413cf3 convert marsey submission form to include all emojis 2023-03-18 15:34:04 +02:00
Aevann a0ac1d25bd minor js fix 2023-03-18 08:27:41 +02:00
Aevann f744887433 remove redundant js file 2023-03-17 16:20:20 +02:00
Aevann 972b0a7aad 2-step login -> two-factor authentication 2023-03-16 17:42:53 +02:00
Aevann 45f99cc048 hide hidevotedon from rdrama 2023-03-15 07:23:01 +02:00
Aevann a5d5e8e3b8 Revert "remove hidevotedon" 
This reverts commit d8cf302a43.
 2023-03-15 07:22:13 +02:00
Aevann d8cf302a43 remove hidevotedon 2023-03-15 06:21:52 +02:00
Aevann 198f3bc0b7 remove redirect_uri placeholder 2023-03-10 03:27:02 +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 7a52538de4 bigger text for errors 2023-03-07 16:29:51 +02:00
Aevann 20993c004c for house change, pool coins and mbux together 2023-03-07 07:09:17 +02:00
Aevann b2c7ca31da move disabling buttons to bottom.js 2023-03-07 02:21:08 +02:00
Aevann b83aa1d82c better media code 2023-03-06 20:02:12 +02:00
Aevann 2112626910 increase charlimit for bio, friends, and enemies to 5k 2023-03-03 06:19:52 +02:00
Aevann 5b71b0a81a refactor file upload 2023-02-27 17:02:35 +02:00
Aevann 6ac9b32834 allow positioning of files 2023-02-26 14:08:37 +02:00
Aevann 52907b4a2e remove UI animations 2023-02-17 19:11:23 +02:00
Aevann 06a70f7fd7 refactor donation code 2023-02-01 21:49:39 +02:00
Aevann b7e4f27f65 use transactions table in rdrama 2023-02-01 21:04:15 +02:00
Aevann 59fe09d0af disable NSFW marking in WPD 2023-02-01 20:52:34 +02:00
Aevann 4c9181e0b1 save failed profilecss 2023-01-27 12:02:11 +02:00
Aevann 5502715122 replace type="hidden" with hidden 2023-01-24 07:10:16 +02:00