diff --git a/files/assets/manifest_WPD.json b/files/assets/manifest_WPD.json index 33d26d7db..1bd81a7d3 100644 --- a/files/assets/manifest_WPD.json +++ b/files/assets/manifest_WPD.json @@ -1,8 +1,8 @@ { "name": "WPD", "short_name": "WPD", - "start_url": "https://watchpeopledie.co", + "start_url": "https://watchpeopledie.tv", "display": "standalone", "background_color": "#2A96F3", "description": "WPD" -} \ No newline at end of file +} diff --git a/files/classes/submission.py b/files/classes/submission.py index 90702b80c..27dfdea36 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -260,10 +260,10 @@ class Submission(Base): if "?" in url: url += "&context=9" else: url += "?context=8" if not v or v.controversial: url += "&sort=controversial" - elif url.startswith("https://watchpeopledie.co/videos/"): + elif url.startswith("https://watchpeopledie.tv/videos/"): # Semi-temporary fix for self-hosted unproxied video serving - url = url.replace("https://watchpeopledie.co/videos/", - "https://videos.watchpeopledie.co/", 1) + url = url.replace("https://watchpeopledie.tv/videos/", + "https://videos.watchpeopledie.tv/", 1) return url diff --git a/files/helpers/const.py b/files/helpers/const.py index 44a9c8faf..cb34be0c6 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -462,8 +462,8 @@ elif SITE == 'pcmemes.net': LOTTERY_SINK_RATE = -8 BANNER_THREAD = 28307 -elif SITE == 'watchpeopledie.co': - WELCOME_MSG = """Hi, you! Welcome to WatchPeopleDie.co, 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).\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](https://watchpeopledie.co/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.\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!\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! We are on [GitHub](https://github.com/Aevann1/rDrama).\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.\nHave fun!""" +elif SITE == 'watchpeopledie.tv': + 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).\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](https://watchpeopledie.tv/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.\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!\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! We are on [GitHub](https://github.com/Aevann1/rDrama).\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.\nHave fun!""" FEATURES['PATRON_ICONS'] = True @@ -1125,7 +1125,7 @@ approved_embed_hosts = { SITE, 'rdrama.net', 'pcmemes.net', - 'watchpeopledie.co', + 'watchpeopledie.tv', 'imgur.com', 'lain.la', 'pngfind.com', diff --git a/files/routes/admin.py b/files/routes/admin.py index d0287ebfe..cd05a27a2 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -529,7 +529,7 @@ def badge_grant_post(v): try: badge_id = int(request.values.get("badge_id")) except: abort(400) - if SITE == 'watchpeopledie.co' and badge_id not in {99,101}: + if SITE == 'watchpeopledie.tv' and badge_id not in {99,101}: abort(403) if badge_id in {16,17,21,22,23,24,25,26,27,94,95,96,97,98,109,137,67,68,83,84,87,90,140} and v.id != AEVANN_ID and SITE != 'pcmemes.net': diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 96ff43166..13dc8439b 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -10,7 +10,7 @@ from files.helpers.get import * from files.helpers.wrappers import * from files.routes.static import marsey_list -if SITE not in ('pcmemes.net', 'watchpeopledie.co'): +if SITE not in ('pcmemes.net', 'watchpeopledie.tv'): ASSET_TYPES = (Marsey, HatDef) CAN_APPROVE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID) CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID, GEESE_ID) diff --git a/files/routes/posts.py b/files/routes/posts.py index f3e511687..d0bb09672 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -105,7 +105,7 @@ def publish(pid, v): if post.sub == 'changelog': send_changelog_message(post.permalink) - if SITE == 'watchpeopledie.co': + if SITE == 'watchpeopledie.tv': send_wpd_message(post.permalink) execute_snappy(post, v) @@ -1033,7 +1033,7 @@ def submit_post(v, sub=None): if post.sub == 'changelog' and not post.private: send_changelog_message(post.permalink) - if not post.private and SITE == 'watchpeopledie.co': + if not post.private and SITE == 'watchpeopledie.tv': send_wpd_message(post.permalink) g.db.commit() diff --git a/files/routes/static.py b/files/routes/static.py index ad5f27af2..873267851 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -232,7 +232,7 @@ def submit_contact(v): new_comment.top_comment_id = new_comment.id admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']) - if SITE == 'watchpeopledie.co': + if SITE == 'watchpeopledie.tv': admins = admins.filter(User.id != AEVANN_ID) for admin in admins.all(): diff --git a/files/routes/users.py b/files/routes/users.py index f8b6a39db..8ec450e0c 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -658,7 +658,7 @@ def messagereply(v): if c.top_comment.sentto == 2: admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) - if SITE == 'watchpeopledie.co': + if SITE == 'watchpeopledie.tv': admins = admins.filter(User.id != AEVANN_ID) admins = [x[0] for x in admins.all()] @@ -733,7 +733,7 @@ def redditor_moment_redirect(username, v): @auth_required def followers(username, v): u = get_user(username, v=v, include_shadowbanned=False) - if u.id == CARP_ID and SITE == 'watchpeopledie.co': abort(403) + if u.id == CARP_ID and SITE == 'watchpeopledie.tv': abort(403) if not (v.id == u.id or v.admin_level >= PERMS['USER_FOLLOWS_VISIBLE']): abort(403) diff --git a/files/templates/default.html b/files/templates/default.html index 3a480f6d1..c704a3bcc 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -237,7 +237,7 @@ {% elif SITE == 'rdrama.net' %} - {% elif SITE == 'watchpeopledie.co' %} + {% elif SITE == 'watchpeopledie.tv' %} {% elif SITE == 'pcmemes.net' %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index ea22848a8..7a229f952 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -60,7 +60,7 @@

Looks like someone wants you to join {{SITE_NAME}}.

{% elif SITE_NAME == 'WPD' and site_settings['login_required'] %}

- Hi you! — WatchPeopleDie.co is currently doing our monthly 24(ish) hours of "everyone needs to have an account" — sorry about that! But making an account is actually super easy. You don't even need an email address! Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.
+ Hi you! — watchpeopledie.tv is currently doing our monthly 24(ish) hours of "everyone needs to have an account" — sorry about that! But making an account is actually super easy. You don't even need an email address! Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.

We WANT you with us 💖
diff --git a/readme.md b/readme.md index 29c7bd705..c3d61a80e 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ [![Build status](https://img.shields.io/github/workflow/status/TheMotte/rDrama/run_tests.py/frost)](https://github.com/Aevann1/rDrama/actions?query=workflow%3Arun_tests.py+branch%3Afrost) -This code runs https://rdrama.net, https://pcmemes.net and https://watchpeopledie.co +This code runs https://rdrama.net, https://pcmemes.net and https://watchpeopledie.tv # Installation (Windows/Linux/MacOS)