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

1041 Commits (ee3b1a5e06b316b43446fa9acfec0c780cc8bce9)

Author SHA1 Message Date
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 92a3b1ddd5 allow permachud-cels into countryclub again 2023-09-20 18:27:44 +03:00
Aevann e33e0558f5 show referred_users in /settings/personal 2023-09-15 18:20:04 +03:00
Aevann 8b0daa3aa2 fix this post not being in my notifications even tho i follow /h/slackernews https://rdrama.net/h/slackernews/post/204394/smartest-marseytrain2-lizfongjones-admits-to-tortious 2023-09-15 01:26:47 +03:00
Aevann 6218c00aa9 silence annoying errors 2023-09-11 22:26:16 +03:00
Aevann 9ee45b4a24 remove unnecessary spaces and tabs 2023-09-07 18:26:31 +03:00
Aevann e6883ba613 add /@<username>/muters and /@<username>/muting 2023-09-07 12:35:06 +03:00
Aevann 6662eb0606 do this https://rdrama.net/h/countryclub/post/79285/-/4899909#context 2023-09-06 21:02:47 +03:00
Aevann f6c7fd87a5 remove now-unneeded function 2023-08-31 16:23:34 +03:00
Aevann d6cbbc05c6 simplar syntax 2023-08-31 13:46:07 +03:00
Aevann df45eb3c57 rename some perms 2023-08-31 13:38:01 +03:00
Aevann 7ce4e34453 user PERMS whenever u can 2023-08-31 13:31:04 +03:00
Aevann e3805aa465 simpler syntax 2023-08-30 13:43:47 +03:00
Aevann 1afb393f98 NZ geoblock 2023-08-30 06:51:28 +03:00
Aevann 8af12ad2c9 make CC and chat threshold the same for movie night purposes 2023-08-26 00:00:53 +03:00
Aevann 81e8d09cd1 grammar 2023-08-20 05:14:32 +03:00
Aevann 31140bdefb allow ppl to see linked comments of ppl they block instead of getting a 403 https://rdrama.net/h/changelog/post/165657/changelog-megathread-marseynotes/4791944#context 2023-08-16 00:09:37 +03:00
Aevann 2c19f5922c allow comment editing by JL5 2023-08-15 23:22:49 +03:00
Aevann 1257cb8fce remove verified email bypass in chat on g-tix's request 2023-08-14 15:35:01 +03:00
Aevann bc6eb57553 allow patrons in chat always 2023-08-13 22:12:21 +03:00
Aevann 414bd30fd7 allow verified-email-cels into chat 2023-08-13 18:13:09 +03:00
Aevann 166f6fb4ee fix 500 error caused by 3ec2038caf 2023-08-11 16:31:09 +03:00
Aevann 45be4132ce remove fish award 2023-08-11 16:18:13 +03:00
Aevann 3ec2038caf same as last commit 2023-08-11 16:15:34 +03:00
Aevann fb0aed8e2b do this https://rdrama.net/h/countryclub/post/79285/-/4758207#context 2023-08-11 15:43:58 +03:00
Aevann a4a753ba6a fix restricted holes bug 2023-08-10 18:29:24 +03:00
Aevann 481f1e3898 same as last commit 2023-08-10 15:25:40 +03:00
Aevann a7a0bf325e hardcode sperg 2023-08-10 15:24:27 +03:00
Aevann 132056d61b exempt autist from earning coins 2023-08-09 21:45:25 +03:00
Aevann 6e02ea8abb add this https://rdrama.net/h/countryclub/post/79285/-/4744088#context 2023-08-08 21:08:29 +03:00
Aevann 67f968d04d show who exiled the user in the icon 2023-08-08 20:01:58 +03:00
Aevann eff23b299e add carp making badges to badge_ordering_tuple 2023-08-06 10:37:44 +03:00
Aevann 7102dd515b minor syntax change 2023-08-04 13:18:34 +03:00
top f36ed94e69 Talking emotes! (#176) 
Also adds the following:
talking emotes:
- Any emote can be talking now
- If an emote is talking it can also be pettable
- users can be talking and pettable
- talking works both directions, large and small

Co-authored-by: Chuck <dude@bussy.com>
Reviewed-on: rDrama/rDrama#176
Co-authored-by: top <top@noreply.fsdfsd.net>
Co-committed-by: top <top@noreply.fsdfsd.net>
 2023-08-04 10:13:36 +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 59d78141c4 addendum to last commit 2023-08-03 23:47:38 +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 144d7a31be rename is_activated to email_verified 2023-08-03 11:02:31 +03:00
Aevann 80439008fe order "moderator of" alphabetically 2023-08-03 09:30:19 +03:00
Aevann 9a527df75d add lifetimedonated_visible 2023-08-03 07:57:09 +03:00
Aevann ffe1faa8cd remove [patrons] and [paypigs] since i can just use /h/highrollerclub now 2023-08-02 01:08:29 +03:00
Aevann bd942fe12e remove useless tabs 2023-08-01 10:38:58 +03:00
Aevann 69ec9dab2f fix top 10 patrons badge 2023-08-01 10:16:47 +03:00
Aevann 0900277226 add !verifiedrich and /h/highrollerclub for paypigs 2023-08-01 09:46:00 +03:00
Aevann 10d138db5d fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4691321#context 2023-08-01 02:12:42 +03:00
Aevann bb6d38b3e7 order group memberships by group name 2023-07-30 12:46:18 +03:00
Aevann 8beb2d7e8e remove typing (useless code bloat) 2023-07-30 03:42:06 +03:00
Aevann d62b72ff31 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4643523#context 2023-07-27 03:35:31 +03:00
Aevann 927fb5c046 change section to div 2023-07-22 22:34:07 +03:00
Aevann 6a19105bdc do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4541135#context 2023-07-22 20:30:55 +03:00
Aevann 988a14f187 use SITE_FULL_IMAGES whenever u possibly can 2023-07-22 19:24:16 +03:00
Aevann e8b28dc3b3 reduce CC minimum from 100 TS to 0 2023-07-20 16:47:36 +03:00
Aevann 7fef1ffab5 make pizzashill able to award carp 2023-07-17 20:22:24 +03:00
Aevann 2b9647a37e try random bullshit to fix timeouts 2023-07-17 17:49:26 +03:00
Aevann 71c543c623 rename variable 2023-07-12 05:39:01 +03:00
Aevann 3d7c97214f remove the flush from pay_account 2023-07-10 15:33:45 +03:00
Aevann 499781329f remove event_darkmode 2023-07-03 01:55:56 +03:00
Aevann 25b9a0f535 stop usage of .update 2023-07-03 00:42:34 +03:00
Aevann 9d2f855b8e remove wpd special condition 2023-07-02 23:03:31 +03:00
Aevann fb153e9a14 when u visit someone's profile, see who chudded them 2023-07-02 20:40:39 +03:00
Aevann eed7410277 make spam bans generate modlog items + dedup 2023-07-01 18:27:56 +03:00
Aevann 30b46195ea don't show me comments from ppl i blocked 2023-06-30 19:02:08 +03:00
Aevann 6a59517efa do this https://rdrama.net/h/changelog/post/165657/changelog-megathread-marseynotes/4430937#context 2023-06-30 01:40:36 +03:00
Aevann 4692b558f1 show number of blockers and blockees in profiles 2023-06-30 00:04:59 +03:00
Aevann d417fe14f0 rename property 2023-06-29 23:52:07 +03:00
Aevann eeb975b177 cachebust everything 2023-06-29 23:14:30 +03:00
Aevann 348f16266f remove carprama 2023-06-29 23:14:24 +03:00
Aevann 778f4f045e rename variable 2023-06-29 23:10:31 +03:00
Aevann 8b5cda26bb carp pfps 2023-06-28 17:18:43 +03:00
Aevann 774c09387c make sure everyone is aware that they're a carp alt 2023-06-28 16:52:59 +03:00
Aevann 5abff86636 order badges in json 2023-06-28 16:13:22 +03:00
Aevann 60b5b33a79 Revert "remove poor mode" 
This reverts commit 33d281cc2e.
 2023-06-27 15:01:40 +03:00
Aevann aacffe0d1c Revert commit that caused disappearing currency 
This reverts commit 06288f1c3e.
 2023-06-26 18:16:33 +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 33d281cc2e remove poor mode 2023-06-26 13:55:38 +03:00
Aevann 5308d5ca70 fix this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4429297#context 2023-06-24 20:51:17 +03:00
Aevann 7cac2c19a1 do this https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/4378619#context 2023-06-24 20:16:24 +03:00
Aevann f88d65b003 add original usernames to popover 2023-06-23 20:12:51 +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
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 3ec950e3f5 add GLOBAL2 2023-06-20 11:36:25 +03:00
Aevann fb42139f8c fix bec99392fe 2023-06-08 04:27:12 +03:00
Aevann d8bfc0a0a9 dont pass db session as an argument unless necessary 2023-06-08 03:49:37 +03:00
Aevann 32fa466e6a rename submissions to posts 2023-06-08 02:26:32 +03:00
Aevann 07dc5c5c5d Casino winnigs: None -> Casino winnigs: 0 2023-06-07 23:05:57 +03:00
Aevann 06288f1c3e eliminate unnecessary db locks now that 1-second ratelimiting is universal (they cause timeouts sometimes) 2023-06-07 06:51:59 +03:00
Aevann bec99392fe hide christchurch posts in New Zealand 2023-05-27 02:29:34 +03:00
Aevann ca7db123b2 remove "at least" 2023-05-15 01:35:24 +03:00
Aevann 7251442a9d fix 500 error 2023-05-15 01:28:40 +03:00
Aevann 460a9a686a show tier name in tooltip + standardize patron constants 2023-05-15 01:17:22 +03:00
Aevann 4e86e20a5a allow [patrons] 2023-05-14 19:57:25 +03:00
Aevann 37127c83f1 fix improper % placement 2023-05-14 18:59:30 +03:00
Aevann a0063bf6e7 show award discount on profiles and /shop/awards 2023-05-14 03:01:00 +03:00
Aevann 864f770762 add namelock award 2023-05-13 07:53:14 +03:00
Aevann 50b23a064a move award timers to cron 2023-05-13 05:00:54 +03:00
Aevann 3c4c52dab4 fix G badge 2023-05-13 03:05:26 +03:00
Aevann 710f3ce5ee order more badges 2023-05-13 01:12:08 +03:00
Aevann f6708e8a1c put paypig badges before total contribution badges 2023-05-13 00:42:38 +03:00
Aevann f3a3be1ef2 add lifetime_donated badges 2023-05-13 00:04:26 +03:00
Aevann c8d6872761 rename function 2023-05-11 17:03:51 +03:00
Aevann e3f58e3e78 add lifetime donated column 2023-05-11 16:57:53 +03:00
Aevann 42f8b12ba1 give notif when someone gets their birthday badge 2023-05-10 00:48:19 +03:00
Aevann 2b04a09c03 do this https://rdrama.net/post/168554/proof-that-tradcaths-are-just-gay/4106019#context 2023-05-07 22:03:29 +03:00
Aevann 9c5015d662 im retarded 2023-05-07 20:28:35 +03:00
Aevann c8079e1d9d same as last commit 2023-05-07 20:25:42 +03:00
Aevann a4d1fb411f fix 2year badge 2023-05-07 20:22:40 +03:00
Aevann 8cb34f1d91 exempt @arts on WPD from gaining coins 2023-05-05 01:59:20 +03:00
Aevann 9c64b891e5 revise my exceptions 2023-05-04 19:24:40 +03:00
Aevann aa5c4297e0 better stats 2023-05-04 02:50:56 +03:00
Aevann 4f76e18f9c more shop consistency 2023-05-03 20:26:44 +03:00
Aevann f5a97ae709 add new patron tier for benefactor-cels 2023-05-03 18:29:31 +03:00
Aevann 58108558d0 more accurate patron descriptions 2023-05-02 19:13:29 +03:00
Aevann 018a02568a add #TODO 2023-04-27 17:30:25 +02:00
Aevann 93422e2be9 cache-bust all 2023-04-25 18:24:12 +02:00
Aevann a37fca393d combined buy button for awards and hats 2023-04-24 17:08:40 +02:00
Aevann a34fc92e97 show mbux in popover 2023-04-24 15:39:25 +02:00
Aevann 4b8e7997c5 Revert "print debug on staging.rdrama.net" 
This reverts commit fff0b9c0c5.
 2023-03-26 01:31:24 +02:00
Aevann fff0b9c0c5 print debug on staging.rdrama.net 2023-03-25 22:43:28 +02:00
Aevann da3456ba9d add agendaposter phrase to user json 2023-03-23 20:28:54 +02:00
Aevann f78cd322d1 much better chud award logic 2023-03-22 23:39:25 +02:00
Aevann a4de71456b fix this https://rdrama.net/post/157037/i-kinda-enjoy-seeing-people-freak/3843351#context 2023-03-22 23:10:43 +02:00
Aevann 40b73fe048 very minor dedup 2023-03-22 00:12:32 +02:00
Aevann 50680e0fa8 cut down on chud award evasion 2023-03-21 23:33:43 +02:00
Aevann a5d7cc63ed cachebust all assets 2023-03-21 15:58:14 +02:00
Aevann b004617695 customizable chud phrases 2023-03-19 19:13:45 +02:00
Aevann df1ebf7cad use SITE_FULL_IMAGES in more places 2023-03-19 18:30:22 +02:00
Aevann 9cea919e98 dont force tempchuds to see chudrama on their feed 2023-03-19 10:34:54 +02:00
Aevann 62fcaec40d fix muted users not notifying the person they reply to 2023-03-19 10:30:03 +02:00
Aevann 20eef6e063 unify chudrama and CC's logic 2023-03-19 10:30:03 +02:00
Aevann 57765f0776 revert sqlalchemy changes 2023-03-16 08:27:58 +02:00
Aevann f05dbd1ce7 remove EventUser class 2023-03-16 08:18:16 +02:00
Aevann a392fbb86d restore autoflush 2023-03-16 06:21:57 +02:00
Aevann 9f44a3f9fb add db.flush() in has_badge 2023-03-15 08:08:57 +02:00
Aevann 1e832b0027 Revert "remove hidevotedon" 
This reverts commit d8cf302a43.
 2023-03-15 08:03:11 +02:00
Aevann fe2f1293f1 more fixes 2023-03-15 07:13:58 +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 729b095713 remove /h/masterbaiters 2023-03-13 20:53:08 +02:00
Aevann ccf6ccd468 same as last commit 2023-03-11 11:50:29 +02:00
Aevann e1252803aa decrease DEFAULT_ADMIN_LEVEL 2023-03-11 11:30:24 +02:00
Aevann 14a2664534 fix last commit 2023-03-11 09:14:13 +02:00
Aevann 397ab186f6 hide a bunch of user customization on shadowbanned profiles 2023-03-11 09:11:58 +02:00
Aevann 9cf396c106 remove leftover print statement 2023-03-10 04:15:14 +02:00
Aevann 6d3d15f097 fix 2 year badge 2023-03-10 02:12:29 +02:00
Aevann ef8b7de749 add logic for 2 year badge 2023-03-10 00:40:42 +02:00