From ec5bee8daeea413922ffce2a7ffd750674088618 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 26 Aug 2021 15:20:42 +0300
Subject: ActivityPub: reduce newlines in note template to make Mastodon happy

---
 src/main/resources/templates/layouts/note.html      | 6 +-----
 src/main/resources/templates/views/macros/tags.html | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/layouts/note.html b/src/main/resources/templates/layouts/note.html
index e832dc63..e22d76d5 100644
--- a/src/main/resources/templates/layouts/note.html
+++ b/src/main/resources/templates/layouts/note.html
@@ -1,5 +1 @@
-{% import "views/macros/tags" %}
-<p>{{ msg | formatMessage }}</p>
-{% if msg.tags | length > 0 %}
-<div class="msg-tags">{{ allTags(baseUri, msg.tags | tagsList) }}</div>
-{% endif %}
\ No newline at end of file
+{% import "views/macros/tags" %}<p>{{ msg | formatMessage }}</p>{% if msg.tags | length > 0 %}<div class="msg-tags">{{ allTags(baseUri, msg.tags | tagsList) }}</div>{% endif %}
\ No newline at end of file
diff --git a/src/main/resources/templates/views/macros/tags.html b/src/main/resources/templates/views/macros/tags.html
index c52847fc..d1b3fdea 100644
--- a/src/main/resources/templates/views/macros/tags.html
+++ b/src/main/resources/templates/views/macros/tags.html
@@ -1,11 +1,7 @@
 {% macro tags(uname="", tagsList) %}
-{% for tag in tagsList %}
-<a class="hashtag" href="/{{ uname }}/?tag={{ tag | urlencode }}">{{ tag }}</a>
-{% endfor %}
+{% for tag in tagsList %}<a class="hashtag" href="/{{ uname }}/?tag={{ tag | urlencode }}">{{ tag }}</a>{% endfor %}
 {% endmacro %}
 
 {% macro allTags(baseUri, tagsList) %}
-{% for tag in tagsList %}
-<a class="hashtag" href="{{ baseUri }}tag/{{ tag | urlencode }}">#{{ tag }}</a>
-{% endfor %}
+{% for tag in tagsList %}<a class="hashtag" href="{{ baseUri }}tag/{{ tag | urlencode }}">#{{ tag }}</a>{% endfor %}
 {% endmacro %}
\ No newline at end of file
-- 
cgit v1.2.3