From ad7dfa1d3c73d62ad5b16214017004382fd80ce8 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 11 Feb 2020 10:24:22 +0000
Subject: [PATCH] Preserving reply scope

---
 webinterface.py | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/webinterface.py b/webinterface.py
index 69978f8e..37d2f622 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -2326,10 +2326,15 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
         replyToLink+=pageNumberParam
                         
         replyStr=''
-        if not isModerationPost and showRepeatIcon:
-            if isPublicPostFromUrl(baseDir,nickname,domain,replyToLink):
+        if showRepeatIcon:
+            replyStr+= \
+                '<a href="/users/'+nickname+'?replyto='+replyToLink+ \
+                '?actor='+postJsonObject['actor']+ \
+                '" title="'+translate['Reply to this post']+'">'
+        else:
+            if isDM(postJsonObject):
                 replyStr+= \
-                    '<a href="/users/'+nickname+'?replyto='+replyToLink+ \
+                    '<a href="/users/'+nickname+'?replydm='+replyToLink+ \
                     '?actor='+postJsonObject['actor']+ \
                     '" title="'+translate['Reply to this post']+'">'
             else:
@@ -2337,11 +2342,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \
                     '<a href="/users/'+nickname+'?replyfollowers='+replyToLink+ \
                     '?actor='+postJsonObject['actor']+ \
                     '" title="'+translate['Reply to this post']+'">'
-        else:
-            replyStr+= \
-                '<a href="/users/'+nickname+'?replydm='+replyToLink+ \
-                '?actor='+postJsonObject['actor']+ \
-                '" title="'+translate['Reply to this post']+'">'
+                
         replyStr+='<img loading="lazy" title="'+translate['Reply to this post']+' |" alt="'+translate['Reply to this post']+' |" src="/'+iconsDir+'/reply.png"/></a>'
 
     announceStr=''