From f5da8980076bab0bef831a8b538a762e819f6049 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 1 Aug 2019 13:49:16 +0100
Subject: [PATCH] Undo like from web interface

---
 daemon.py |  6 +++---
 like.py   | 15 ++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/daemon.py b/daemon.py
index d2ac34a86..e9539da3f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -708,7 +708,7 @@ class PubServer(BaseHTTPRequestHandler):
             if not self.server.session:
                 self.server.session= \
                     createSession(self.server.domain,self.server.port,self.server.useTor)
-            likeActor=self.server.httpPrefix+'://'+self.server.fullDomain+'/users/'+self.postToNickname
+            likeActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+self.postToNickname
             likeJson= {
                 'type': 'Like',
                 'actor': likeActor,
@@ -730,7 +730,7 @@ class PubServer(BaseHTTPRequestHandler):
             if not self.server.session:
                 self.server.session= \
                     createSession(self.server.domain,self.server.port,self.server.useTor)
-            undoActor=self.server.httpPrefix+'://'+self.server.fullDomain+'/users/'+self.postToNickname
+            undoActor=self.server.httpPrefix+'://'+self.server.domainFull+'/users/'+self.postToNickname
             undoLikeJson= {
                 'type': 'Undo',
                 'actor': undoActor,
@@ -743,7 +743,7 @@ class PubServer(BaseHTTPRequestHandler):
                 },
                 'to': [undoActor+'/followers'],
                 'cc': []
-            }    
+            }
             if undoLikeJson:
                 self._postToOutbox(undoLikeJson)
             self.server.GETbusy=False
diff --git a/like.py b/like.py
index 8d7a738b1..cc3b670e2 100644
--- a/like.py
+++ b/like.py
@@ -19,9 +19,9 @@ from webfinger import webfingerHandle
 from auth import createBasicAuthHeader
 from posts import getPersonBox
 
-def undoLikesCollectionEntry(postFilename: str,objectUrl: str, actor: str,debug: bool) -> None:
+def undoLikesCollectionEntry(postFilename: str,objectUrl: str,actor: str,debug: bool) -> None:
     """Undoes a like for a particular actor
-    """
+    """    
     with open(postFilename, 'r') as fp:
         postJsonObject=commentjson.load(fp)
         if not postJsonObject.get('type'):
@@ -480,22 +480,15 @@ def outboxUndoLike(baseDir: str,httpPrefix: str, \
     """ When an undo like request is received by the outbox from c2s
     """
     if not messageJson.get('type'):
-        if debug:
-            print('DEBUG: undo like - no type')
         return
     if not messageJson['type']=='Undo':
-        if debug:
-            print('DEBUG: not an undo of Like')
         return
     if not messageJson.get('object'):
-        if debug:
-            print('DEBUG: no object in undo like')
         return
-    if not isinstance(messageJson['object']['object'], dict):
+    if not isinstance(messageJson['object'], dict):
         if debug:
             print('DEBUG: undo like object is not dict')
-        return
-    
+        return    
     if not messageJson['object'].get('type'):
         if debug:
             print('DEBUG: undo like - no type')