More generic mention urls

main
Bob Mottram 2021-08-14 09:44:58 +01:00
parent 27544b7eaa
commit 10d6e15f51
1 changed files with 4 additions and 4 deletions

View File

@ -499,7 +499,7 @@ def _addMention(wordStr: str, httpPrefix: str, following: str, petnames: str,
followStr = follow.replace('\n', '').replace('\r', '') followStr = follow.replace('\n', '').replace('\r', '')
replaceDomain = followStr.split('@')[1] replaceDomain = followStr.split('@')[1]
recipientActor = httpPrefix + "://" + \ recipientActor = httpPrefix + "://" + \
replaceDomain + "/users/" + possibleNickname replaceDomain + "/@" + possibleNickname
if recipientActor not in recipients: if recipientActor not in recipients:
recipients.append(recipientActor) recipients.append(recipientActor)
tags[wordStr] = { tags[wordStr] = {
@ -526,7 +526,7 @@ def _addMention(wordStr: str, httpPrefix: str, following: str, petnames: str,
replaceNickname = followStr.split('@')[0] replaceNickname = followStr.split('@')[0]
replaceDomain = followStr.split('@')[1] replaceDomain = followStr.split('@')[1]
recipientActor = httpPrefix + "://" + \ recipientActor = httpPrefix + "://" + \
replaceDomain + "/users/" + replaceNickname replaceDomain + "/@" + replaceNickname
if recipientActor not in recipients: if recipientActor not in recipients:
recipients.append(recipientActor) recipients.append(recipientActor)
tags[wordStr] = { tags[wordStr] = {
@ -558,7 +558,7 @@ def _addMention(wordStr: str, httpPrefix: str, following: str, petnames: str,
if follow.replace('\n', '').replace('\r', '') != possibleHandle: if follow.replace('\n', '').replace('\r', '') != possibleHandle:
continue continue
recipientActor = httpPrefix + "://" + \ recipientActor = httpPrefix + "://" + \
possibleDomain + "/users/" + possibleNickname possibleDomain + "/@" + possibleNickname
if recipientActor not in recipients: if recipientActor not in recipients:
recipients.append(recipientActor) recipients.append(recipientActor)
tags[wordStr] = { tags[wordStr] = {
@ -576,7 +576,7 @@ def _addMention(wordStr: str, httpPrefix: str, following: str, petnames: str,
if not (possibleDomain == 'localhost' or '.' in possibleDomain): if not (possibleDomain == 'localhost' or '.' in possibleDomain):
return False return False
recipientActor = httpPrefix + "://" + \ recipientActor = httpPrefix + "://" + \
possibleDomain + "/users/" + possibleNickname possibleDomain + "/@" + possibleNickname
if recipientActor not in recipients: if recipientActor not in recipients:
recipients.append(recipientActor) recipients.append(recipientActor)
tags[wordStr] = { tags[wordStr] = {