diff --git a/files/__main__.py b/files/__main__.py index 683af649c..d329414f0 100644 --- a/files/__main__.py +++ b/files/__main__.py @@ -119,7 +119,7 @@ def after_request(response): if app.config["SERVER_NAME"] == 'localhost': from files.routes import * - from files.routes.chat import * + # from files.routes.chat import * elif "load_chat" in argv: from files.routes.chat import * else: diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index c705f7e20..e728be6ac 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -327,7 +327,7 @@ def filter_emojis_only(title, edit=False, graceful=False): title = strikethrough_regex.sub(r'\1', title) - sanitized = bleach.clean(title, tags=['img','del'], attributes=allowed_attributes_emojis, protocols=['http','https']) + title = bleach.clean(title, tags=['img','del'], attributes=allowed_attributes_emojis, protocols=['http','https']) signal.alarm(0) diff --git a/files/routes/login.py b/files/routes/login.py index df632640b..949b9834a 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -324,6 +324,8 @@ def sign_up_post(v): profileurl = '/e/' + random.choice(marseys_const) + '.webp' + if SITE == "watchpeopledie.co": print(f'1: {username}') + new_user = User( username=username, original_username = username, @@ -335,9 +337,13 @@ def sign_up_post(v): profileurl=profileurl ) + if SITE == "watchpeopledie.co": print(f'2: {username}') + g.db.add(new_user) g.db.flush() + if SITE == "watchpeopledie.co": print(f'3: {username}') + if ref_id: ref_user = g.db.query(User).filter_by(id=ref_id).one_or_none() @@ -367,9 +373,13 @@ def sign_up_post(v): session.permanent = True session["session_id"] = token_hex(49) session["lo_user"] = new_user.id + + if SITE == "watchpeopledie.co": print(f'4: {username}') g.db.commit() + if SITE == "watchpeopledie.co": print(f'5: {username}') + return redirect(SITE_FULL) diff --git a/files/routes/posts.py b/files/routes/posts.py index a0a0697ef..0c4166ad7 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -816,7 +816,7 @@ def api_is_repost(): if "/i.imgur.com/" in url: url = url.replace(".png", ".webp").replace(".jpg", ".webp").replace(".jpeg", ".webp") elif "/media.giphy.com/" in url or "/c.tenor.com/" in url: url = url.replace(".gif", ".webp") - elif "/i.ibb.com/" in url: url = url.replace(".png", ".webp").replace(".jpg", ".webp").replace(".jpeg", ".webp").replace(".gif", ".webp") + elif "/i.ibb.co/" in url: url = url.replace(".png", ".webp").replace(".jpg", ".webp").replace(".jpeg", ".webp").replace(".gif", ".webp") if url.startswith("https://streamable.com/") and not url.startswith("https://streamable.com/e/"): url = url.replace("https://streamable.com/", "https://streamable.com/e/") @@ -912,7 +912,7 @@ def submit_post(v, sub=None): if "/i.imgur.com/" in url: url = url.replace(".png", ".webp").replace(".jpg", ".webp").replace(".jpeg", ".webp") elif "/media.giphy.com/" in url or "/c.tenor.com/" in url: url = url.replace(".gif", ".webp") - elif "/i.ibb.com/" in url: url = url.replace(".png", ".webp").replace(".jpg", ".webp").replace(".jpeg", ".webp").replace(".gif", ".webp") + elif "/i.ibb.co/" in url: url = url.replace(".png", ".webp").replace(".jpg", ".webp").replace(".jpeg", ".webp").replace(".gif", ".webp") if url.startswith("https://streamable.com/") and not url.startswith("https://streamable.com/e/"): url = url.replace("https://streamable.com/", "https://streamable.com/e/") @@ -1355,7 +1355,7 @@ def submit_post(v, sub=None): if body.startswith('!slots'): check_for_slots_command(body, snappy, c) - if body.startswith(':#marseypin:'): + if body.startswith(':#marseypin'): post.stickied = "Snappy" post.stickied_utc = int(time.time()) + 3600 diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 6e9e87406..f9281d2f5 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -121,6 +121,11 @@ Text 2 #fortune ??? + + Random Factcheck + #factcheck + ??? + Poll Options (can select multiple options) diff --git a/files/templates/shop.html b/files/templates/shop.html index e0cadb7de..357c229f5 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -1,5 +1,9 @@ {% extends "default.html" %} + + {% block title %} Shop {% endblock %} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index cf66b002a..25f9634fa 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -4,7 +4,7 @@ {% set image=sub.sidebar_url %} {% else %} {% set path = "assets/images/" + SITE_NAME + "/sidebar" %} - {% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=43' %} + {% set image = "/" + path + "/" + listdir('files/' + path)|random() + '?v=44' %} {% endif %} {% if v and (v.is_banned or v.agendaposter) %}