diff --git a/daemon.py b/daemon.py index 1eb4196e..0e82f61b 100644 --- a/daemon.py +++ b/daemon.py @@ -3115,7 +3115,7 @@ class PubServer(BaseHTTPRequestHandler): postBytes=self.rfile.read(length) - msg = email.parser.BytesParser().parsebytes(postBytes) + msg = email.parser.BytesParser().parsebytes(postBytes) messageFields=msg.get_payload(decode=False).split(boundary) fields={} filename=None @@ -3375,8 +3375,8 @@ class PubServer(BaseHTTPRequestHandler): updateActorJson={ 'type': 'Update', 'actor': actorJson['id'], - 'to': ['https://www.w3.org/ns/activitystreams#Public'], - 'cc': [actorJson['id']+'/followers'], + 'to': [actorJson['id']+'/followers'], + 'cc': [], 'object': actorJson } self.postToNickname=nickname diff --git a/posts.py b/posts.py index b09cfe4f..cf098380 100644 --- a/posts.py +++ b/posts.py @@ -1705,15 +1705,18 @@ def sendToFollowers(session,baseDir: str, \ for handle in followerHandles: toNickname=handle.split('@')[0] - if debug: - print('DEBUG: Sending from '+nickname+'@'+domain+' to '+toNickname+'@'+toDomain) - sendSignedJson(postJsonObject,session,baseDir, \ - nickname,domain,port, \ - toNickname,toDomain,toPort, \ - cc,httpPrefix,True,clientToServer, \ - federationList, \ - sendThreads,postLog,cachedWebfingers, \ - personCache,debug,projectVersion) + if debug: + if postJsonObject['type']!='Update': + print('DEBUG: Sending from '+nickname+'@'+domain+' to '+toNickname+'@'+toDomain) + else: + print('DEBUG: Sending update from '+nickname+'@'+domain+' to '+toNickname+'@'+toDomain) + sendSignedJson(postJsonObject,session,baseDir, \ + nickname,domain,port, \ + toNickname,toDomain,toPort, \ + cc,httpPrefix,True,clientToServer, \ + federationList, \ + sendThreads,postLog,cachedWebfingers, \ + personCache,debug,projectVersion) if debug: print('DEBUG: End of sendToFollowers')