From e4d915338ade57ec34dd81b2654d3be6f88d6af4 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Mon, 9 Dec 2024 09:19:51 +1300
Subject: [PATCH] reduce duplication in teasers #377

---
 app/templates/post/post_teaser/_article.html | 14 +----------
 app/templates/post/post_teaser/_image.html   | 17 +------------
 app/templates/post/post_teaser/_link.html    | 20 +---------------
 app/templates/post/post_teaser/_poll.html    | 20 +++++-----------
 app/templates/post/post_teaser/_title.html   | 25 ++++++++++++++++++++
 app/templates/post/post_teaser/_video.html   | 22 +----------------
 6 files changed, 35 insertions(+), 83 deletions(-)
 create mode 100644 app/templates/post/post_teaser/_title.html

diff --git a/app/templates/post/post_teaser/_article.html b/app/templates/post/post_teaser/_article.html
index 70f3fc55..f5c07503 100644
--- a/app/templates/post/post_teaser/_article.html
+++ b/app/templates/post/post_teaser/_article.html
@@ -1,17 +1,5 @@
 <div class="col post_teaser_body">
-    <h3>{% if post.sticky -%}<span class="fe fe-sticky-left"></span>{% endif -%}<a href="{{ url_for('activitypub.post_ap', post_id=post.id, sort='new' if sort == 'active' else None) }}" class="post_teaser_title_a">{{ post.title }}</a>
-        {% if post.nsfw -%}<span class="warning_badge nsfw" title="{{ _('Not safe for work') }}">nsfw</span>{% endif -%}
-        {% if post.nsfl -%}<span class="warning_badge nsfl" title="{{ _('Potentially emotionally scarring content') }}">nsfl</span>{% endif -%}
-        {% if post.reports > 0 and current_user.is_authenticated and post.community.is_moderator(current_user) -%}
-            <span class="red fe fe-report" title="{{ _('Reported. Check post for issues.') }}"></span>
-        {% endif -%}
-        {% if post.sticky -%}<span class="fe fe-sticky-right"></span>{% endif -%}
-        {% if post.deleted -%}<span class="red fe fe-delete" title="{{ _('Post deleted') }}"></span>{% endif -%}
-    </h3>
-    <span class="author small">{% if show_post_community -%}<a href="/c/{{ post.community.link() }}" aria-label="{{ _('Go to community %(name)s', name=post.community.name) }}">
-        {% if post.community.icon_id and not low_bandwidth %}<img class="community_icon_small rounded-circle" src="{{ post.community.icon_image('tiny') }}" alt="Community icon" />{% endif -%}
-        c/{{ post.community.name }}</a>{% endif -%}
-        by {{ render_username(post.author) }} <time datetime="{{ post.last_active }}">{{ post.posted_at_localized(sort, locale) }}</time></span>
+    {% include "post/post_teaser/_title.html" %}
     {% if post.body_html -%}
         <div class="post_teaser_article_preview small post_teaser_clickable">
             {{ first_paragraph(post.body_html) | safe }}
diff --git a/app/templates/post/post_teaser/_image.html b/app/templates/post/post_teaser/_image.html
index e45a97dc..755f88b7 100644
--- a/app/templates/post/post_teaser/_image.html
+++ b/app/templates/post/post_teaser/_image.html
@@ -1,20 +1,5 @@
 <div class="col post_teaser_body">
