Compare commits

...

2 Commits

Author SHA1 Message Date
Aevann efe57118c1 Revert "replace clitpeeler with gtix"
This reverts commit 195de67dba.
2024-04-26 02:01:12 +03:00
Aevann 01101ae886 restore autofollow for carp 2024-04-26 02:00:27 +03:00
2 changed files with 13 additions and 4 deletions

View File

@ -582,6 +582,7 @@ CARP_ID = 0
AEVANN_ID = 0
GTIX_ID = 0
SIGNUP_FOLLOW_ID = 0
CURRENCY_TRANSFER_ID = 5
IMMUNE_TO_NEGATIVE_AWARDS = {}
@ -740,7 +741,7 @@ elif SITE in {'watchpeopledie.tv', 'marsey.world'}:
DESCRIPTION = "People die and this is the place to see it. You only have one life, don't make the mistakes seen here."
PIN_LIMIT = 4
WELCOME_MSG = """Hi, you! Welcome to WatchPeopleDie.tv, this really cool site where you can go to watch people die. I'm @G-tix! If you have any questions about how things work here, or suggestions on how to make them work better than they already do, definitely slide on into my DMs (fat chicks only šŸ„µ).\n\nThere's an enormously robust suite of fun features we have here and we're always looking for more to add. Way, way too many to go over in an automated welcome message. And you're probably here for the videos of people dying more than any sort of weird, paradoxical digital community aspect anyway, so I won't bore you with a tedious overview of them. Just head on over to [your settings page](/settings/personal) and have a look at some of the basic profile stuff, at least. You can change your profile picture, username, flair, colors, banners, bio, profile anthem (autoplaying song on your page, like it's MySpace or some shit, hell yeah), CSS, all sorts of things.\n\nOr you can just go back to the main feed and carry on with watching people die. That's what the site is for, after all. Have fun!\n\nAnyway, in closing, WPD is entirely open source. We don't really need new full-time coders or anything, but if you'd like to take a look at our repo - or even submit a PR to change, fix, or add some things - go right ahead! Our codebase lives at https://fsdfsd.net/rDrama/rDrama\n\nWell, that's all. Thanks again for signing up. It's an automated message and all, but I really do mean that. Thank you, specifically. I love you. Romantically. Deeply. Passionately.\n\nHave fun!\n\nNote: There's more info about the site and how to use it here: https://watchpeopledie.tv/post/122529"""
WELCOME_MSG = """Hi, you! Welcome to WatchPeopleDie.tv, this really cool site where you can go to watch people die. I'm @CLiTPEELER! If you have any questions about how things work here, or suggestions on how to make them work better than they already do, definitely slide on into my DMs (no fat chicks).\n\nThere's an enormously robust suite of fun features we have here and we're always looking for more to add. Way, way too many to go over in an automated welcome message. And you're probably here for the videos of people dying more than any sort of weird, paradoxical digital community aspect anyway, so I won't bore you with a tedious overview of them. Just head on over to [your settings page](/settings/profile) and have a look at some of the basic profile stuff, at least. You can change your profile picture, username, flair, colors, banners, bio, profile anthem (autoplaying song on your page, like it's MySpace or some shit, hell yeah), CSS, all sorts of things.\n\nOr you can just go back to the main feed and carry on with watching people die. That's what the site is for, after all. Have fun!\n\nAnyway, in closing, WPD is entirely open source. We don't really need new full-time coders or anything, but if you'd like to take a look at our repo - or even submit a PR to change, fix, or add some things - go right ahead! Our codebase lives at https://fsdfsd.net/rDrama/rDrama\n\nWell, that's all. Thanks again for signing up. It's an automated message and all, but I really do mean that. Thank you, specifically. I love you. Romantically. Deeply. Passionately.\n\nHave fun!"""
FEATURES['PATRON_ICONS'] = True
FEATURES['NSFW_MARKING'] = False
@ -775,7 +776,7 @@ elif SITE in {'watchpeopledie.tv', 'marsey.world'}:
415: "Please upload only Image, Video, or Audio files!",
418: "this really shouldn't happen now that we autoconvert webm files but if it does there's a cool teapot marsey so there's that",
429: "Please wait a bit before doing that.",
500: "Internal Server Error. Something went very wrong when trying to fulfill your request. Try refreshing the page. If it still doesn't work, shoot <a href='/@G-tix'>@G-tix</a> a message.",
500: "Internal Server Error. Something went very wrong when trying to fulfill your request. Try refreshing the page. If it still doesn't work, shoot <a href='/@CLiTPEELER'>@CLiTPEELER</a> a message.",
}
ERROR_MARSEYS[403] = "marseyconfused"
@ -806,7 +807,9 @@ elif SITE in {'watchpeopledie.tv', 'marsey.world'}:
AEVANN_ID = 9
GTIX_ID = 77694
CURRENCY_TRANSFER_ID = 48
SIGNUP_FOLLOW_ID = CARP_ID
CURRENCY_TRANSFER_ID = CARP_ID
ANTISPAM_BYPASS_IDS = {1718156}
TIER_TO_NAME = {

View File

@ -351,7 +351,13 @@ def sign_up_post(v):
check_for_alts(new_user, include_current_session=True)
send_notification(new_user.id, WELCOME_MSG)
if CARP_ID:
if SIGNUP_FOLLOW_ID:
signup_autofollow = get_account(SIGNUP_FOLLOW_ID)
new_follow = Follow(user_id=new_user.id, target_id=signup_autofollow.id)
g.db.add(new_follow)
signup_autofollow.stored_subscriber_count += 1
g.db.add(signup_autofollow)
elif CARP_ID:
send_notification(CARP_ID, f"A new user - @{new_user.username} - has signed up!")
execute_blackjack(new_user, None, new_user.username, 'username')