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

612 Commits (f0f540b01cfa8568b9d852f54b9565db6be0f522)

Author SHA1 Message Date
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
Aevann 57d3badc9f fix this https://rdrama.net/h/changelog/post/165657/changelog-megathread-marseynotes/4042233#context 2023-04-25 07:54:16 +02:00
Aevann d136ae163c fix combined buy btn 2023-04-25 06:47:36 +02:00
Aevann a37fca393d combined buy button for awards and hats 2023-04-24 17:08:40 +02:00
Aevann 064918acd0 fix vamp bug 2023-04-23 04:42:28 +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 0ce52ec78a make "marsify" and "chud" mutually exclusive again to prevent cheap ban 2023-04-02 08:17:21 +02:00
Aevann 69e33b671d decrease agendaposter phrase max length to 35 characters 2023-03-24 20:05:32 +02:00
Aevann d956431765 fix this https://rdrama.net/h/meta/post/157653/i-lost-my-house-vampire-founding 2023-03-24 17:22:17 +02:00
Aevann a93c5ed0e5 clearer chud message to chudded user 2023-03-24 13:51:25 +02:00
Aevann ac8fbae3c0 stop marsify and chud award from being mutually exclusive 2023-03-23 15:02:02 +02:00
Aevann 50680e0fa8 cut down on chud award evasion 2023-03-21 23:33:43 +02:00
Aevann d961433fb9 make sure agendaposter_phrase is lower case 2023-03-21 19:54:40 +02:00
Aevann 34744fb741 tell ppl who receive the chud award the phrase they'll have to say 2023-03-21 17:27:46 +02:00
Aevann 95d1b2c9ce add exclamation mark 2023-03-21 16:15:51 +02:00
Aevann 6cb43bb32c reduce max length of agendaposter_phrase to 50 2023-03-21 16:15:43 +02:00
Aevann f1a8db74b7 enforce length limit for chud phrase in the backend 2023-03-19 20:17:44 +02:00
Aevann 60e9175a63 make chud phrase lowercase 2023-03-19 19:28:07 +02:00
Aevann b004617695 customizable chud phrases 2023-03-19 19:13:45 +02:00
Aevann ab93c94bfc add IGNORE_AWARD_IMMUNITY perm 2023-03-18 18:11:25 +02:00
Aevann 95a0edf070 disable "GIVE AWARD" button on carp and pizzashill 2023-03-18 18:10:14 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann f768d81103 keep db sessions open 2023-03-15 05:58:00 +02:00
Aevann 904c2ab764 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3771814#context 2023-03-12 17:02:25 +02:00
Aevann 1a200a975f redirect /shop to /shop/awards 2023-03-10 22:27:36 +02:00
Aevann b3f75b9beb always use author_name even if its not needed for consistency 2023-03-01 21:28:10 +02:00
Aevann 1769c762b0 support multiline award notes 2023-02-27 20:17:33 +02:00
Aevann 17bb6dad48 blackjack fix exploit 2023-02-27 07:33:45 +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 03a82a0d4f delete code irrelevant now 2023-02-23 15:04:33 +02:00
Aevann cb9ffefb7f rename /shop to /shop/awards and /hats to /shop/hats 2023-02-19 11:34:10 +02:00
Aevann 1754eeffe2 add a link to the post/comment in the grass ban reason 2023-02-19 00:44:16 +02:00
Aevann 5d0c3742b0 change the grass award message to be clearer 2023-02-19 00:43:51 +02:00
Aevann 95938ee3ec make sure all comment links have #context 2023-02-07 04:34:11 +02:00
Aevann 349fa17836 use exlamation marks instead of dots in responses to users 2023-01-27 13:57:29 +02:00
Aevann dc16683e18 use a set instead :marseyautism: 2023-01-25 07:03:30 +02:00
Aevann 569d76ab38 respect the dead 2023-01-25 07:02:57 +02:00
Aevann 24edb49f3b add jl5 (for me) 2023-01-22 10:04:49 +02:00
Aevann a40dee5bd8 improve user ratelimiting 2023-01-21 06:39:46 +02:00
Aevann 044664a25e get rid of useless tabs and spaces 2023-01-01 13:36:20 +02:00
Aevann 8df7c59649 fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3333157#context 2023-01-01 11:02:39 +02:00
Aevann db6db63836 change event structure 2023-01-01 07:33:09 +02:00
Aevann 03fb84e618 fix HOLIDAY_EVENT check 2023-01-01 04:50:11 +02:00
Aevann 78351abc4c clean up legacy stuff 2023-01-01 03:17:07 +02:00
Aevann 8ee189022b seething hatred 2022-12-30 21:01:47 +02:00
Aevann c4872ecb07 Revert "attempt to fix ratelimiting user" 
This reverts commit 99597fc36c.
 2022-12-30 20:43:13 +02:00
Aevann 99597fc36c attempt to fix ratelimiting user 2022-12-30 20:40:58 +02:00
Aevann 9a8c986f93 attempt to fix ratelimiting user 2022-12-30 20:33:07 +02:00
Aevann 909e3f5f29 use a cool flask feature i didnt know about 2022-12-29 12:39:10 +02:00
Aevann 54b49d374c minor fix 2022-12-27 07:37:21 +02:00
Aevann d607e57c92 fixes 2022-12-27 06:24:25 +02:00
Aevann fc95e3741f fix this https://stupidpol.site/h/meta/post/134631/im-too-lazy-to-test-so/3311192#context 2022-12-27 06:08:45 +02:00
Aevann 0299a287ed Revert "remove #context in links" 
This reverts commit 169dc4ebef.
 2022-12-24 21:19:47 +02:00
Aevann a63b02470d use sets with in statements 2022-12-24 00:22:41 +02:00
Aevann 2ad04d472c stack benefactor awards 2022-12-23 02:44:52 +02:00