diff --git a/daemon.py b/daemon.py index eb46e9e29..d34dfee56 100644 --- a/daemon.py +++ b/daemon.py @@ -10557,6 +10557,7 @@ class PubServer(BaseHTTPRequestHandler): inReplyToUrl.replace('sharedesc:', '') shareDescription = \ urllib.parse.unquote_plus(shareDescription.strip()) + shareDescription = shareDescription.replace('_', ' ') self.path = self.path.split('?replydm=')[0]+'/newdm' if self.server.debug: print('DEBUG: replydm path ' + self.path) diff --git a/webapp_column_left.py b/webapp_column_left.py index 54e7db72d..589333b6d 100644 --- a/webapp_column_left.py +++ b/webapp_column_left.py @@ -49,9 +49,12 @@ def getLeftColumnShares(baseDir: str, ctr = 0 for published, item in sharesJson.items(): sharedesc = item['displayName'] + if '<' in sharedesc or '?' in sharedesc: + continue contactActor = item['actor'] shareLink = actor + \ - '?replydm=sharedesc:' + sharedesc + \ + '?replydm=sharedesc:' + \ + sharedesc.replace(' ', '_') + \ '?mention=' + contactActor linksList.append(sharedesc + ' ' + shareLink) ctr += 1 diff --git a/webapp_timeline.py b/webapp_timeline.py index ada794366..526f37fca 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -627,18 +627,20 @@ def htmlIndividualShare(actor: str, item: {}, translate: {}, '' + translate['Category'] + ': ' + item['category'] + ' ' profileStr += \ '' + translate['Location'] + ': ' + item['location'] + '

\n' - if showContact: - contactActor = item['actor'] - profileStr += \ - '

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

\n' + if removeButton: + profileStr += \ + ' \n' profileStr += '\n' return profileStr