carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

ripbozo

master
Aevann1 2022-10-17 21:13:33 +02:00
parent 9358b75027
commit 44fca7f086
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/assets/manifest_WPD.json
View File

@ -1,7 +1,7 @@
{ {
"name": "WPD", "name": "WPD",
"short_name": "WPD", "short_name": "WPD",
"start_url": "https://watchpeopledie.co", "start_url": "https://watchpeopledie.tv",
"display": "standalone", "display": "standalone",
"background_color": "#2A96F3", "background_color": "#2A96F3",
"description": "WPD" "description": "WPD"

6
files/classes/submission.py
View File

@ -260,10 +260,10 @@ class Submission(Base):
if "?" in url: url += "&context=9" if "?" in url: url += "&context=9"
else: url += "?context=8" else: url += "?context=8"
if not v or v.controversial: url += "&sort=controversial" 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 # Semi-temporary fix for self-hosted unproxied video serving
url = url.replace("https://watchpeopledie.co/videos/", url = url.replace("https://watchpeopledie.tv/videos/",
"https://videos.watchpeopledie.co/", 1) "https://videos.watchpeopledie.tv/", 1)
return url return url

6
files/helpers/const.py
View File

@ -462,8 +462,8 @@ elif SITE == 'pcmemes.net':
LOTTERY_SINK_RATE = -8 LOTTERY_SINK_RATE = -8
BANNER_THREAD = 28307 BANNER_THREAD = 28307
elif SITE == 'watchpeopledie.co': elif SITE == 'watchpeopledie.tv':
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!""" 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 FEATURES['PATRON_ICONS'] = True
@ -1125,7 +1125,7 @@ approved_embed_hosts = {
SITE, SITE,
'rdrama.net', 'rdrama.net',
'pcmemes.net', 'pcmemes.net',
'watchpeopledie.co', 'watchpeopledie.tv',
'imgur.com', 'imgur.com',
'lain.la', 'lain.la',
'pngfind.com', 'pngfind.com',

2
files/routes/admin.py
View File

@ -529,7 +529,7 @@ def badge_grant_post(v):
try: badge_id = int(request.values.get("badge_id")) try: badge_id = int(request.values.get("badge_id"))
except: abort(400) 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) 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': 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':

2
files/routes/asset_submissions.py
View File

@ -10,7 +10,7 @@ from files.helpers.get import *
from files.helpers.wrappers import * from files.helpers.wrappers import *
from files.routes.static import marsey_list 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) ASSET_TYPES = (Marsey, HatDef)
CAN_APPROVE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID) CAN_APPROVE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID)
CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID, GEESE_ID) CAN_UPDATE_ASSETS = (AEVANN_ID, CARP_ID, SNAKES_ID, GEESE_ID)

4
files/routes/posts.py
View File

@ -105,7 +105,7 @@ def publish(pid, v):
if post.sub == 'changelog': if post.sub == 'changelog':
send_changelog_message(post.permalink) send_changelog_message(post.permalink)
if SITE == 'watchpeopledie.co': if SITE == 'watchpeopledie.tv':
send_wpd_message(post.permalink) send_wpd_message(post.permalink)
execute_snappy(post, v) execute_snappy(post, v)
@ -1033,7 +1033,7 @@ def submit_post(v, sub=None):
if post.sub == 'changelog' and not post.private: if post.sub == 'changelog' and not post.private:
send_changelog_message(post.permalink) 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) send_wpd_message(post.permalink)
g.db.commit() g.db.commit()

2
files/routes/static.py
View File

@ -232,7 +232,7 @@ def submit_contact(v):
new_comment.top_comment_id = new_comment.id new_comment.top_comment_id = new_comment.id
admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']) 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) admins = admins.filter(User.id != AEVANN_ID)
for admin in admins.all(): for admin in admins.all():

4
files/routes/users.py
View File

@ -658,7 +658,7 @@ def messagereply(v):
if c.top_comment.sentto == 2: if c.top_comment.sentto == 2:
admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) 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 = admins.filter(User.id != AEVANN_ID)
admins = [x[0] for x in admins.all()] admins = [x[0] for x in admins.all()]
@ -733,7 +733,7 @@ def redditor_moment_redirect(username, v):
@auth_required @auth_required
def followers(username, v): def followers(username, v):
u = get_user(username, v=v, include_shadowbanned=False) 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']): if not (v.id == u.id or v.admin_level >= PERMS['USER_FOLLOWS_VISIBLE']):
abort(403) abort(403)

2
files/templates/default.html
View File

@ -237,7 +237,7 @@
<meta name="cf-2fa-verify" content="ea6d12c0fb87b3b"> <meta name="cf-2fa-verify" content="ea6d12c0fb87b3b">
{% elif SITE == 'rdrama.net' %} {% elif SITE == 'rdrama.net' %}
<meta name="cf-2fa-verify" content="4f40ca1ca249313"> <meta name="cf-2fa-verify" content="4f40ca1ca249313">
{% elif SITE == 'watchpeopledie.co' %} {% elif SITE == 'watchpeopledie.tv' %}
<meta name="cf-2fa-verify" content="372aba5b9338e00"> <meta name="cf-2fa-verify" content="372aba5b9338e00">
{% elif SITE == 'pcmemes.net' %} {% elif SITE == 'pcmemes.net' %}
<meta name="cf-2fa-verify" content="bf22ffe56e4bcda"> <meta name="cf-2fa-verify" content="bf22ffe56e4bcda">

2
files/templates/sign_up.html
View File

@ -60,7 +60,7 @@
<p class="text-muted mb-md-2">Looks like someone wants you to join {{SITE_NAME}}.</p> <p class="text-muted mb-md-2">Looks like someone wants you to join {{SITE_NAME}}.</p>
{% elif SITE_NAME == 'WPD' and site_settings['login_required'] %} {% elif SITE_NAME == 'WPD' and site_settings['login_required'] %}
<p class="text-muted text-justify mb-1" style="line-height: 1.2em"> <p class="text-muted text-justify mb-1" style="line-height: 1.2em">
<strong>Hi you!</strong> &mdash; <span style="font-variant-caps: small-caps;">WatchPeopleDie.co</span> is currently doing our monthly 24(ish) hours of "everyone needs to have an account" &mdash; sorry about that! But making an account is actually super easy. <strong>You don't even need an email address!</strong> Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.<br> <strong>Hi you!</strong> &mdash; <span style="font-variant-caps: small-caps;">watchpeopledie.tv</span> is currently doing our monthly 24(ish) hours of "everyone needs to have an account" &mdash; sorry about that! But making an account is actually super easy. <strong>You don't even need an email address!</strong> Literally just pick a username, set a password, and that's that. Bam, done, like 8 seconds, tops.<br>
</p> </p>
<p class="text-muted mb-md-2"> <p class="text-muted mb-md-2">
We WANT you with us &#128150;<br> We WANT you with us &#128150;<br>

2
readme.md
View File

@ -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) [![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) # Installation (Windows/Linux/MacOS)