rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "remove hidevotedon" 

This reverts commit d8cf302a43.
pull/142/head
Aevann 2023-03-15 08:03:11 +02:00
parent 3de34c9a65
commit 1e832b0027
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/classes/user.py
View File

@ -106,6 +106,7 @@ class User(Base):
shadowbanned = Column(Integer, ForeignKey("users.id")) shadowbanned = Column(Integer, ForeignKey("users.id"))
chudded_by = Column(Integer, ForeignKey("users.id")) chudded_by = Column(Integer, ForeignKey("users.id"))
over_18 = Column(Boolean, default=False) over_18 = Column(Boolean, default=False)
hidevotedon = Column(Boolean, default=False)
slurreplacer = Column(Integer, default=1) slurreplacer = Column(Integer, default=1)
profanityreplacer = Column(Integer, default=1) profanityreplacer = Column(Integer, default=1)
flairchanged = Column(Integer) flairchanged = Column(Integer)

6
files/routes/front.py
View File

@ -66,6 +66,7 @@ def front_all(v, sub=None, subdomain=None):
posts = get_posts(ids, v=v, eager=True) posts = get_posts(ids, v=v, eager=True)
if v: if v:
if v.hidevotedon: posts = [x for x in posts if not hasattr(x, 'voted') or not x.voted]
award_timers(v) award_timers(v)
if v and v.client: return {"data": [x.json for x in posts], "next_exists": next_exists} if v and v.client: return {"data": [x.json for x in posts], "next_exists": next_exists}
@ -78,6 +79,11 @@ 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): 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) 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) if sub: posts = posts.filter(Submission.sub == sub.name)
elif v: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks))) elif v: posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))

1
files/routes/settings.py
View File

@ -183,6 +183,7 @@ def settings_personal_post(v):
db.add(v) db.add(v)
return profanity_filter_updated return profanity_filter_updated
updated = updated or update_flag("hidevotedon", "hidevotedon")
updated = updated or update_flag("newtab", "newtab") updated = updated or update_flag("newtab", "newtab")
updated = updated or update_flag("newtabexternal", "newtabexternal") updated = updated or update_flag("newtabexternal", "newtabexternal")
updated = updated or update_flag("nitter", "nitter") updated = updated or update_flag("nitter", "nitter")

2
schema.sql
View File

@ -984,6 +984,7 @@ CREATE TABLE public.users (
titlecolor character varying(6) NOT NULL, titlecolor character varying(6) NOT NULL,
profileurl character varying(65), profileurl character varying(65),
bannerurl character varying(65), bannerurl character varying(65),
hidevotedon boolean DEFAULT false NOT NULL,
newtab boolean DEFAULT false NOT NULL, newtab boolean DEFAULT false NOT NULL,
flairchanged integer, flairchanged integer,
defaultsortingcomments character varying(15) NOT NULL, defaultsortingcomments character varying(15) NOT NULL,
@ -2879,3 +2880,4 @@ ALTER TABLE ONLY public.comments
-- --
-- PostgreSQL database dump complete -- PostgreSQL database dump complete
-- --