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

889 Commits (47f89bdfcbc0c311c5c24d9062a0754826f90d8d)

Author SHA1 Message Date
Aevann 883c96a830 fix 500 erro 2023-06-24 21:54:36 +03:00
Aevann dce087fed0 allow emojis in link text 2023-06-24 19:03:07 +03:00
Aevann bc0763591e fix this https://rdrama.net/post/175307/pol-ugandans-are-officially-based-white/4269362#context 2023-06-24 17:25:05 +03:00
Aevann 972970ecea allow <small> tag 2023-06-24 11:15:30 +03:00
Aevann 9d6a34e8a7 fix queen replacements 2023-06-23 17:43:09 +03:00
Aevann d9bed378a9 complement 32fa466e6a 2023-06-23 16:46:42 +03:00
Aevann e607c39d67 make chud effects not retroactive 2023-06-23 16:14:23 +03:00
Aevann 31748db667 rename Agendaposter to Chud 2023-06-23 16:06:45 +03:00
Aevann a15d5eabef rename "agendaposter" to "chud" 2023-06-23 14:07:47 +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 753a1cd585 fix queen (#155) 
Co-authored-by: Chuck Sneed <sneed@formerlychucks.net>
Reviewed-on: rDrama/rDrama#155
Co-authored-by: HeyMoon <heymoon@noreply.fsdfsd.net>
Co-committed-by: HeyMoon <heymoon@noreply.fsdfsd.net>
 2023-06-21 15:28:15 +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 7792f1c42d allow text-center for (((🐟))) 2023-06-16 00:18:07 +03:00
Aevann 832ba29d99 do this https://rdrama.net/post/176924/oh-my-gosh-you-guys-were/4308538#context 2023-06-08 08:22:27 +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 3a3615d292 <span> doesnt have an alt attribute 2023-06-08 00:12:47 +03:00
Aevann 7e260a8740 stop using 200w since it makes reading text in gifs impossible unless u expand 2023-06-07 22:47:14 +03:00
Aevann cf6b67d528 fix emojis in polls 2023-06-07 08:29:43 +03:00
Aevann 27330e1d62 restore IGNORE_DOMAIN_BAN janny perm 2023-06-02 16:48:58 +03:00
Aevann 7f565f5457 dedup removing cuniform 2023-05-20 14:09:40 +03:00
Aevann beeb3dba94 rename type to kind in execute_blackjack 2023-05-14 23:48:38 +03:00
Aevann ada7c713ab use "post" instead of "submission" for consistency 2023-05-14 23:38:09 +03:00
Aevann beb8adcda5 use 'report' instead of 'flag' 2023-05-14 23:36:05 +03:00
Aevann 8df3135ad0 disallow 2 possible bypasses i thought of on bed 2023-05-14 19:45:58 +03:00
Aevann d60f8662d0 move domain in sanitize() 2023-05-14 02:03:34 +03:00
Aevann 864f770762 add namelock award 2023-05-13 07:53:14 +03:00
Aevann fb4f02a80b fix links linkfied by linkfyfilter getting undone by my code 2023-05-13 06:55:07 +03:00
Aevann 8b852f1bc7 instead of error message when posting a banned domain, unlinkify instead 2023-05-13 05:53:51 +03:00
Aevann 6eff7abe49 replace "bots" with "BOT_IDs" 2023-05-13 01:29:34 +03:00
Aevann 32772ce1e9 fix this https://rdrama.net/@TheDunceonMaster/wall/comment/4142982#context 2023-05-12 22:30:47 +03:00
Aevann 7c334ceab7 remove IGNORE_DOMAIN_BAN perm 2023-05-12 22:21:50 +03:00
Aevann 5dc113fc4d fix 500 error 2023-05-12 22:16:08 +03:00
Aevann 09fd7a1bf7 1. unify all link processing logic in one place 
2. fix this https://rdrama.net/post/168836/texas-shooter-identified-as-mauricio-garcia/4113391#context
3. fix this https://rdrama.net/post/168836/texas-shooter-identified-as-mauricio-garcia/4142945#context
 2023-05-12 22:12:02 +03:00
Aevann 592b4374a6 add IGNORE_DOMAIN_BAN 2023-05-07 21:06:08 +03:00
Aevann 2d88c54209 add GROOMING janny perm 2023-05-07 20:39:30 +03:00
Aevann b34b757038 fix this https://rdrama.net/post/167983/what-happened-to-jon-stewart-gets/4096939#context 2023-05-05 03:23:54 +03:00
Aevann 00dc7e66de patch exploit that allowed u to post banned domains 2023-05-05 03:17:57 +03:00
Aevann 6a7fc72e7c disable browser-killing exploit 2023-05-05 03:07:25 +03:00
Aevann 136a12f126 tlds should be lowercase always - fixes issue with ppl forgetting space after dot while typing posts or comments 2023-05-03 21:06:25 +03:00
Aevann fbd155e3c1 always shadow 2023-05-03 18:38:45 +03:00
Aevann 0cf1ac4831 fix 500 error 2023-05-03 17:12:12 +03:00
Aevann 41328cb5fc fix this https://rdrama.net/h/vampire/post/166279/this-is-mavis/4056251#context 2023-04-27 20:06:44 +02:00
Aevann f1340d6dab fix using emojis in polls while chudded 2023-04-27 16:12:56 +02:00
Aevann b3988eb3ee fix 500 error 2023-04-25 18:27:00 +02:00
Aevann e464d98580 make the pings that dont notify (due to blocks) not linked again 2023-04-25 13:27:44 +02:00
Aevann 002351a4e3 Revert "make the "https://" optional to embed a youtube video (I rly hope i dont regret this)" 
This reverts commit 5ad46f3e53.
 2023-04-25 10:01:51 +02:00
Aevann 5ad46f3e53 make the "https://" optional to embed a youtube video (I rly hope i dont regret this) 2023-04-25 09:35:01 +02:00
Aevann b6d4ecfb40 fix repeated group pings 2023-04-25 08:59:20 +02:00
Aevann 48db6eb43d add .markets to supported tlds 2023-04-24 10:20:24 +02:00
Aevann 91230a2322 add .goog to supported tlds 2023-04-24 10:18:55 +02:00
Aevann 68cd260440 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3909706#context 2023-04-24 09:31:51 +02:00
Aevann aba2820dcc fix internal server error for chudded ppl whose name starts with a number (like 911roofer) bc of invalid regex group reference (lol) 2023-04-24 08:58:31 +02:00
Aevann ca09b729b7 add line break 2023-04-23 15:15:29 +02:00
Aevann 363f1f315d minor improvement 2023-03-26 14:57:25 +02:00
Aevann ed7baccb5c minor fix 2023-03-26 14:28:32 +02:00
Aevann 5c32c8215e minor fix 2023-03-26 14:27:40 +02:00
Aevann 351e0ead9e remove unnecessary garbage 2023-03-26 00:48:04 +02:00
Aevann 21e0fa0bc6 fix "I stand with israel" and "I say this as a feminist ally" again lol 2023-03-26 00:18:23 +02:00
Aevann 5c3ba375ba move if condition 2023-03-25 21:04:20 +02:00
Aevann 1335b48ac6 allow more tags to have agendaposter_phrase 2023-03-25 20:49:35 +02:00
Aevann a3f555c23a fix 500 error 2023-03-25 20:32:31 +02:00
Aevann ba28e84138 refactor torturing and also replace "my" and "mine" 2023-03-25 20:18:48 +02:00
Aevann d871e6c9f8 allow chud phrase in header tags 2023-03-25 00:45:31 +02:00
Aevann 275eef858f remove leftover print statement 2023-03-24 14:30:32 +02:00
Aevann 019253e6db use css for chud images instead 2023-03-24 14:29:19 +02:00
Aevann 3ee1851fa6 fix this https://rdrama.net/h/changelog/post/157290/rdramanet-is-proud-to-welcome-the/3852530#context 2023-03-24 13:43:18 +02:00
Aevann 792bc34d77 fix this https://rdrama.net/h/changelog/post/157290/rdramanet-is-proud-to-welcome-the/3852376#context 2023-03-24 13:31:12 +02:00
Aevann 2805fd2d14 print-debug weird 500 error 2023-03-23 22:19:29 +02:00
Aevann 7eee498070 fix bug where including the agendaposter phrase in the title exempted u from torture_ap 2023-03-23 21:03:02 +02:00
Aevann 21c5b7cc1c remove unnecessary line 2023-03-23 20:20:01 +02:00
Aevann e163c2f5d0 fix chud exploit 2023-03-23 18:38:42 +02:00
Aevann 2b7d122fd8 fix last commit 2023-03-23 17:41:57 +02:00
Aevann f5e507f795 fix 2 chud phrases 2023-03-23 17:36:28 +02:00
Aevann 2e6acd4cc5 check chud phrase in post title too 2023-03-23 14:52:12 +02:00
Aevann 4f788cb909 dedup chud-checking logic 2023-03-23 14:50:01 +02:00
Aevann 51e8122b19 quick fix to complies_with_chud 2023-03-23 11:30:25 +02:00
Aevann f78cd322d1 much better chud award logic 2023-03-22 23:39:25 +02:00
Aevann ec9d6b5d68 add :#chudjaktalking: to chud_images 2023-03-22 18:49:48 +02:00
Aevann 50680e0fa8 cut down on chud award evasion 2023-03-21 23:33:43 +02:00
Aevann 65542b5fac dont strip poll options 2023-03-19 19:53:33 +02:00
Aevann df1ebf7cad use SITE_FULL_IMAGES in more places 2023-03-19 18:30:22 +02:00
Aevann 4d46268ad5 count non-marsey emojis too (to be used for emoji picker prioritization) 2023-03-19 10:33:04 +02:00
Aevann dd54413cf3 convert marsey submission form to include all emojis 2023-03-18 15:34:04 +02:00
Aevann 0ef1a9c856 fix overflow bug 2023-03-16 12:24:20 +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 da19ef96d1 fix images again 2023-03-15 04:46:54 +02:00
Aevann 096fb962f1 remove notify_jannies_of_grooming 2023-03-15 04:20:56 +02:00
Aevann 4644e62c99 fix last commit 2023-03-14 10:11:45 +02:00
Aevann 74e7464f54 fix image links getting broken 2023-03-14 10:08:50 +02:00
Aevann 6583ee9b91 stop image_regex from eating spaes after image 2023-03-14 09:09:25 +02:00
Aevann 08ae593de1 fix this https://stupidpol.site/post/154579/betting-badge-opportunity-are-you-a/3782163#context 2023-03-13 20:33:19 +02:00
Aevann 95dc636aa0 add .party to supported tlds 2023-03-13 07:29:50 +02:00
Aevann 325a8996d8 fix youtube timestamp edge case 2023-03-12 21:07:23 +02:00
Aevann 96457e4998 fix pinging 2023-03-12 16:54:03 +02:00
Aevann 835c5f810d use .img class 2023-03-12 15:13:28 +02:00
Aevann 97608ea0a9 test getting rid of ![]( on devrama 2023-03-12 15:02:31 +02:00
Aevann 9fd6ca1816 fix snappy quote 2023-03-12 11:30:22 +02:00
Aevann 0f62958024 minor fix 2023-03-12 10:31:17 +02:00
Aevann 257a38548a include "css" in error 2023-03-11 23:55:40 +02:00
Aevann ccf6ccd468 same as last commit 2023-03-11 11:50:29 +02:00
Aevann 83550c33bd fix last commit 2023-03-11 09:36:41 +02:00
Aevann 3a0cc36679 exclude me from showmore 2023-03-11 01:49:46 +02:00
Aevann ba22df33df fix showmore 2023-03-11 01:30:42 +02:00
Aevann af620ac05e make linking to link groups case insensitive 2023-03-10 23:49:03 +02:00
Aevann 60d0ff395c fix this https://stupidpol.site/h/foid/post/153435/good-morning-foid-comedian-marseyclown-says/3753551#context 2023-03-10 02:04:13 +02:00
Aevann ad463de015 fix unimported push_notif 2023-03-10 00:32:31 +02:00
Aevann 5a0f7e540d make group names case-insensetive 2023-03-07 20:55:17 +02:00
Aevann c94dd20af0 dont link to groups that dont exist 2023-03-03 23:21:04 +02:00
Aevann bffd125cde fix this https://stupidpol.site/h/chudrama/post/151341/-/3700282#context 2023-03-02 22:33:11 +02:00
Aevann 4a52246111 add !everyone 2023-03-01 07:32:19 +02:00
Aevann 55c8a51a1d make it possible to position poll options 2023-03-01 00:09:16 +02:00
Aevann 24c298f329 do this https://stupidpol.site/h/countryclub/post/79285/-/3681172#context 2023-02-28 21:36:14 +02:00
Aevann 686f88e9cf css solution to the height spam question 2023-02-26 13:08:52 +02:00
Aevann 08dbc35f34 revert it cuz i lost interest and will opt for a css solution instead 2023-02-26 12:54:41 +02:00
Aevann 1beb1bba21 do the shit I asked @everyone to do 2023-02-26 12:54:17 +02:00
Aevann 28ed629647 add comment 2023-02-26 12:36:53 +02:00
Aevann 95e824f308 fix this https://stupidpol.site/post/150139/2-million-subscriber-youtuber-gets-rape/3665865#context 2023-02-26 12:22:00 +02:00
Aevann 7ec3d1c5f2 fix this https://stupidpol.site/post/150202/its-here-downvoters-stoningdownvotes/3668279#context 2023-02-26 00:18:43 +02:00
Aevann d020b99359 link to ping groups 2023-02-26 00:06:49 +02:00
Aevann bc091de92d add another \n before chud images 2023-02-25 18:01:54 +02:00
Aevann ae26306846 Revert "improve the showmore algo" 
This reverts commit 9529cbbd61.
 2023-02-24 09:29:46 +02:00
Aevann 22051152de fix 500 error 2023-02-24 05:00:22 +02:00
Aevann e37031c4dd make sure g.db.flush() is always above _push_notif_thread 2023-02-24 04:36:25 +02:00
Aevann 5a511c00a8 include username in push notifs 2023-02-24 04:22:47 +02:00
Aevann 655159fbf3 add push notifs for blackjack 2023-02-24 04:11:16 +02:00
Aevann 760b2e6a4d add push notifs for repeatable notifications 2023-02-24 04:09:49 +02:00
Aevann 9529cbbd61 improve the showmore algo 2023-02-24 03:24:50 +02:00
Aevann a42729329f fix this https://stupidpol.site/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/3645817#context 2023-02-24 02:46:39 +02:00
Aevann 19482f4205 Revert "fix this https://stupidpol.site/post/149214/food-wars-ii-marseychingchong-strikes-back/3642965#context" 
This reverts commit afd6949998.
 2023-02-24 01:38:00 +02:00
Aevann afd6949998 fix this https://stupidpol.site/post/149214/food-wars-ii-marseychingchong-strikes-back/3642965#context 2023-02-22 19:38:17 +02:00
Aevann f1a3f365b5 actually disable comments in css 2023-02-18 22:00:39 +02:00
Aevann cd2d36e8ef disallow comments in css 2023-02-18 21:49:11 +02:00
Aevann 7d926e56c9 keep twitter params for search 2023-02-17 20:27:41 +02:00
Aevann 44e9085d8d add .network to supported TLDs 2023-02-17 16:57:58 +02:00
Aevann 6ec1200611 fix roulette 2023-02-08 04:34:44 +02:00
Aevann 37bc8adf1b fix chat 2023-02-08 04:14:54 +02:00
Aevann 88814ee208 expand blackjack 2023-02-07 05:31:49 +02:00
Aevann de3efef761 fix this https://stupidpol.site/post/145206/larry-feinberg-cancelled-seinfeld-ai-banned/3546391#context 2023-02-07 03:12:14 +02:00
Aevann 59ee320584 remove underscore_in_link_regex 2023-02-02 18:53:35 +02:00
official-techsupport 08571dece1 add 'blog' tld (#108) 
https://scottaaronson.blog/ is a thing, for example. We must support the thing.

Add .blog as an approved TLD.

Co-authored-by: official-techsupport <official_techsupport@protonmail.com>
Reviewed-on: rDrama/rDrama#108
Co-authored-by: official-techsupport <official-techsupport@noreply.fsdfsd.net>
Co-committed-by: official-techsupport <official-techsupport@noreply.fsdfsd.net>
 2023-02-01 23:20:08 +00:00
Aevann 4ea5dd6d54 disable numbered lists 2023-02-01 17:59:10 +02:00
Aevann 1b786f7be7 fix 500 error 2023-01-28 12:42:45 +02:00
Aevann 1e30acc5a8 make all images have loading="lazy" 2023-01-27 19:55:25 +02:00
Aevann df132627e6 fix underscores inside links 2023-01-27 11:11:13 +02:00
Aevann 83b22560eb dont use abort in chat 2023-01-27 09:07:58 +02:00
Aevann dd1dfc7b77 add .cooking to tlds 2023-01-25 17:49:14 +02:00
Aevann 2a0e288e12 remove twitter tracking 2023-01-25 15:54:58 +02:00
Aevann b31405c23d rename handle_youtube to handle_youtube_links 2023-01-25 13:17:12 +02:00