diff --git a/files/classes/hats.py b/files/classes/hats.py index 9b3693fcd..577b964d9 100644 --- a/files/classes/hats.py +++ b/files/classes/hats.py @@ -7,6 +7,7 @@ from sqlalchemy.sql.sqltypes import * from files.classes import Base from files.helpers.lazy import lazy from files.helpers.regex import censor_slurs +from files.helpers.config.const import * class HatDef(Base): __tablename__ = "hat_defs" diff --git a/files/classes/user.py b/files/classes/user.py index e49290e61..d0589f88c 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -106,7 +106,6 @@ class User(Base): shadowbanned = Column(Integer, ForeignKey("users.id")) chudded_by = Column(Integer, ForeignKey("users.id")) over_18 = Column(Boolean, default=False) - hidevotedon = Column(Boolean, default=False) slurreplacer = Column(Integer, default=1) profanityreplacer = Column(Integer, default=1) flairchanged = Column(Integer) @@ -491,7 +490,6 @@ class User(Base): def referral_count(self): return len(self.referrals) - @lazy def has_blocked(self, target): return db.query(UserBlock).filter_by(user_id=self.id, target_id=target.id).one_or_none() diff --git a/files/helpers/useractions.py b/files/helpers/useractions.py index d5d5ab6de..6eecedf8e 100644 --- a/files/helpers/useractions.py +++ b/files/helpers/useractions.py @@ -2,6 +2,7 @@ from flask import g from files.classes.badges import Badge from files.helpers.alerts import send_repeatable_notification +from files.helpers.config.const import * def badge_grant(user, badge_id, description=None, url=None, notify=True): assert user != None diff --git a/files/routes/front.py b/files/routes/front.py index 5f47855d2..615122f18 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -66,7 +66,6 @@ def front_all(v, sub=None, subdomain=None): posts = get_posts(ids, v=v, eager=True) if v: - if v.hidevotedon: posts = [x for x in posts if not hasattr(x, 'voted') or not x.voted] award_timers(v) if v and v.client: return {"data": [x.json for x in posts], "next_exists": next_exists} @@ -79,11 +78,6 @@ LIMITED_WPD_HOLES = ('gore', 'aftermath', 'selfharm', 'meta', 'discussion', 'soc def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words='', gt=0, lt=0, sub=None, site=None, pins=True, holes=True): posts = db.query(Submission) - if v and v.hidevotedon: - posts = posts.outerjoin(Vote, - and_(Vote.submission_id == Submission.id, Vote.user_id == v.id) - ).filter(Vote.submission_id == None) - if sub: posts = posts.filter(Submission.sub == sub.name) elif v: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) diff --git a/files/routes/settings.py b/files/routes/settings.py index 7dd8e1dfd..a9d38cb83 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -183,7 +183,6 @@ def settings_personal_post(v): db.add(v) return profanity_filter_updated - updated = updated or update_flag("hidevotedon", "hidevotedon") updated = updated or update_flag("newtab", "newtab") updated = updated or update_flag("newtabexternal", "newtabexternal") updated = updated or update_flag("nitter", "nitter") diff --git a/files/templates/settings/advanced.html b/files/templates/settings/advanced.html index 22472fb9d..5da130f7d 100644 --- a/files/templates/settings/advanced.html +++ b/files/templates/settings/advanced.html @@ -132,7 +132,6 @@ {% if FEATURES['NSFW_MARKING'] %} {{common.toggle_section('Disable +18 Warnings', 'over_18', 'over_18', v.over_18, "Disable the warnings that appear when viewing +18 content.", false)}} {% endif %} - {{common.toggle_section('Hide Posts Voted On', 'hidevotedon', 'hidevotedon', v.hidevotedon, 'Enable if you would like to automatically hide posts you have voted on from your frontpage.', false)}}
diff --git a/schema.sql b/schema.sql index eb58fb007..cf6842bc4 100644 --- a/schema.sql +++ b/schema.sql @@ -984,7 +984,6 @@ CREATE TABLE public.users ( titlecolor character varying(6) NOT NULL, profileurl character varying(65), bannerurl character varying(65), - hidevotedon boolean DEFAULT false NOT NULL, newtab boolean DEFAULT false NOT NULL, flairchanged integer, defaultsortingcomments character varying(15) NOT NULL, @@ -2880,4 +2879,3 @@ ALTER TABLE ONLY public.comments -- -- PostgreSQL database dump complete -- -