diff --git a/files/classes/comment.py b/files/classes/comment.py index 4052a2a632..d4d26b41ea 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -295,8 +295,6 @@ class Comment(Base): if self.level >= 2: data['parent_comment_id'] = self.parent_comment_id - data['replies'] = [x.json_core for x in self.replies()] - return data @property @@ -313,6 +311,7 @@ class Comment(Base): if self.level >= 2: data["parent"]=self.parent.json_core + data['replies'] = [x.json_core for x in self.replies()] return data diff --git a/files/classes/submission.py b/files/classes/submission.py index da106c4673..68344f642a 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -282,7 +282,7 @@ class Submission(Base): if "replies" in self.__dict__: - data["replies"]=[x.json_core for x in self.replies] + data["replies"]=[x.json for x in self.replies] if "voted" in self.__dict__: data["voted"] = self.voted diff --git a/files/classes/user.py b/files/classes/user.py index ad28b757aa..59782e57ba 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -129,6 +129,7 @@ class User(Base): total_held_lottery_tickets = Column(Integer, default=0) total_lottery_winnings = Column(Integer, default=0) last_viewed_post_notifs = Column(Integer, default=0) + pronouns = Column(String, default='they/them') badges = relationship("Badge", order_by="Badge.created_utc", back_populates="user") subscriptions = relationship("Subscription", back_populates="user") diff --git a/files/helpers/regex.py b/files/helpers/regex.py index 10a5fc242e..bbb92d140e 100644 --- a/files/helpers/regex.py +++ b/files/helpers/regex.py @@ -101,6 +101,8 @@ search_token_regex = re.compile('"([^"]*)"|(\S+)', flags=re.A) git_regex = re.compile("ref: (refs/.+)", flags=re.A) +pronouns_regex = re.compile("[a-z]{1-5}\/[a-z]{1-5}", flags=re.A) + def sub_matcher(match, upper=False): if match.group(0).startswith('<'): return match.group(0) diff --git a/files/routes/notifications.py b/files/routes/notifications.py index 601f7a0d4b..bf0d0b5b65 100644 --- a/files/routes/notifications.py +++ b/files/routes/notifications.py @@ -30,7 +30,7 @@ def unread(v): n.read = True g.db.add(n) - return {"data":[x[1].json for x in listing]} + return {"data":[x[1].json_core for x in listing]} diff --git a/files/routes/settings.py b/files/routes/settings.py index 97f01bdf99..f3fe6572cd 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -880,6 +880,26 @@ def settings_title_change(v): return redirect("/settings/profile") +@app.post("/settings/pronouns_change") +@limiter.limit("1/second;30/minute;200/hour;1000/day") +@limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') +@auth_required +def settings_pronouns_change(v): + + pronouns = request.values.get("pronouns").replace("𒐪","").lower().strip() + + if pronouns == v.pronouns: + return render_template("settings_profile.html", v=v, error="You didn't change anything") + + if not pronouns_regex.fullmatch(pronouns): + return render_template("settings_profile.html", v=v, error="The pronouns you entered don't match the required format {1-5 characters}/{1-5 characters}") + + v.pronouns = pronouns + g.db.add(v) + + return redirect("/settings/profile") + + @app.post("/settings/checkmark_text") @limiter.limit("1/second;30/minute;200/hour;1000/day") @limiter.limit("1/second;30/minute;200/hour;1000/day", key_func=lambda:f'{request.host}-{session.get("lo_user")}') diff --git a/files/templates/comments.html b/files/templates/comments.html index fc0bdee933..e9e7fcad41 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -206,6 +206,9 @@ {% endif %} {{c.author_name}} + {% if SITE_NAME == 'rDrama' %} + {{c.author.pronouns}} + {% endif %} {% if c.author.customtitle %}   {{c.author.customtitle | safe}} {% endif %} diff --git a/files/templates/header.html b/files/templates/header.html index 3abfabd801..bee7c46095 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -154,6 +154,27 @@ + +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • + +
  • + +
    + + + +
    +
    + + +
    + {1-5 characters} / {1-5 characters} + +
    +
    +
    + +
    + +
    diff --git a/files/templates/sidebar_Cringetopia.html b/files/templates/sidebar_Cringetopia.html index f603a0ac7d..7c9d075e94 100644 --- a/files/templates/sidebar_Cringetopia.html +++ b/files/templates/sidebar_Cringetopia.html @@ -10,7 +10,7 @@ sidebar image -

    +

    diff --git a/files/templates/sidebar_LGBDropTheT.html b/files/templates/sidebar_LGBDropTheT.html index 3f05e2e22f..02f73fb932 100644 --- a/files/templates/sidebar_LGBDropTheT.html +++ b/files/templates/sidebar_LGBDropTheT.html @@ -23,7 +23,7 @@ {%- endif %}

    -

    +

    diff --git a/files/templates/sidebar_PCM.html b/files/templates/sidebar_PCM.html index 9908b9dad2..68c66e37d8 100644 --- a/files/templates/sidebar_PCM.html +++ b/files/templates/sidebar_PCM.html @@ -1,6 +1,6 @@

    -

    +

    {% if v and v.can_gamble and LOTTERY_ENABLED -%} {%- endif %} diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html index 70110f11f1..2e287e9950 100644 --- a/files/templates/sidebar_WPD.html +++ b/files/templates/sidebar_WPD.html @@ -10,7 +10,7 @@ sidebar image -

    +

    diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index c7ed81bf67..953dd3e311 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -54,7 +54,7 @@ set VISITORS_HERE_FLAVOR = [ {%- endif %}

    -

    +

    diff --git a/files/templates/submission.html b/files/templates/submission.html index 24745b2baf..a1af5757e1 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -676,6 +676,9 @@ {% endif %} {{p.author_name}} + {% if SITE_NAME == 'rDrama' %} + {{p.author.pronouns}} + {% endif %} {% if p.author.customtitle %}   {{p.author.customtitle | safe}} {% endif %} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index dc4abf8692..da8e777ff4 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -207,6 +207,9 @@ {% endif %} {{p.author_name}} + {% if SITE_NAME == 'rDrama' %} + {{p.author.pronouns}} + {% endif %} {% if p.author.customtitle %}   {{p.author.customtitle | safe}} {% endif %} diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html index 0637d5f3c4..fd5a7ba5c5 100644 --- a/files/templates/util/assetcache.html +++ b/files/templates/util/assetcache.html @@ -1,6 +1,6 @@ {%- set CACHE_VER = { - 'css/main.css': 385, + 'css/main.css': 387, 'css/4chan.css': 61, 'css/classic.css': 61, diff --git a/sql/20220711-pronouns.sql b/sql/20220711-pronouns.sql new file mode 100644 index 0000000000..22d3d68f58 --- /dev/null +++ b/sql/20220711-pronouns.sql @@ -0,0 +1,2 @@ +alter table users add column pronouns varchar(11) not null default 'they/them'; +alter table users alter column pronouns drop default;