diff --git a/files/routes/front.py b/files/routes/front.py index b8abe9748..6c324a55c 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -162,8 +162,11 @@ def front_all(v, sub=None): sort=request.values.get("sort", defaultsorting) t=request.values.get('t', defaulttime) ccmode=request.values.get('ccmode', "false").lower() - subs=session.get('subs', False) - subsonly=request.values.get('subsonly', "false").lower() + + if SITE_NAME == 'Drama': defaultsubs = 'Exclude subs' + else: defaultsubs = 'Include subs' + + subs=session.get('subs', defaultsubs) try: gt=int(request.values.get("utc_greater_than", 0)) except: gt=0 @@ -182,7 +185,6 @@ def front_all(v, sub=None): lt=lt, sub=sub, site=SITE, - subsonly=subsonly ) posts = get_posts(ids, v=v) @@ -263,23 +265,22 @@ def front_all(v, sub=None): g.db.commit() if request.headers.get("Authorization"): return {"data": [x.json for x in posts], "next_exists": next_exists} - return render_template("home.html", v=v, listing=posts, next_exists=next_exists, sort=sort, t=t, page=page, ccmode=ccmode, sub=sub, subs=subs, subsonly=subsonly, home=True) + return render_template("home.html", v=v, listing=posts, next_exists=next_exists, sort=sort, t=t, page=page, ccmode=ccmode, sub=sub, subs=subs, home=True) @cache.memoize(timeout=86400) -def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", subs=False, filter_words='', gt=0, lt=0, sub=None, site=None, subsonly="false"): +def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false", subs='Exclude subs', filter_words='', gt=0, lt=0, sub=None, site=None): posts = g.db.query(Submission) if sub: posts = posts.filter_by(sub=sub.name) - elif subsonly == "true": + elif subs == "View subs only": posts = posts.filter(Submission.sub != None) if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks)) - elif subs: + elif subs == "Include subs": if v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - elif SITE_NAME == 'Drama': posts = posts.filter(Submission.sub == None) - elif v and v.all_blocks: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) + elif subs == 'Exclude subs': posts = posts.filter(Submission.sub == None) if gt: posts = posts.filter(Submission.created_utc > gt) if lt: posts = posts.filter(Submission.created_utc < lt) @@ -353,13 +354,12 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false" if (sort == "hot" or (v and v.id == Q_ID)) and page == 1 and ccmode == "false" and not gt and not lt: pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False) if sub: pins = pins.filter_by(sub=sub.name) - elif subsonly == "true": + elif subs == "View subs only": pins = pins.filter(Submission.sub != None) if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks)) - elif subs: + elif subs == "Include subs": if v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) - elif SITE_NAME == 'Drama': pins = pins.filter(Submission.sub == None) - elif v and v.all_blocks: pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) + elif subs == 'Exclude subs': pins = pins.filter(Submission.sub == None) if v and v.admin_level == 0: blocking = [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=v.id).all()] diff --git a/files/routes/subs.py b/files/routes/subs.py index 3507229af..8db5c2b51 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -439,10 +439,10 @@ def sub_sidebar(v, sub): return redirect(f'/s/{sub.name}/settings') -@app.post("/sub_toggle") -def sub_toggle(): - session["subs"] = not session.get("subs") - return '', 204 +@app.post("/sub_toggle/") +def sub_toggle(mode): + if mode in ('Exclude subs', 'Include subs', 'View subs only'): session["subs"] = mode + return redirect('/') @app.get("/subs") diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 2e39e1dcc..be11169f7 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index e480f4818..be8ab7da5 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% if sub and sub.css and not request.path.endswith('settings') %} diff --git a/files/templates/home.html b/files/templates/home.html index 870f4adc0..99f1ea2db 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -38,59 +38,62 @@ {% block navbar %}
{% if request.path == '/' and v.paid_dues %} - {% if ccmode=="true"%}CC{% endif %} - {% if ccmode=="false" %}CC{% endif %} - {% endif %} - - {% if request.path in ('/','/logged_out') and SITE_NAME == 'Drama' %} - {% if subs %} - {% set classes='btn-primary text-primary' %} - {% else %} - {% set classes='btn-secondary' %} - {% endif %} - + {% if ccmode=="true"%}CC{% endif %} + {% if ccmode=="false" %}CC{% endif %} {% endif %}
+
+ {% if subs != "Exclude subs" %}{% endif %} + {% if subs != "Include subs" %}{% endif %} + {% if subs != "View subs only" %}{% endif %} +
+
+ +
+
- {% if t != "hour" %}Hour{% endif %} - {% if t != "day" %}Day{% endif %} - {% if t != "week" %}Week{% endif %} - {% if t != "month" %}Month{% endif %} - {% if t != "year" %}Year{% endif %} - {% if t != "all" %}All{% endif %} + {% if t != "hour" %}Hour{% endif %} + {% if t != "day" %}Day{% endif %} + {% if t != "week" %}Week{% endif %} + {% if t != "month" %}Month{% endif %} + {% if t != "year" %}Year{% endif %} + {% if t != "all" %}All{% endif %}
- {% if sort != "hot" %}Hot{% endif %} - {% if sort != "top" %}Top{% endif %} - {% if sort != "bottom" %}Bottom{% endif %} - {% if sort != "new" %}New{% endif %} - {% if sort != "old" %}Old{% endif %} - {% if sort != "controversial" %}Controversial{% endif %} - {% if sort != "comments" %}Comments{% endif %} + {% if sort != "hot" %}Hot{% endif %} + {% if sort != "top" %}Top{% endif %} + {% if sort != "bottom" %}Bottom{% endif %} + {% if sort != "new" %}New{% endif %} + {% if sort != "old" %}Old{% endif %} + {% if sort != "controversial" %}Controversial{% endif %} + {% if sort != "comments" %}Comments{% endif %}
@@ -157,14 +160,14 @@