From ab9515183c6f276b851a29fd1d15125a4c2081a7 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 20 Mar 2022 23:58:39 +0200 Subject: [PATCH 1/3] emojis --- files/templates/emoji_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 67112a5ad..ce6c6e974 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -94,4 +94,4 @@ - \ No newline at end of file + \ No newline at end of file From c90792d663eb50237601456f7747222d393d2a24 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 21 Mar 2022 02:40:15 +0200 Subject: [PATCH 2/3] fds --- files/routes/votes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/files/routes/votes.py b/files/routes/votes.py index 7fb2e8af5..d48659615 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -90,7 +90,7 @@ def api_vote_post(post_id, new, v): post.author.truecoins += 1 g.db.add(post.author) - if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profileurl.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False + if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False else: real = True vote = Vote(user_id=v.id, @@ -154,7 +154,7 @@ def api_vote_comment(comment_id, new, v): comment.author.truecoins += 1 g.db.add(comment.author) - if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profileurl.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False + if new == 1 and (v.agendaposter or v.shadowbanned or (v.is_banned and not v.unban_utc) or (v.profile_url.startswith('/e/') and not v.customtitle and v.namecolor == DEFAULT_COLOR)): real = False else: real = True vote = CommentVote(user_id=v.id, From 5d8dde0ff9923aecd9617285663cfeb3eefccc0c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Mon, 21 Mar 2022 22:21:22 +0200 Subject: [PATCH 3/3] vxc' --- files/helpers/const.py | 1 - files/routes/front.py | 6 +++--- files/templates/award_modal.html | 2 +- files/templates/default.html | 2 +- files/templates/oauth.html | 9 --------- files/templates/sidebar_Drama.html | 2 +- 6 files changed, 6 insertions(+), 16 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 685a90204..3d1e58522 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -76,7 +76,6 @@ SLURS = { "sheeny": "Israeli friend", "sheenies": "Israeli friends", "hymie": "Israeli friend", - "god": "Allah (SWT)", "allah": "Allah (SWT)", "mohammad": "Prophet Mohammad (PBUH)", "muhammad": "Prophet Mohammad (PBUH)", diff --git a/files/routes/front.py b/files/routes/front.py index 565b0c61d..eeddbe185 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -177,9 +177,9 @@ def front_all(v, sub=None, subdomain=None): try: lt=int(request.values.get("utc_less_than", 0)) except: lt=0 - if SITE_NAME == 'Drama': defaultsubs = 1 - else: defaultsubs = 2 - subs = v.subs if v else defaultsubs + if v: subs = v.subs + elif SITE_NAME == 'Drama': subs = 1 + else: subs = 2 ids, next_exists = frontlist(sort=sort, page=page, diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 4bcff8b58..a29d7e739 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -1,4 +1,4 @@ - +