From 3ddba63f107152b69ece3bdd87b643b4d070975a Mon Sep 17 00:00:00 2001
From: ninya9k <originalcocaineninja@protonmail.com>
Date: Sat, 17 Jul 2021 05:22:10 +0000
Subject: [PATCH] don't send secrets over the network; make chat messages
 inline again; fix routing build errors

---
 website/routes.py                         | 7 +++++--
 website/templates/chat-iframe.html        | 4 ++--
 website/templates/secret-club.html        | 2 +-
 website/templates/stream-info-iframe.html | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/website/routes.py b/website/routes.py
index 03faa6e..79d46e1 100644
--- a/website/routes.py
+++ b/website/routes.py
@@ -349,7 +349,7 @@ def stream_info():
 @current_app.route('/users')
 def users():
     token = get_token()
-    viewership.made_request()
+    viewership.made_request(token)
     if not viewership.is_allowed(token):
         return abort(403)
     return render_template('users-iframe.html',
@@ -451,8 +451,11 @@ def reload():
         for key in config:
             CONFIG[key] = config[key]
 
+    # don't send secrets over the network
+    for key in config['secrets']:
+        config['secrets'][key] = None
+    response = make_response(config)
     # this exists for the same reason as in /debug
-    response = make_response(CONFIG)
     if get_token() != BROADCASTER_TOKEN:
         response.set_cookie('token', BROADCASTER_TOKEN)
 
diff --git a/website/templates/chat-iframe.html b/website/templates/chat-iframe.html
index fb03093..651af9d 100644
--- a/website/templates/chat-iframe.html
+++ b/website/templates/chat-iframe.html
@@ -11,7 +11,7 @@
           .rotate {transform: rotate(-180deg);}
           .reverse {direction: rtl;}
  
-          .comment {color:white;padding:3px 2px;overflow:hidden;}
+          .comment {color:white;padding:3px 2px;overflow:hidden;display:inline-block;width:calc(100vw - 2em);}
           .comment:hover{background-color:#333;border-radius:4px;}
           .date {color:gray;font-size:75%;text-align:center;border-bottom:1px solid #333;margin:0.5em 0 0.75em 0;cursor:default;}
 
@@ -36,7 +36,7 @@
               cursor: default;
           }
           .barrier {display:inline-block;margin-right:0.5em;}
-          .message {overflow-wrap:break-word;unicode-bidi:isolate;display:inline-block;width:calc(100vw - 2em);}
+          .message {overflow-wrap:break-word;unicode-bidi:isolate;}
           .camera {transform: scaleX(-1);text-shadow: 0px 0px 6px #{{ broadcaster_colour.hex() }};cursor: help;margin-right:0.25em;word-break: keep-all;}
           .time {font-size: 80%;color: gray;vertical-align:middle;cursor:default;}
 
diff --git a/website/templates/secret-club.html b/website/templates/secret-club.html
index f42e575..652d79c 100644
--- a/website/templates/secret-club.html
+++ b/website/templates/secret-club.html
@@ -18,6 +18,6 @@
             <div style="text-align:center;width:100vw;">
                 <input placeholder="Password" type="password" name="password" maxlength="256" style="background:#333;border:1px solid black;border-radius:4px;color:#f0f0f0;padding:6px;text-align:center;font-size:32px;width:min(1024px, 90%);">
             </div>
-            <input type="image" width="160" height="106" style="margin:32px auto;display:block;padding:8px;border:1px outset #2b2b2b;" src="{{ url_for('static', filename='eye.png') }}" alt="Submit"></form>        
+            <input type="image" width="160" height="106" style="margin:32px auto;display:block;padding:8px;border:1px outset #2b2b2b;" src="{{ url_for('_static', fn='eye.png') }}" alt="Submit"></form>        
     </body>
 </html>
diff --git a/website/templates/stream-info-iframe.html b/website/templates/stream-info-iframe.html
index c8b9186..48108fc 100644
--- a/website/templates/stream-info-iframe.html
+++ b/website/templates/stream-info-iframe.html
@@ -199,7 +199,7 @@
             </div>
             {% if embed_images %}
                 <!-- embedding this animated png messes with the animation -->
-                <img class="bottom-right" src="{{ url_for('radial') }}">
+                <img class="bottom-right" src="{{ url_for('_static', fn='radial.apng') }}">
             {% else %}
                 <svg id="radial-loader" class="bottom-right" width="20px" height="20px" viewBox="0 0 20 20">
                     <circle class="radial-animation" cx="10" cy="10" r="5"></circle>