From 8672c05bda806bb216c5c8d57c1e4932750d2445 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 19 Sep 2021 17:20:12 +0100 Subject: [PATCH] Semicolon separators --- daemon.py | 4 ++-- webapp_column_left.py | 4 ++-- webapp_timeline.py | 6 +++--- webapp_utils.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon.py b/daemon.py index 71658b2db..027a2807a 100644 --- a/daemon.py +++ b/daemon.py @@ -13921,9 +13921,9 @@ class PubServer(BaseHTTPRequestHandler): if '?replydm=' in self.path: inReplyToUrl = self.path.split('?replydm=')[1] inReplyToUrl = urllib.parse.unquote_plus(inReplyToUrl) - if '?' in inReplyToUrl: + if ';' in inReplyToUrl: # multiple parameters - mentionsList = inReplyToUrl.split('?') + mentionsList = inReplyToUrl.split(';') for m in mentionsList: if m.startswith('mention='): replyHandle = m.replace('mention=', '') diff --git a/webapp_column_left.py b/webapp_column_left.py index 79e710476..73968e868 100644 --- a/webapp_column_left.py +++ b/webapp_column_left.py @@ -53,7 +53,7 @@ def _getLeftColumnShares(baseDir: str, ctr = 0 for published, item in sharesJson.items(): sharedesc = item['displayName'] - if '<' in sharedesc or '?' in sharedesc: + if '<' in sharedesc or ';' in sharedesc: continue shareId = item['shareId'] # selecting this link calls htmlShowShare @@ -95,7 +95,7 @@ def _getLeftColumnWanted(baseDir: str, ctr = 0 for published, item in sharesJson.items(): sharedesc = item['displayName'] - if '<' in sharedesc or '?' in sharedesc: + if '<' in sharedesc or ';' in sharedesc: continue shareId = item['shareId'] # selecting this link calls htmlShowShare diff --git a/webapp_timeline.py b/webapp_timeline.py index fe54e8340..67492b97f 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -981,18 +981,18 @@ def htmlIndividualShare(domain: str, shareId: str, item['itemPrice'] + ' ' + item['itemCurrency'] profileStr += '

\n' sharedesc = item['displayName'] - if '<' not in sharedesc and '?' not in sharedesc: + if '<' not in sharedesc and ';' not in sharedesc: if showContact: contactActor = item['actor'] profileStr += \ '

' + \ '\n' profileStr += \ '\n' + translate['Profile'] + '\n' if removeButton and domain in shareId: if sharesFileType == 'shares': profileStr += \ diff --git a/webapp_utils.py b/webapp_utils.py index a72615322..e273586f2 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -1339,7 +1339,7 @@ def htmlSearchResultShare(baseDir: str, sharedItem: {}, translate: {}, sharedItemsForm += \ '

' + \ '\n' + \ '