-    <h3>{% if post.sticky -%}<span class="fe fe-sticky-left"></span>{% endif -%}<a href="{{ url_for('activitypub.post_ap', post_id=post.id, sort='new' if sort == 'active' else None) }}" class="post_teaser_title_a">{{ post.title }}</a>
-        {% if post.type == POST_TYPE_IMAGE -%}
-            <span class="fe fe-image" aria-hidden="true"> </span>
-        {% endif -%}
-        {% if post.nsfw -%}<span class="warning_badge nsfw" title="{{ _('Not safe for work') }}">nsfw</span>{% endif -%}
-        {% if post.nsfl -%}<span class="warning_badge nsfl" title="{{ _('Potentially emotionally scarring content') }}">nsfl</span>{% endif -%}
-        {% if post.reports > 0 and current_user.is_authenticated and post.community.is_moderator(current_user) -%}
-            <span class="red fe fe-report" title="{{ _('Reported. Check post for issues.') }}"></span>
-        {% endif -%}
-        {% if post.sticky -%}<span class="fe fe-sticky-right"></span>{% endif -%}
-        {% if post.deleted -%}<span class="red fe fe-delete" title="{{ _('Post deleted') }}"></span>{% endif -%}
-    </h3>
-    <span class="author small">{% if show_post_community -%}<a href="/c/{{ post.community.link() }}" aria-label="{{ _('Go to community %(name)s', name=post.community.name) }}">
-        {% if post.community.icon_id and not low_bandwidth %}<img class="community_icon_small rounded-circle" src="{{ post.community.icon_image('tiny') }}" alt="Community icon" />{% endif -%}
-        c/{{ post.community.name }}</a>{% endif -%}
-        by {{ render_username(post.author) }} <time datetime="{{ post.last_active }}">{{ post.posted_at_localized(sort, locale) }}</time></span>
+    {% include "post/post_teaser/_title.html" %}
     {% if post.image_id and not low_bandwidth -%}
         <div class="post_teaser_image_preview">
             <a href="{{ post.image.view_url() }}" rel="nofollow ugc" aria-label="{{ _('View image') }}" target="_blank"><img src="{{ post.image.medium_url() }}"
diff --git a/app/templates/post/post_teaser/_link.html b/app/templates/post/post_teaser/_link.html
index 84360456..f54e044f 100644
--- a/app/templates/post/post_teaser/_link.html
+++ b/app/templates/post/post_teaser/_link.html
@@ -1,23 +1,5 @@
 <div class="col post_teaser_body">
-    <h3>{% if post.sticky -%}<span class="fe fe-sticky-left"></span>{% endif -%}<a href="{{ url_for('activitypub.post_ap', post_id=post.id, sort='new' if sort == 'active' else None) }}" class="post_teaser_title_a">{{ post.title }}</a>
-        {% if post.domain_id -%}
-            {% if post.url.endswith('.mp3') -%}
-                <span class="fe fe-audio" aria-hidden="true"></span>
-            {% endif -%}
-            <span class="domain_link" aria-hidden="true">(<a href="/d/{{ post.domain_id }}" aria-label="{{ _('All posts about this domain') }}">{{ post.domain.name }}</a>)</span>
-        {% endif -%}
-        {% if post.nsfw -%}<span class="warning_badge nsfw" title="{{ _('Not safe for work') }}">nsfw</span>{% endif -%}
-        {% if post.nsfl -%}<span class="warning_badge nsfl" title="{{ _('Potentially emotionally scarring content') }}">nsfl</span>{% endif -%}
-        {% if post.reports > 0 and current_user.is_authenticated and post.community.is_moderator(current_user) -%}
-            <span class="red fe fe-report" title="{{ _('Reported. Check post for issues.') }}"></span>
-        {% endif -%}
-        {% if post.sticky -%}<span class="fe fe-sticky-right"></span>{% endif -%}
-        {% if post.deleted -%}<span class="red fe fe-delete" title="{{ _('Post deleted') }}"></span>{% endif -%}
-    </h3>
-    <span class="author small">{% if show_post_community -%}<a href="/c/{{ post.community.link() }}" aria-label="{{ _('Go to community %(name)s', name=post.community.name) }}">
-        {% if post.community.icon_id and not low_bandwidth %}<img class="community_icon_small rounded-circle" src="{{ post.community.icon_image('tiny') }}" alt="Community icon" />{% endif -%}
-        c/{{ post.community.name }}</a>{% endif -%}
-        by {{ render_username(post.author) }} <time datetime="{{ post.last_active }}">{{ post.posted_at_localized(sort, locale) }}</time></span>
+    {% include "post/post_teaser/_title.html" %}
     {% if post.body_html -%}
         <div class="post_teaser_link_preview small post_teaser_clickable">
             {{ first_paragraph(post.body_html) | safe }}
