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

670 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann e0d5fb6374 make chud award work with sharpen award 2023-10-13 22:00:06 +03:00
Aevann 3406f6f074 make chud award work with queen award 2023-10-13 21:58:20 +03:00
Aevann 9f6042ce50 make chud award work with owoify award 2023-10-13 21:56:48 +03:00
Aevann 4a6cd663cd make chud award work with marsify award 2023-10-13 21:17:50 +03:00
Aevann bed1ff0bac make "bird" cancel "pizzashill" effect and vice versa 2023-10-13 20:39:53 +03:00
Aevann 29099c8976 dynamic var to prevent errors that happen when i remove or add event awards 2023-10-12 21:46:24 +03:00
Aevann 30676ed76f fix 500 error 2023-10-12 16:41:23 +03:00
Aevann 267bd76b0e fix 500 error 2023-10-12 16:39:17 +03:00
Aevann e28049ea65 fix order of notifications 2023-10-11 23:02:00 +03:00
Aevann 7d1aa771d1 fix 500 error 2023-10-11 20:18:11 +03:00
Aevann d1347262f2 fix 500 error when buying house awards 2023-10-11 20:03:42 +03:00
Aevann 75bfc65cc7 make post #210983 immune to awards 2023-10-11 16:50:15 +03:00
Aevann a0f0ad7cbf rename hw-grinch to hallowgrinch 2023-10-10 21:14:45 +03:00
Aevann 78b4c83b58 show the emoji in the note when giving emoji award 2023-10-10 20:39:24 +03:00
Aevann c3f01801e2 fix award deflection notifications 2023-10-10 20:27:01 +03:00
Aevann 7759229178 change award modal 2023-10-10 19:53:46 +03:00
Aevann 83c8af6f85 dont repeat urself 2023-10-10 18:11:32 +03:00
Aevann 6eb3b3b6fc improve grinch awards 2023-10-10 17:27:41 +03:00
Aevann 375b26da9b fix misleading notifs 2023-10-09 22:55:37 +03:00
Aevann 4ec634e39c remove space 2023-10-09 20:21:16 +03:00
Aevann eba59884e1 dont give coins for event awards to prevent lootbox exploiting 2023-10-09 20:21:03 +03:00
Aevann f68214b1bf jumpscare award: dont notify 2023-10-09 19:50:57 +03:00
Aevann 19c352c8f0 replace train and scooter award with a "horizontal" selection to "emoji" award 2023-10-09 01:42:05 +03:00
Aevann 62d1940a8f sub -> hole 2023-10-07 20:55:50 +03:00
Aevann 9be96bf827 dedup 2023-10-07 18:36:28 +03:00
Aevann 625ff6b006 more consistency between body-altering awards + effortpost protection 2023-10-07 18:35:16 +03:00
Aevann 68ceff8320 add missing "award" 2023-10-07 18:08:28 +03:00
Aevann 1bc569e3e5 make rainbow award affect posts its awarded on since it doesnt alter the body in any way 2023-10-07 18:04:44 +03:00
Aevann 6c403fcb18 change "king" award to "gold" award 2023-10-06 20:39:27 +03:00
Aevann 00d28a6120 add pride award 2023-10-05 22:40:44 +03:00
Aevann 0867c47d9c rename customtitle to flair 2023-10-05 13:39:12 +03:00
Aevann 87486c4425 allow shadowbanned-cels to use awards (the notifs they generate dont get sent anyway) 2023-10-05 10:57:28 +03:00
Aevann 7ef3915bb1 dont send a push-notif if award fails 2023-10-04 20:30:23 +03:00
Aevann 7ee0488a86 disallow ppl from using unban awards to undo janny bans 2023-10-04 19:51:57 +03:00
Aevann fc05cf4c80 add king award 2023-10-04 18:42:03 +03:00
Aevann c454887445 allow 18+ emojis to be used with "emoji" award but only show their effect to ppl with "Disable 18+ warnings" on 2023-10-04 16:36:26 +03:00
Aevann bc8f5ff6a1 disallow 18+ emoji with the emoji award 2023-10-04 16:11:22 +03:00
Aevann 7fced29fba change wholesome award to emoji award 2023-10-04 16:05:43 +03:00
Aevann f6eab8cd28 allow ppl with deflector to award whatever they want to their siht 2023-10-04 13:22:54 +03:00
Aevann d1f8162873 make deflector apply to "shit" and "unpin" award 2023-10-04 13:18:08 +03:00
Aevann 8c6ad49127 fix negative award commit 2023-10-02 17:50:04 +03:00
Aevann c061936b53 make award immunity only apply to negative awards 2023-10-02 17:24:09 +03:00
Aevann f4a26ab5c3 dont allow pin awards on perma-pinned posts (it makes them pinned for 1 hour instead) 2023-10-02 08:12:38 +03:00
Aevann 9f7a761b73 homoween III + other random shit 2023-09-29 02:58:09 +03:00
Aevann a9b078007e refactor slurs and profanities and put them in their own file 2023-09-22 20:01:30 +03:00
Aevann 85cf331ae1 add janny award discount of 2% per level, cap disccount at 45%, decrease benefactor given marseybux to 2000 2023-09-22 09:55:54 +03:00
Aevann 4d1efffee6 rename 2 attributes for clarity 2023-09-22 09:53:13 +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 7ce4e34453 user PERMS whenever u can 2023-08-31 13:31:04 +03:00
Aevann bd1ea70a1a - make rainbow, sharpen, queen not retroactive 
- make sharpen fully affect all future posts
- make old posts and comments affected by these awards unfixable after they expire
 2023-08-14 14:00:29 +03:00
