diff --git a/files/classes/user.py b/files/classes/user.py index b1002f36d..c49f919a3 100755 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -235,6 +235,11 @@ class User(Base): return [x[0] for x in posts] + @property + @lazy + def bio_html_eager(self): + return self.bio_html.replace('data-src', 'src') + @property @lazy def fullname(self): diff --git a/files/helpers/const.py b/files/helpers/const.py index c2a6a85c3..0aece46c6 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -41,9 +41,7 @@ SLURS = { "hymie": "Israeli friend", "allah": "Allah (SWT)", "mohammad": "Mohammad (PBUH)", - "mohammed": "Mohammad (PBUH)", "muhammad": "Mohammad (PBUH)", - "muhammed": "Mohammad (PBUH)", "i hate marsey": "i love marsey", "libertarian": "pedophile", "billie eilish": "Billie Eilish (fat cow)", diff --git a/files/routes/votes.py b/files/routes/votes.py index f404a7bde..9afbbc8bb 100755 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -176,6 +176,17 @@ def api_vote_comment(comment_id, new, v): comment.is_pinned = None g.db.add(comment) + if v.agendaposter_expires_utc and v.agendaposter_expires_utc < time.time(): + v.agendaposter_expires_utc = 0 + v.agendaposter = False + g.db.add(v) + send_notification(v.id, "Your agendaposter theme has expired!") + + if v.flairchanged and v.flairchanged < time.time(): + v.flairchanged = None + g.db.add(v) + send_notification(v.id, "Your flair lock has expired. You can now change your flair!") + try: g.db.flush() comment.upvotes = g.db.query(CommentVote.id).options(lazyload('*')).filter_by(comment_id=comment.id, vote_type=1).count() diff --git a/files/templates/comments.html b/files/templates/comments.html index 01ec59fd5..0e0e3b68f 100755 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -126,9 +126,9 @@
{{c.author.username}}
- + .replace(/data-src/g, 'src')
- {% if c.author.bio_html %}{{c.author.bio_html.replace('data-src', 'src') | safe}}{% endif %} + {% if c.author.bio_html %}{{c.author.bio_html_eager | safe}}{% endif %}
@@ -278,7 +278,7 @@ {% if c.is_blocking %}{% endif %} {% if c.is_blocked %}{% endif %} - {% if c.author.verified %} + {% if c.author.verified %} {% endif %} {{c.author.username}} diff --git a/files/templates/submission.html b/files/templates/submission.html index aabe9ea9e..cbc4ce1bc 100755 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -264,7 +264,7 @@
- {% if p.author.bio_html %}{{p.author.bio_html.replace('data-src', 'src') | safe}}{% endif %} + {% if p.author.bio_html %}{{p.author.bio_html_eager | safe}}{% endif %}
@@ -424,7 +424,7 @@ {% if p.over_18 %}+18{% endif %} {% if p.private %}Draft{% endif %} {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} - {% if p.author.verified %} + {% if p.author.verified %} {% endif %} {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}} diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index 8de3c966f..caa460863 100755 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -44,7 +44,7 @@
- {% if p.author.bio_html %}{{p.author.bio_html.replace('data-src', 'src') | safe}}{% endif %} + {% if p.author.bio_html %}{{p.author.bio_html_eager | safe}}{% endif %}
@@ -192,7 +192,7 @@ {% if p.is_blocked %}{% endif %} {% if p.private %}Draft{% endif %} {% if p.active_flags %}{{p.active_flags}} Reports{% endif %} - {% if p.author.verified %} + {% if p.author.verified %} {% endif %} {{p.author.username}}{% if p.author.customtitle %}  {% if p.author.quadrant %}{% endif %}{{p.author.customtitle | safe}}{% endif %}  {{p.age_string}} diff --git a/files/templates/userpage.html b/files/templates/userpage.html index d95533f9e..88e9c0849 100755 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -117,7 +117,7 @@ {% endif %} - {% if u.verified %}{% endif %} + {% if u.verified %}{% endif %} {% if u.admin_level > 1 or (u.admin_level == 1 and (not v or v.admin_level < 2)) %} @@ -404,7 +404,7 @@
BANNED USER{% if u.ban_reason %}: {{u.ban_reason}}{% endif %}
{% if u.unban_utc %}
{{u.unban_string}}
{% endif %} {% endif %} - {% if u.verified %} {% endif %} + {% if u.verified %} {% endif %}

{{u.username}}

 {% if u.username != u.original_username %} diff --git a/snappy.txt b/snappy.txt index f8be44bfd..45bec7da2 100755 --- a/snappy.txt +++ b/snappy.txt @@ -2724,3 +2724,5 @@ Re-read what I said but this time try to think about what the words mean. I'm no Aaaaand unsubed. Really a lack of empathy from all these assholes. We knew this sub was filled with transphobes, but this is bullshit. Trans people are of no fault from their own identity nor from asking to be treated with dignity. The same "gender ideology" that explains trans people explains LGB people. You're just using it as a buzzword, or worse a dog whistle, to make trans into a choice. Actually read some of queer theory, and then make an opinion. And congrats on those generalizing trans people that are defensive as "rabid" like we didn't had to get rabid for our rights. Y'all dumb as bricks. {[para]} Oh man...do U even realize,the substance of the question U were asking?If U do ,then U will realize why,U failed 2 receive a reply. I mean really,what dimension are U from?Did the Stargate U materialized from suffer an incomplete transmission,leaving some essential particles scattered about,in the wormhole?🤔 +{[para]} +Really wish we could speed up this timeline and get to the part where you get thrown in prison for child porn. \ No newline at end of file