From f36265443efae3d5aae8f9d3c844331fcc81ec6c Mon Sep 17 00:00:00 2001
From: n9k <originalcocaineninja@protonmail.com>
Date: Tue, 22 Feb 2022 23:03:14 +0000
Subject: [PATCH] Beautify nojs chat template, strip jinja whitespace

---
 anonstream/__init__.py              |  4 ++++
 anonstream/templates/nojs_chat.html | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/anonstream/__init__.py b/anonstream/__init__.py
index 440c878..2fcbd73 100644
--- a/anonstream/__init__.py
+++ b/anonstream/__init__.py
@@ -20,6 +20,10 @@ def create_app(config_file):
     print('Broadcaster password:', auth_password)
 
     app = Quart('anonstream')
+    app.jinja_options.update({
+        'trim_blocks': True,
+        'lstrip_blocks': True,
+    })
     app.config.update({
         'SECRET_KEY': config['secret_key'].encode(),
         'AUTH_USERNAME': config['auth']['username'],
diff --git a/anonstream/templates/nojs_chat.html b/anonstream/templates/nojs_chat.html
index 1d841b4..5b53681 100644
--- a/anonstream/templates/nojs_chat.html
+++ b/anonstream/templates/nojs_chat.html
@@ -136,7 +136,21 @@
     {% for message in messages | reverse %}
       <li class="chat-message" data-seq="{{ message.seq }}" data-token-hash="{{ user.token_hash }}">
         {% with user = users_by_token[message.token] %}
-          <time class="chat-message__time" datetime="{{ message.date }}T{{ message.time_seconds }}Z" title="{{ message.date }} {{ message.time_seconds }}">{{ message.time_minutes }}</time>&nbsp;<span class="chat-message__name" style="color:{{ user.color }};">{{ user.name or get_default_name(user) }}{% if not user.broadcaster and user.name is none %}<sup class="chat-message__name__tag">{{ user.tag }}</sup>{% endif %}</span>{% if user.tripcode %}<span class="for-tripcode">&nbsp;</span><span class="tripcode for-tripcode" style="background-color:{{ user.tripcode.background_color }};color:{{ user.tripcode.foreground_color }};">{{ user.tripcode.digest }}</span>{% endif %}:&nbsp;<span class="chat-message__markup">{{ message.markup }}</span>
+          <time class="chat-message__time" datetime="{{ message.date }}T{{ message.time_seconds }}Z" title="{{ message.date }} {{ message.time_seconds }}">{{ message.time_minutes }}</time>
+          {{- '&nbsp;' | safe -}}
+          <span class="chat-message__name" style="color:{{ user.color }};">
+            {{- user.name or get_default_name(user) -}}
+            {%- if not user.broadcaster and user.name is none -%}
+              <sup class="chat-message__name__tag">{{ user.tag }}</sup>
+            {%- endif -%}
+          </span>
+          {%- if user.tripcode -%}
+            <span class="for-tripcode">&nbsp;</span>
+            {{- '' -}}
+            <span class="tripcode for-tripcode" style="background-color:{{ user.tripcode.background_color }};color:{{ user.tripcode.foreground_color }};">{{ user.tripcode.digest }}</span>
+          {%- endif -%}
+          {{- ':&nbsp;' | safe -}}
+          <span class="chat-message__markup">{{ message.markup }}</span>
         {% endwith %}
       </li>
     {% endfor %}