diff --git a/app/templates/post/post_teaser/_poll.html b/app/templates/post/post_teaser/_poll.html
index 5d0c8542..da319110 100644
--- a/app/templates/post/post_teaser/_poll.html
+++ b/app/templates/post/post_teaser/_poll.html
@@ -1,18 +1,10 @@
 <div class="col post_teaser_body">
-    <h3>{% if post.sticky -%}<span class="fe fe-sticky-left"></span>{% endif -%}<a href="{{ url_for('activitypub.post_ap', post_id=post.id, sort='new' if sort == 'active' else None) }}" class="post_teaser_title_a">{{ post.title }}</a>
-        <span class="fe fe-poll" aria-hidden="true"> </span>
-        {% if post.nsfw -%}<span class="warning_badge nsfw" title="{{ _('Not safe for work') }}">nsfw</span>{% endif -%}
-        {% if post.nsfl -%}<span class="warning_badge nsfl" title="{{ _('Potentially emotionally scarring content') }}">nsfl</span>{% endif -%}
-        {% if post.reports > 0 and current_user.is_authenticated and post.community.is_moderator(current_user) -%}
-            <span class="red fe fe-report" title="{{ _('Reported. Check post for issues.') }}"></span>
-        {% endif -%}
-        {% if post.sticky -%}<span class="fe fe-sticky-right"></span>{% endif -%}
-        {% if post.deleted -%}<span class="red fe fe-delete" title="{{ _('Post deleted') }}"></span>{% endif -%}
-    </h3>
-    <span class="author small">{% if show_post_community -%}<a href="/c/{{ post.community.link() }}" aria-label="{{ _('Go to community %(name)s', name=post.community.name) }}">
-        {% if post.community.icon_id and not low_bandwidth %}<img class="community_icon_small rounded-circle" src="{{ post.community.icon_image('tiny') }}" alt="Community icon" />{% endif -%}
-        c/{{ post.community.name }}</a>{% endif -%}
-        by {{ render_username(post.author) }} <time datetime="{{ post.last_active }}">{{ post.posted_at_localized(sort, locale) }}</time></span>
+    {% include "post/post_teaser/_title.html" %}
+    {% if post.body_html -%}
+        <div class="post_teaser_link_preview small post_teaser_clickable">
+            {{ first_paragraph(post.body_html) | safe }}
+        </div>
+    {% endif -%}
     {% include "post/post_teaser/_utilities_bar.html" %}
 </div>
 <div class="col col-2 col_thumbnail">
