From 74dee6651a2230eafb56a4a77adcb3f27bf59503 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 28 Jan 2024 19:19:26 +1300
Subject: [PATCH] topic misc bugfixes

---
 app/templates/post/_comment_voting_buttons.html | 4 ++--
 app/templates/post/_post_teaser.html            | 2 +-
 app/templates/post/_post_voting_buttons.html    | 4 ++--
 app/topic/routes.py                             | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/templates/post/_comment_voting_buttons.html b/app/templates/post/_comment_voting_buttons.html
index 373d9687..34718c1f 100644
--- a/app/templates/post/_comment_voting_buttons.html
+++ b/app/templates/post/_comment_voting_buttons.html
@@ -1,6 +1,6 @@
 {% if current_user.is_authenticated and current_user.verified %}
         {% if can_upvote(current_user, community) %}
-                <div class="upvote_button digits_{{ digits(comment.up_votes) }} {{ upvoted_class }}" role="button" aria-label="{{ _('UpVote') }}"
+                <div class="upvote_button {{ upvoted_class }}" role="button" aria-label="{{ _('UpVote') }}"
                  hx-post="/comment/{{ comment.id }}/upvote" hx-trigger="click throttle:1s" hx-target="closest .voting_buttons_new" tabindex="0">
                         <span class="fe fe-arrow-up"></span>
                         <img class="htmx-indicator" src="/static/images/spinner.svg" alt="" style="opacity: 0;">
@@ -8,7 +8,7 @@
         {% endif %}
         <span title="{{ comment.up_votes }}, {{ comment.down_votes }}">{{ comment.up_votes - comment.down_votes }}</span>
         {% if can_downvote(current_user, community) %}
-                <div class="downvote_button digits_{{ digits(comment.down_votes) }} {{ downvoted_class }}" role="button" aria-label="{{ _('DownVote') }}"
+                <div class="downvote_button {{ downvoted_class }}" role="button" aria-label="{{ _('DownVote') }}"
                  hx-post="/comment/{{ comment.id }}/downvote" hx-trigger="click throttle:1s" hx-target="closest .voting_buttons_new" tabindex="0">
                         <span class="fe fe-arrow-down"></span>
                         <img class="htmx-indicator" src="/static/images/spinner.svg" alt="" style="opacity: 0;">
diff --git a/app/templates/post/_post_teaser.html b/app/templates/post/_post_teaser.html
index e100a2d0..06ab8f05 100644
--- a/app/templates/post/_post_teaser.html
+++ b/app/templates/post/_post_teaser.html
@@ -2,7 +2,7 @@
 {% if content_blocked and content_blocked == '-1' %}
     {# do nothing - blocked by keyword filter #}
 {% else %}
-    <div class="post_teaser{{ ' reported' if post.reports and current_user.is_authenticated and post.community.is_moderator() }}{{ ' blocked' if content_blocked }}"
+    <div class="post_teaser type_{{ post.type }}{{ ' reported' if post.reports and current_user.is_authenticated and post.community.is_moderator() }}{{ ' blocked' if content_blocked }}"
         {% if content_blocked %} title="{{ _('Filtered: ') }}{{ content_blocked }}"{% endif %}>
             <div class="row">
                 <div class="col-12">
diff --git a/app/templates/post/_post_voting_buttons.html b/app/templates/post/_post_voting_buttons.html
index bb67026b..6e7eff39 100644
--- a/app/templates/post/_post_voting_buttons.html
+++ b/app/templates/post/_post_voting_buttons.html
@@ -1,6 +1,6 @@
 {% if current_user.is_authenticated and current_user.verified %}
         {% if can_upvote(current_user, post.community) %}
-                <div class="upvote_button digits_{{ digits(post.up_votes) }} {{ upvoted_class }}" role="button" aria-label="{{ _('UpVote') }}"
+                <div class="upvote_button {{ upvoted_class }}" role="button" aria-label="{{ _('UpVote') }}"
                  hx-post="/post/{{ post.id }}/upvote" hx-trigger="click throttle:1s" hx-target="closest .voting_buttons" tabindex="0">
                         <span class="fe fe-arrow-up"></span>
                         {{ shorten_number(post.up_votes) }}
@@ -8,7 +8,7 @@
                 </div>
         {% endif %}
         {% if can_downvote(current_user, post.community) %}
-                <div class="downvote_button digits_{{ digits(post.down_votes) }} {{ downvoted_class }}" role="button" aria-label="{{ _('DownVote') }}"
+                <div class="downvote_button {{ downvoted_class }}" role="button" aria-label="{{ _('DownVote') }}"
                  hx-post="/post/{{ post.id }}/downvote" hx-trigger="click throttle:1s" hx-target="closest .voting_buttons" tabindex="0">
                         <span class="fe fe-arrow-down"></span>
                         {{ shorten_number(post.down_votes) }}
diff --git a/app/topic/routes.py b/app/topic/routes.py
index b560d99e..ce173682 100644
--- a/app/topic/routes.py
+++ b/app/topic/routes.py
@@ -7,7 +7,7 @@ from flask_babel import _
 from sqlalchemy import text, desc
 
 from app.activitypub.signature import post_request
-from app.constants import SUBSCRIPTION_NONMEMBER
+from app.constants import SUBSCRIPTION_NONMEMBER, POST_TYPE_IMAGE, POST_TYPE_LINK
 from app.inoculation import inoculation
 from app.models import Topic, Community, Post, utcnow, CommunityMember, CommunityJoinRequest
 from app.topic import bp
@@ -65,7 +65,8 @@ def show_topic(topic_name):
                                topic_communities=topic_communities, content_filters=content_filters,
                                show_post_community=True, moderating_communities=moderating_communities(current_user.get_id()),
                                joined_communities=joined_communities(current_user.get_id()),
-                               inoculation=inoculation[randint(0, len(inoculation) - 1)])
+                               inoculation=inoculation[randint(0, len(inoculation) - 1)],
+                               POST_TYPE_LINK=POST_TYPE_LINK, POST_TYPE_IMAGE=POST_TYPE_IMAGE)
     else:
         abort(404)