Aevann 8df49c50da make chud award not affect comment when author has deflector 2023-08-14 13:14:14 +03:00
Aevann aee38394f8 remove the incentive for paypigs to enable perma-marsify to avoid ever getting chudded 2023-08-12 21:38:41 +03:00
Aevann 45be4132ce remove fish award 2023-08-11 16:18:13 +03:00
Aevann ed34558f33 remove unnecessary .all() 2023-08-05 22:26:42 +03:00
Aevann 24b92d4f16 explain to ppl when their deflected award fails so they don't get confused and report it as a bug 2023-08-05 22:20:55 +03:00
Aevann 8beb2d7e8e remove typing (useless code bloat) 2023-07-30 03:42:06 +03:00
Aevann 1cfd8ed517 remove redundant line 2023-07-29 22:00:42 +03:00
Aevann a94dda90dd remove unnecessary flushes 2023-07-25 23:35:54 +03:00
Aevann ff67e30949 dont count failed requests towards ratelimit 2023-07-13 16:50:46 +03:00
Aevann 402ae8e40b allow using of Shit award to negative someone 2023-07-10 16:24: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 1adc447d18 do this https://rdrama.net/h/countryclub/post/79285/-/4493631#context 2023-07-05 23:45:57 +03:00
Aevann 3e6622c511 cleanup in aisle 4 2023-07-03 03:26:20 +03:00
Aevann 1cd13cf4da make jannies able to award shadowbanned-cels 2023-07-02 20:24:21 +03:00
Aevann 15c3026c93 remove unnecessary award restrictions 2023-06-27 20:20:41 +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 883c96a830 fix 500 erro 2023-06-24 21:54:36 +03:00
Aevann 28cf9cc605 pick the queen name based on first letter of username 2023-06-23 21:08:10 +03:00
Aevann fe5261df36 make chudding affect the comment its applied on 2023-06-23 20:47:57 +03:00
Aevann d9bed378a9 complement 32fa466e6a 2023-06-23 16:46:42 +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 24ea1414d6 avoid potential server error 2023-06-22 20:56:46 +03:00
Aevann 9838398d55 better logic for queen names 2023-06-22 20:50:10 +03:00
Aevann 0c3b8d8d32 use real girl names with queen award 2023-06-22 20:29:56 +03:00
Aevann cc7176868d fix ban_reason getting wiped accidentially 2023-06-22 14:24: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 d2fe3a631d fix unban awards 2023-06-16 05:08:08 +03:00
Aevann a21b2f66b5 fix this https://rdrama.net/post/172930/as-requested-by-kissingerfanboynocarp-heres-birdenthiusts/4213135#context 2023-06-08 06:55:22 +03:00
Aevann 5614879f4e make chud and owoify exclusive to fix this https://rdrama.net/post/18459/martycapywalking-megathread-for-bugs-and-suggestions/4242306#context 2023-06-08 06:47:41 +03:00
Aevann 9c6c264307 limit the "show more" button to comments only 2023-06-08 04:36:41 +03:00
Aevann 32fa466e6a rename submissions to posts 2023-06-08 02:26:32 +03:00
Aevann 7f565f5457 dedup removing cuniform 2023-05-20 14:09:40 +03:00
Aevann 428ec6b86a strip @ from new username 2023-05-17 21:14:45 +03:00
Aevann 3ecc3d1ebf fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4161734#context 2023-05-16 06:28:13 +03:00
Aevann 91987cd080 add code for namelock badge 2023-05-16 03:20:55 +03:00
Aevann ad121dd9c7 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4158116#context 2023-05-16 01:51:37 +03:00
Aevann 375f82969b fix this https://rdrama.net/h/changelog/post/165657/changelog-megathread-marseynotes/4145574#context 2023-05-13 08:04:39 +03:00
Aevann 864f770762 add namelock award 2023-05-13 07:53:14 +03:00
Aevann 8ac8577081 remove unfunctional perm 2023-05-07 20:03:35 +03:00
Aevann f3a0080698 remove useless tabs 2023-05-06 00:47:07 +03:00
Aevann f5a97ae709 add new patron tier for benefactor-cels 2023-05-03 18:29:31 +03:00
Aevann 31809dbab1 fix https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4078126#context 2023-05-02 20:28:47 +03:00
Aevann 2aa9aed0ac better ban award notifs 2023-04-28 11:43:26 +02:00
Aevann d8af55068b dont allow custom chud phrases anymore since HTML checking greately limits them https://images-ext-2.discordapp.net/external/nv4shIUSH3FJQDTaBuUqi7VmUgrVzj0Uxr_tTVcx5JE/https/pomf2.lain.la/f/xkfw1f1.webp?width=271&height=588 2023-04-28 11:07:28 +02:00
Aevann ef56dd3f71 fix this https://rdrama.net/h/vampire/post/166260/psa-vampire-bites-now-make-people 2023-04-27 16:11:09 +02:00
Aevann 146ee51b05 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4000192#context 2023-04-25 09:26:55 +02:00
Aevann 92bf3f7134 same as last commit 2023-04-25 07:59:53 +02:00