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

remove hidevotedon

pull/142/head
Aevann 2023-03-15 06:21:52 +02:00
parent da75577732
commit d8cf302a43
6 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/classes/user.py
View File

@ -106,7 +106,6 @@ 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,7 +66,6 @@ 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(g.db) for x in posts], "next_exists": next_exists} if v and v.client: return {"data": [x.json(g.db) 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): 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 = g.db.query(Submission) posts = g.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,7 +183,6 @@ def settings_personal_post(v):
g.db.add(v) g.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")

1
files/templates/settings/advanced.html
View File

@ -132,7 +132,6 @@
{% if FEATURES['NSFW_MARKING'] %} {% 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)}} {{common.toggle_section('Disable +18 Warnings', 'over_18', 'over_18', v.over_18, "Disable the warnings that appear when viewing +18 content.", false)}}
{% endif %} {% 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)}}
<div class="d-lg-flex border-bottom"> <div class="d-lg-flex border-bottom">
<div class="title w-lg-25"> <div class="title w-lg-25">
<label for="custom-filter">Custom Filters</label> <label for="custom-filter">Custom Filters</label>

1
migrations/20230315-remove-hidevotedon.sql 100644
View File

@ -0,0 +1 @@
alter table users drop column hidevotedon;

2
schema.sql
View File

@ -984,7 +984,6 @@ 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,
@ -2880,4 +2879,3 @@ ALTER TABLE ONLY public.comments
-- --
-- PostgreSQL database dump complete -- PostgreSQL database dump complete
-- --