mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mentioned recipients go into 'to' for dms

main
Bob Mottram 2019-11-10 12:28:12 +00:00
parent c417f18c65
commit 9e53f93997
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemon.py
View File

@ -2801,6 +2801,7 @@ class PubServer(BaseHTTPRequestHandler):
if messageJson: if messageJson:
self.postToNickname=nickname self.postToNickname=nickname
if self.server.debug: if self.server.debug:
pprint(messageJson)
print('DEBUG: new DM to '+str(messageJson['object']['to'])) print('DEBUG: new DM to '+str(messageJson['object']['to']))
if self._postToOutbox(messageJson,__version__): if self._postToOutbox(messageJson,__version__):
populateReplies(self.server.baseDir, \ populateReplies(self.server.baseDir, \

7
posts.py
View File

@ -920,7 +920,8 @@ def createDirectMessagePost(baseDir: str,
return None return None
postTo=None postTo=None
postCc=None postCc=None
return createPostBase(baseDir,nickname,domain,port, \ messageJson= \
createPostBase(baseDir,nickname,domain,port, \
postTo,postCc, \ postTo,postCc, \
httpPrefix,content,followersOnly,saveToFile, \ httpPrefix,content,followersOnly,saveToFile, \
clientToServer, \ clientToServer, \
@ -928,6 +929,10 @@ def createDirectMessagePost(baseDir: str,
imageDescription,useBlurhash, \ imageDescription,useBlurhash, \
False,inReplyTo,inReplyToAtomUri,subject, \ False,inReplyTo,inReplyToAtomUri,subject, \
eventDate,eventTime,location) 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, def createReportPost(baseDir: str,
nickname: str, domain: str, port: int,httpPrefix: str, \ nickname: str, domain: str, port: int,httpPrefix: str, \