diff --git a/app/templates/post/post_teaser/_title.html b/app/templates/post/post_teaser/_title.html
new file mode 100644
index 00000000..a0e5a95a
--- /dev/null
+++ b/app/templates/post/post_teaser/_title.html
@@ -0,0 +1,25 @@
+<h3>{% if post.sticky -%}<span class="fe fe-sticky-left"></span>{% endif -%}<a href="{{ url_for('activitypub.post_ap', post_id=post.id, sort='new' if sort == 'active' else None) }}" class="post_teaser_title_a">{{ post.title }}</a>
+    {% if post.type == POST_TYPE_IMAGE -%}
+        <span class="fe fe-image" aria-hidden="true"> </span>
+    {% endif -%}
+    {% if post.domain_id and post.url -%}
+        {% if post.url.endswith('.mp3') -%}
+            <span class="fe fe-audio" aria-hidden="true"></span>
+        {% endif -%}
+        {% if post.type == POST_TYPE_VIDEO -%}
+                <span class="fe fe-video" aria-hidden="true"></span>
+        {% endif -%}
+        <span class="domain_link" aria-hidden="true">(<a href="/d/{{ post.domain_id }}" aria-label="{{ _('All posts about this domain') }}">{{ post.domain.name }}</a>)</span>
+    {% endif -%}
+    {% if post.nsfw -%}<span class="warning_badge nsfw" title="{{ _('Not safe for work') }}">nsfw</span>{% endif -%}
+    {% if post.nsfl -%}<span class="warning_badge nsfl" title="{{ _('Potentially emotionally scarring content') }}">nsfl</span>{% endif -%}
+    {% if post.reports > 0 and current_user.is_authenticated and post.community.is_moderator(current_user) -%}
+        <span class="red fe fe-report" title="{{ _('Reported. Check post for issues.') }}"></span>
+    {% endif -%}
+    {% if post.sticky -%}<span class="fe fe-sticky-right"></span>{% endif -%}
+    {% if post.deleted -%}<span class="red fe fe-delete" title="{{ _('Post deleted') }}"></span>{% endif -%}
+</h3>
+<span class="author small">{% if show_post_community -%}<a href="/c/{{ post.community.link() }}" aria-label="{{ _('Go to community %(name)s', name=post.community.name) }}">
+    {% if post.community.icon_id and not low_bandwidth %}<img class="community_icon_small rounded-circle" src="{{ post.community.icon_image('tiny') }}" alt="Community icon" />{% endif -%}
+    c/{{ post.community.name }}</a>{% endif -%}
+    by {{ render_username(post.author) }} <time datetime="{{ post.last_active }}">{{ post.posted_at_localized(sort, locale) }}</time></span>
\ No newline at end of file
diff --git a/app/templates/post/post_teaser/_video.html b/app/templates/post/post_teaser/_video.html
index 821df3de..b33d2221 100644
--- a/app/templates/post/post_teaser/_video.html
+++ b/app/templates/post/post_teaser/_video.html
@@ -1,25 +1,5 @@
 <div class="col post_teaser_body">
-    <h3>{% if post.sticky -%}<span class="fe fe-sticky-left"></span>{% endif -%}<a href="{{ url_for('activitypub.post_ap', post_id=post.id, sort='new' if sort == 'active' else None) }}" class="post_teaser_title_a">{{ post.title }}</a>
-        {% if  post.domain_id -%}
-            {% if post.url and 'youtube.com' in post.url -%}
-                <span class="fe fe-video" aria-hidden="true"></span>
-            {% elif post.url.endswith('.mp3') -%}
-                <span class="fe fe-audio" aria-hidden="true"></span>
-            {% endif -%}
-            <span class="domain_link" aria-hidden="true">(<a href="/d/{{ post.domain_id }}" aria-label="{{ _('All posts about this domain') }}">{{ post.domain.name }}</a>)</span>
-        {% endif -%}
-        {% if post.nsfw -%}<span class="warning_badge nsfw" title="{{ _('Not safe for work') }}">nsfw</span>{% endif -%}
-        {% if post.nsfl -%}<span class="warning_badge nsfl" title="{{ _('Potentially emotionally scarring content') }}">nsfl</span>{% endif -%}
-        {% if post.reports > 0 and current_user.is_authenticated and post.community.is_moderator(current_user) -%}
-            <span class="red fe fe-report" title="{{ _('Reported. Check post for issues.') }}"></span>
-        {% endif -%}
-        {% if post.sticky -%}<span class="fe fe-sticky-right"></span>{% endif -%}
-        {% if post.deleted -%}<span class="red fe fe-delete" title="{{ _('Post deleted') }}"></span>{% endif -%}
-    </h3>
-    <span class="author small">{% if show_post_community -%}<a href="/c/{{ post.community.link() }}" aria-label="{{ _('Go to community %(name)s', name=post.community.name) }}">
-        {% if post.community.icon_id and not low_bandwidth %}<img class="community_icon_small rounded-circle" src="{{ post.community.icon_image('tiny') }}" alt="Community icon" />{% endif -%}
-        c/{{ post.community.name }}</a>{% endif -%}
-        by {{ render_username(post.author) }} <time datetime="{{ post.last_active }}">{{ post.posted_at_localized(sort, locale) }}</time></span>
+    {% include "post/post_teaser/_title.html" %}
     {% if not low_bandwidth %}
         <div class="post_teaser_video_preview">
             <div class="max_width_512">