From 662cfe57448db8a09b8b554fc739c5c3efb04565 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 31 Jul 2019 17:47:45 +0100
Subject: [PATCH] Link announce to web interface

---
 daemon.py       | 28 ++++++++++++++++++++++++++++
 webinterface.py |  1 -
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/daemon.py b/daemon.py
index 42dfa3bdb..991c9e340 100644
--- a/daemon.py
+++ b/daemon.py
@@ -77,6 +77,7 @@ from utils import getNicknameFromActor
 from utils import getDomainFromActor
 from manualapprove import manualDenyFollowRequest
 from manualapprove import manualApproveFollowRequest
+from announce import createAnnounce
 import os
 import sys
 
@@ -640,6 +641,33 @@ class PubServer(BaseHTTPRequestHandler):
                self.server.GETbusy=False
                return
 
+        if authorized and '?repeat=' in self.path:
+            repeatUrl=self.path.split('?repeat=')[1]
+            actor=self.path.split('?repeat=')[0]
+            self.postToNickname=getNicknameFromActor(actor)
+            if not self.server.session:
+                self.server.session= \
+                    createSession(self.server.domain,self.server.port,self.server.useTor)                
+            announceJson= \
+                createAnnounce(self.server.session, \
+                               self.server.baseDir, \
+                               self.server.federationList, \
+                               self.postToNickname, \
+                               self.server.domain,self.server.port, \
+                               'https://www.w3.org/ns/activitystreams#Public', \
+                               None,self.server.httpPrefix, \
+                               repeatUrl,False,False, \
+                               self.server.sendThreads, \
+                               self.server.postLog, \
+                               self.server.personCache, \
+                               self.server.cachedWebfingers, \
+                               self.server.debug)
+            if announceJson:
+                self._postToOutbox(announceJson)
+            self._redirect_headers(actor+'/inbox',cookie)
+            self.server.GETbusy=False
+            return
+            
         inReplyTo=None
         if authorized and '?replyto=' in self.path:
             inReplyTo=self.path.split('?replyto=')[1]
diff --git a/webinterface.py b/webinterface.py
index 7f6c4cfa6..0a93bce4a 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -637,7 +637,6 @@ def htmlTimeline(session,baseDir: str,wfRequest: {},personCache: {}, \
             tlStr+=individualPostAsHtml(baseDir,session,wfRequest,personCache, \
                                         nickname,domain,port,item,None,True,showIndividualPostIcons)
     tlStr+=htmlFooter()
-    print(tlStr)
     return tlStr
 
 def htmlInbox(session,baseDir: str,wfRequest: {},personCache: {}, \