From fb8b19aaef0958d8de8e29b9691690009d3eb9f0 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sat, 3 Sep 2022 17:19:09 +0100
Subject: [PATCH] Tidying

---
 content.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/content.py b/content.py
index e184df2aa..3ceccc8be 100644
--- a/content.py
+++ b/content.py
@@ -742,8 +742,8 @@ def post_tag_exists(tagType: str, tagName: str, tags: {}) -> bool:
     return False
 
 
-def _add_mention(word_str: str, http_prefix: str, following: str,
-                 petnames: str, replace_mentions: {},
+def _add_mention(word_str: str, http_prefix: str, following: [],
+                 petnames: [], replace_mentions: {},
                  recipients: [], tags: {}) -> bool:
     """Detects mentions and adds them to the replacements dict and
     recipients list
@@ -771,8 +771,7 @@ def _add_mention(word_str: str, http_prefix: str, following: str,
                     'type': 'Mention'
                 }
                 replace_mentions[word_str] = \
-                    "<span class=\"h-card\"><a href=\"" + http_prefix + \
-                    "://" + replace_domain + "/@" + possible_nickname + \
+                    "<span class=\"h-card\"><a href=\"" + recipient_actor + \
                     "\" tabindex=\"10\" class=\"u-url mention\">@<span>" + \
                     possible_nickname + "</span></a></span>"
                 return True
@@ -798,9 +797,8 @@ def _add_mention(word_str: str, http_prefix: str, following: str,
                         'type': 'Mention'
                     }
                     replace_mentions[word_str] = \
-                        "<span class=\"h-card\"><a href=\"" + http_prefix + \
-                        "://" + replace_domain + "/@" + replace_nickname + \
-                        "\" tabindex=\"10\" " + \
+                        "<span class=\"h-card\"><a href=\"" + \
+                        recipient_actor + "\" tabindex=\"10\" " + \
                         "class=\"u-url mention\">@<span>" + \
                         replace_nickname + "</span></a></span>"
                     return True