indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Semicolon separators

merge-requests/30/head
Bob Mottram 2021-09-19 17:20:12 +01:00
parent 076f1ff87c
commit 8672c05bda
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -13921,9 +13921,9 @@ class PubServer(BaseHTTPRequestHandler):
if '?replydm=' in self.path: if '?replydm=' in self.path:
inReplyToUrl = self.path.split('?replydm=')[1] inReplyToUrl = self.path.split('?replydm=')[1]
inReplyToUrl = urllib.parse.unquote_plus(inReplyToUrl) inReplyToUrl = urllib.parse.unquote_plus(inReplyToUrl)
if '?' in inReplyToUrl: if ';' in inReplyToUrl:
# multiple parameters # multiple parameters
mentionsList = inReplyToUrl.split('?') mentionsList = inReplyToUrl.split(';')
for m in mentionsList: for m in mentionsList:
if m.startswith('mention='): if m.startswith('mention='):
replyHandle = m.replace('mention=', '') replyHandle = m.replace('mention=', '')

4
webapp_column_left.py
View File

@ -53,7 +53,7 @@ def _getLeftColumnShares(baseDir: str,
ctr = 0 ctr = 0
for published, item in sharesJson.items(): for published, item in sharesJson.items():
sharedesc = item['displayName'] sharedesc = item['displayName']
if '<' in sharedesc or '?' in sharedesc: if '<' in sharedesc or ';' in sharedesc:
continue continue
shareId = item['shareId'] shareId = item['shareId']
# selecting this link calls htmlShowShare # selecting this link calls htmlShowShare
@ -95,7 +95,7 @@ def _getLeftColumnWanted(baseDir: str,
ctr = 0 ctr = 0
for published, item in sharesJson.items(): for published, item in sharesJson.items():
sharedesc = item['displayName'] sharedesc = item['displayName']
if '<' in sharedesc or '?' in sharedesc: if '<' in sharedesc or ';' in sharedesc:
continue continue
shareId = item['shareId'] shareId = item['shareId']
# selecting this link calls htmlShowShare # selecting this link calls htmlShowShare

6
webapp_timeline.py
View File

@ -981,18 +981,18 @@ def htmlIndividualShare(domain: str, shareId: str,
item['itemPrice'] + ' ' + item['itemCurrency'] item['itemPrice'] + ' ' + item['itemCurrency']
profileStr += '</p>\n' profileStr += '</p>\n'
sharedesc = item['displayName'] sharedesc = item['displayName']
if '<' not in sharedesc and '?' not in sharedesc: if '<' not in sharedesc and ';' not in sharedesc:
if showContact: if showContact:
contactActor = item['actor'] contactActor = item['actor']
profileStr += \ profileStr += \
'<p>' + \ '<p>' + \
'<a href="' + actor + \ '<a href="' + actor + \
'?replydm=sharedesc:' + sharedesc + \ '?replydm=sharedesc:' + sharedesc + \
'?mention=' + contactActor + '"><button class="button">' + \ ';mention=' + contactActor + '"><button class="button">' + \
translate['Contact'] + '</button></a>\n' translate['Contact'] + '</button></a>\n'
profileStr += \ profileStr += \
'<a href="' + contactActor + '"><button class="button">' + \ '<a href="' + contactActor + '"><button class="button">' + \
translate['View'] + '</button></a>\n' translate['Profile'] + '</button></a>\n'
if removeButton and domain in shareId: if removeButton and domain in shareId:
if sharesFileType == 'shares': if sharesFileType == 'shares':
profileStr += \ profileStr += \

2
webapp_utils.py
View File

@ -1339,7 +1339,7 @@ def htmlSearchResultShare(baseDir: str, sharedItem: {}, translate: {},
sharedItemsForm += \ sharedItemsForm += \
'<p>' + \ '<p>' + \
'<a href="' + actor + '?replydm=sharedesc:' + \ '<a href="' + actor + '?replydm=sharedesc:' + \
sharedItem['displayName'] + '?mention=' + contactActor + \ sharedItem['displayName'] + ';mention=' + contactActor + \
'"><button class="button">' + contactTitleStr + \ '"><button class="button">' + contactTitleStr + \
'</button></a>\n' + \ '</button></a>\n' + \
'<a href="' + contactActor + '"><button class="button">' + \ '<a href="' + contactActor + '"><button class="button">' + \