From 541aab1605196e9ec772f92b917cd2891c42effb Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 18 Feb 2022 13:55:57 +0200 Subject: [PATCH] cbv --- files/helpers/const.py | 4 +-- files/routes/front.py | 6 ++-- files/routes/posts.py | 2 +- files/templates/header.html | 4 +-- files/templates/sidebar_2Much4You.html | 44 -------------------------- files/templates/submit.html | 4 --- readme.md | 2 +- 7 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 files/templates/sidebar_2Much4You.html diff --git a/files/helpers/const.py b/files/helpers/const.py index 34f7d9264..a91b36db5 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -141,7 +141,7 @@ AGENDAPOSTER_MSG = """Hi @{username},\n\nYour {type} has been automatically remo included. \n\n*This is an automated message; if you need help, you can message us [here](/contact).*""" -if SITE in ('rdrama.net','devrama.xyz','2much4you.net','ruqqus.us'): +if SITE in ('rdrama.net','devrama.xyz','ruqqus.us'): PW_ID = 3750 BASEDBOT_ID = 0 KIPPY_ID = 7150 @@ -642,8 +642,6 @@ REDDIT_NOTIFS = { 'the_homocracy': HOMO_ID } -toomuch_subs = ('2much4you','2balkan4you','2middleeast4you','2asia4you','2caucasian4you','2european4you','2american4you') - discounts = { 69: 0.02, 70: 0.04, diff --git a/files/routes/front.py b/files/routes/front.py index 7afe69f51..859368960 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -270,8 +270,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if sub: posts = posts.filter_by(sub=sub.name) elif SITE != 'devrama.xyz': - if SITE_NAME == '2Much4You': posts = posts.filter(Submission.sub.in_(toomuch_subs)) - elif SITE_NAME == 'Ruqqus': + if SITE_NAME == 'Ruqqus': posts = posts.filter(Submission.sub != None) if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) elif SITE_NAME == 'PCM': @@ -351,8 +350,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False) if sub: pins = pins.filter_by(sub=sub.name) elif SITE != 'devrama.xyz': - if SITE_NAME == '2Much4You': pins = pins.filter(Submission.sub.in_(toomuch_subs)) - elif SITE_NAME == 'Ruqqus': + if SITE_NAME == 'Ruqqus': pins = pins.filter(Submission.sub != None) if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) elif SITE_NAME == 'PCM': diff --git a/files/routes/posts.py b/files/routes/posts.py index 8b9e19c1b..206ed4e5c 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -751,7 +751,7 @@ def thumbnail_thread(pid): if SITE_NAME == 'Drama': for t in ("submission","comment"): - word = random.choice(('rdrama','marsey','2much4you.net')) + word = random.choice(('rdrama','marsey')) try: data = requests.get(f'https://api.pushshift.io/reddit/{t}/search?html_decode=true&q={word}&size=1') diff --git a/files/templates/header.html b/files/templates/header.html index 058d69bc1..ada324e40 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -165,7 +165,7 @@ {% if request.host != 'pcmemes.net' %} Discord {% endif %} - {% if not (g.webview and v.truecoins < 1) and SITE_NAME not in ('2Much4You','Ruqqus') %} + {% if not (g.webview and v.truecoins < 1) and SITE_NAME != 'Ruqqus' %} Donate {% endif %} {% if SITE_NAME == 'Drama' %}Archives{% endif %} @@ -225,7 +225,7 @@ {% if request.host != 'pcmemes.net' %} Discord {% endif %} - {% if not (g.webview and v.truecoins < 1) and SITE_NAME not in ('2Much4You','Ruqqus') %} + {% if not (g.webview and v.truecoins < 1) and SITE_NAME != 'Ruqqus' %} Donate {% endif %} {% if SITE_NAME == 'Drama' %}Archives{% endif %} diff --git a/files/templates/sidebar_2Much4You.html b/files/templates/sidebar_2Much4You.html deleted file mode 100644 index 9ba8c1fca..000000000 --- a/files/templates/sidebar_2Much4You.html +++ /dev/null @@ -1,44 +0,0 @@ -
- {% if sub %} - {% set image=sub.sidebar_url %} - {% else %} - {% set image='/static/assets/images/' + SITE_NAME + '/sidebar.webp?a=1041' %} - {% endif %} - - sidebar image - -{% if sub %} - {% if sub.sidebar_html %} -
{{sub.sidebar_html|safe}}
- {% endif %} - MODS - {% if v and v.mods(sub.name) %} - SUB SETTINGS - {% endif %} - {% if v %} - BLOCK SUB - UNBLOCK SUB - {% endif %} -{% else %} -

Rules: No doxxing, No CP or other clearly illegal shit. Thanks!

-{% endif %} - -CREATE SUB - -
-
-
-
-
-
-
-
-
-
-
-					
-
-
-				
-
-
\ No newline at end of file diff --git a/files/templates/submit.html b/files/templates/submit.html index fc2775ebf..459cc6616 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -84,10 +84,6 @@