From 4f58cc98c1eb99d02f0fd463b3aca0e72aaa1518 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 27 Jul 2021 20:48:31 +0100
Subject: [PATCH] Replacing colon

---
 daemon.py       | 3 +--
 shares.py       | 4 +++-
 webapp_utils.py | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/daemon.py b/daemon.py
index acc4bad0d..f5c5aa2fa 100644
--- a/daemon.py
+++ b/daemon.py
@@ -10230,8 +10230,7 @@ class PubServer(BaseHTTPRequestHandler):
             return True
 
         mediaStr = path.split('/sharefiles/')[1]
-        mediaFilename = \
-            baseDir + '/sharefiles/' + mediaStr
+        mediaFilename = baseDir + '/sharefiles/' + mediaStr
         if not os.path.isfile(mediaFilename):
             self._404()
             return True
diff --git a/shares.py b/shares.py
index 5e7b51aaf..7c912b4ad 100644
--- a/shares.py
+++ b/shares.py
@@ -91,7 +91,9 @@ def getValidSharedItemID(actor: str, displayName: str) -> str:
         displayName = displayName.replace(ch, '-')
     displayName = displayName.replace('.', '_')
     displayName = displayName.replace("’", "'")
-    return actor.replace('/', '#') + '#shareditems#' + displayName
+    actor = actor.replace('://', '--##')
+    actor = actor.replace('/', '#')
+    return actor + '#shareditems#' + displayName
 
 
 def removeSharedItem(baseDir: str, nickname: str, domain: str,
diff --git a/webapp_utils.py b/webapp_utils.py
index 7b2a6bd3c..5b9db3633 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -384,6 +384,7 @@ def sharesTimelineJson(actor: str, pageNumber: int, itemsPerPage: int,
                         shareActor = ''
                         if '#shareditems#' in itemID:
                             shareActor = itemID.split('#shareditems#')[0]
+                            shareActor = shareActor.replace('--##', '://')
                             shareActor = shareActor.replace('#', '/')
                         item['actor'] = shareActor
                         allSharesJson[str(item['published'])] = item