diff --git a/daemon.py b/daemon.py index 48e8ca34..2b8bbc74 100644 --- a/daemon.py +++ b/daemon.py @@ -2797,10 +2797,11 @@ class PubServer(BaseHTTPRequestHandler): self.server.debug, \ fields['eventDate'], \ fields['eventTime'], \ - fields['location']) + fields['location']) if messageJson: self.postToNickname=nickname if self.server.debug: + pprint(messageJson) print('DEBUG: new DM to '+str(messageJson['object']['to'])) if self._postToOutbox(messageJson,__version__): populateReplies(self.server.baseDir, \ diff --git a/posts.py b/posts.py index 88e813ad..c0837617 100644 --- a/posts.py +++ b/posts.py @@ -457,12 +457,12 @@ def updateHashtagsIndex(baseDir: str,tag: {},newPostId: str) -> None: tagFile.write(newPostId+'\n') tagFile.close() -def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \ - toUrl: str, ccUrl: str, httpPrefix: str, content: str, \ - followersOnly: bool, saveToFile: bool, clientToServer: bool, \ +def createPostBase(baseDir: str,nickname: str,domain: str,port: int, \ + toUrl: str,ccUrl: str,httpPrefix: str,content: str, \ + followersOnly: bool,saveToFile: bool,clientToServer: bool, \ attachImageFilename: str,mediaType: str,imageDescription: str, \ useBlurhash: bool,isModerationReport: bool,inReplyTo=None, \ - inReplyToAtomUri=None, subject=None, \ + inReplyToAtomUri=None,subject=None, \ eventDate=None,eventTime=None,location=None) -> {}: """Creates a message """ @@ -920,14 +920,19 @@ def createDirectMessagePost(baseDir: str, return None postTo=None postCc=None - return createPostBase(baseDir,nickname,domain,port, \ - postTo,postCc, \ - httpPrefix,content,followersOnly,saveToFile, \ - clientToServer, \ - attachImageFilename,mediaType, \ - imageDescription,useBlurhash, \ - False,inReplyTo,inReplyToAtomUri,subject, \ - eventDate,eventTime,location) + messageJson= \ + createPostBase(baseDir,nickname,domain,port, \ + postTo,postCc, \ + httpPrefix,content,followersOnly,saveToFile, \ + clientToServer, \ + attachImageFilename,mediaType, \ + imageDescription,useBlurhash, \ + False,inReplyTo,inReplyToAtomUri,subject, \ + eventDate,eventTime,location) + # mentioned recipients go into To rather than Cc + messageJson['object']['to']=messageJson['object']['cc'] + messageJson['object']['cc']=[] + return messageJson def createReportPost(baseDir: str, nickname: str, domain: str, port: int,httpPrefix: str, \