From 2a15002e7b7ceb0c8e576c023eaced70eb3b18ed Mon Sep 17 00:00:00 2001
From: n9k <originalcocaineninja@protonmail.com>
Date: Wed, 29 Jun 2022 04:48:49 +0000
Subject: [PATCH 1/2] Minor: remove module-global `Compress` singleton

---
 anonstream/__init__.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/anonstream/__init__.py b/anonstream/__init__.py
index a6f34c0..1d7d3b2 100644
--- a/anonstream/__init__.py
+++ b/anonstream/__init__.py
@@ -9,8 +9,6 @@ from anonstream.config import update_flask_from_toml
 from anonstream.utils.captcha import create_captcha_factory, create_captcha_signer
 from anonstream.quart import Quart
 
-compress = Compress()
-
 def create_app(toml_config):
     app = Quart('anonstream', static_folder=None)
     app.jinja_options['trim_blocks'] = True
@@ -21,7 +19,7 @@ def create_app(toml_config):
     print('Broadcaster password:', auth_password)
 
     # Compress some responses
-    compress.init_app(app)
+    Compress(app)
     app.config.update({
         'COMPRESS_MIN_SIZE': 2048,
         'COMPRESS_LEVEL': 9,

From fc613737e039b394df5f555ab9e5e7ce1edbefab Mon Sep 17 00:00:00 2001
From: n9k <originalcocaineninja@protonmail.com>
Date: Wed, 29 Jun 2022 04:56:16 +0000
Subject: [PATCH 2/2] Store version string

---
 anonstream/__init__.py         | 9 +++++++--
 anonstream/routes/core.py      | 1 +
 anonstream/templates/home.html | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/anonstream/__init__.py b/anonstream/__init__.py
index 1d7d3b2..89fdf7e 100644
--- a/anonstream/__init__.py
+++ b/anonstream/__init__.py
@@ -9,15 +9,20 @@ from anonstream.config import update_flask_from_toml
 from anonstream.utils.captcha import create_captcha_factory, create_captcha_signer
 from anonstream.quart import Quart
 
+__version__ = '1.3.4'
+
 def create_app(toml_config):
     app = Quart('anonstream', static_folder=None)
-    app.jinja_options['trim_blocks'] = True
-    app.jinja_options['lstrip_blocks'] = True
+    app.version = __version__
 
     auth_password = update_flask_from_toml(toml_config, app.config)
     print('Broadcaster username:', app.config['AUTH_USERNAME'])
     print('Broadcaster password:', auth_password)
 
+    # Nicer whitespace in templates
+    app.jinja_options['trim_blocks'] = True
+    app.jinja_options['lstrip_blocks'] = True
+
     # Compress some responses
     Compress(app)
     app.config.update({
diff --git a/anonstream/routes/core.py b/anonstream/routes/core.py
index bebd50a..d0ab784 100644
--- a/anonstream/routes/core.py
+++ b/anonstream/routes/core.py
@@ -37,6 +37,7 @@ async def home(timestamp, user_or_token):
                 'home.html',
                 csp=generate_csp(),
                 user=user_or_token,
+                version=current_app.version,
             )
     return response
 
diff --git a/anonstream/templates/home.html b/anonstream/templates/home.html
index 90a70e3..948ff1b 100644
--- a/anonstream/templates/home.html
+++ b/anonstream/templates/home.html
@@ -41,7 +41,7 @@
     <a href="#chat">chat</a>
     <a href="#both">both</a>
   </nav>
-  <footer>anonstream 1.3.4 &mdash; <a href="https://git.076.ne.jp/ninya9k/anonstream" target="_blank">source</a></footer>
+  <footer>anonstream {{ version }} &mdash; <a href="https://git.076.ne.jp/ninya9k/anonstream" target="_blank">source</a></footer>
   <script src="{{ url_for('static', filename='anonstream.js') }}" type="text/javascript"></script>
 </body>
 </html>