From 626ee41f6b74b1f63de488cd51fc9ce9887a1a57 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 23 Oct 2019 13:47:06 +0100
Subject: [PATCH] Include username in path for full screen image

---
 daemon.py       | 4 ++--
 webinterface.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/daemon.py b/daemon.py
index d29286d8..6098d73f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -754,7 +754,7 @@ class PubServer(BaseHTTPRequestHandler):
                '/emoji/' not in self.path and \
                '/tags/' not in self.path and \
                '/avatars/' not in self.path and \
-               not self.path.startswith('/fullscreen') and \
+               '/fullscreen?' not in self.path and \
                '/icons/' not in self.path:
                 divertToLoginScreen=True
                 if self.path.startswith('/users/'):
@@ -973,7 +973,7 @@ class PubServer(BaseHTTPRequestHandler):
             return
 
         # full screen images shown from the media timeline
-        if htmlGET and authorized and self.path.startswith('/fullscreen'):
+        if htmlGET and authorized and '/fullscreen?' in self.path:
             imageFilename=self.path.split('?img=')[1]
             if '?' in imageFilename:
                 imageFilename=imageFilename.split('?')[0]
diff --git a/webinterface.py b/webinterface.py
index 64953b6b..5d1e6635 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1922,7 +1922,7 @@ def individualPostAsHtml(iconsDir: str,translate: {}, \
                             if boxName=='tlmedia':
                                 galleryStr+= \
                                     '<div class="gallery">\n' \
-                                    '  <a href="/fullscreen?img='+attach['url']+'?desc='+imageDescription+'">\n' \
+                                    '  <a href="/users/'+nickname+'/fullscreen?img='+attach['url']+'?desc='+imageDescription+'">\n' \
                                     '    <img loading="lazy" src="'+attach['url']+'" alt="'+imageDescription+'" title="'+imageDescription+'" width="600" height="400">\n' \
                                     '  </a>\n</div>\n'
                             attachmentStr+= \