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

Return to ?

merge-requests/30/head
Bob Mottram 2021-09-21 13:25:32 +01:00
parent 67a6aaa834
commit cada7845a4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -13925,9 +13925,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=', '')

10
webapp_post.py
View File

@ -313,14 +313,14 @@ def _getReplyIconHtml(baseDir: str, nickname: str, domain: str,
if postJsonObject['object'].get('attributedTo'): if postJsonObject['object'].get('attributedTo'):
if isinstance(postJsonObject['object']['attributedTo'], str): if isinstance(postJsonObject['object']['attributedTo'], str):
replyToLink += \ replyToLink += \
'?mention=' + postJsonObject['object']['attributedTo'] ';mention=' + postJsonObject['object']['attributedTo']
content = getBaseContentFromPost(postJsonObject, systemLanguage) content = getBaseContentFromPost(postJsonObject, systemLanguage)
if content: if content:
mentionedActors = getMentionsFromHtml(content) mentionedActors = getMentionsFromHtml(content)
if mentionedActors: if mentionedActors:
for actorUrl in mentionedActors: for actorUrl in mentionedActors:
if '?mention=' + actorUrl not in replyToLink: if ';mention=' + actorUrl not in replyToLink:
replyToLink += '?mention=' + actorUrl replyToLink += ';mention=' + actorUrl
if len(replyToLink) > 500: if len(replyToLink) > 500:
break break
replyToLink += pageNumberParam replyToLink += pageNumberParam
@ -331,7 +331,7 @@ def _getReplyIconHtml(baseDir: str, nickname: str, domain: str,
replyToThisPostStr = translate[replyToThisPostStr] replyToThisPostStr = translate[replyToThisPostStr]
conversationStr = '' conversationStr = ''
if conversationId: if conversationId:
conversationStr = '?conversationId=' + conversationId conversationStr = ';conversationId=' + conversationId
if isPublicRepeat: if isPublicRepeat:
replyStr += \ replyStr += \
' <a class="imageAnchor" href="/users/' + \ ' <a class="imageAnchor" href="/users/' + \
@ -396,7 +396,7 @@ def _getEditIconHtml(baseDir: str, nickname: str, domainFull: str,
nickname + \ nickname + \
'/tlblogs?editblogpost=' + \ '/tlblogs?editblogpost=' + \
postId.split('/statuses/')[1] + \ postId.split('/statuses/')[1] + \
'?actor=' + actorNickname + \ ';actor=' + actorNickname + \
'" title="' + editBlogPostStr + '">' + \ '" title="' + editBlogPostStr + '">' + \
'<img loading="lazy" title="' + \ '<img loading="lazy" title="' + \
editBlogPostStr + '" alt="' + editBlogPostStr + \ editBlogPostStr + '" alt="' + editBlogPostStr + \