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

3
daemon.py
View File

@ -2797,10 +2797,11 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug, \ self.server.debug, \
fields['eventDate'], \ fields['eventDate'], \
fields['eventTime'], \ fields['eventTime'], \
fields['location']) fields['location'])
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, \

29
posts.py
View File

@ -457,12 +457,12 @@ def updateHashtagsIndex(baseDir: str,tag: {},newPostId: str) -> None:
tagFile.write(newPostId+'\n') tagFile.write(newPostId+'\n')
tagFile.close() tagFile.close()
def createPostBase(baseDir: str,nickname: str, domain: str, port: int, \ def createPostBase(baseDir: str,nickname: str,domain: str,port: int, \
toUrl: str, ccUrl: str, httpPrefix: str, content: str, \ toUrl: str,ccUrl: str,httpPrefix: str,content: str, \
followersOnly: bool, saveToFile: bool, clientToServer: bool, \ followersOnly: bool,saveToFile: bool,clientToServer: bool, \
attachImageFilename: str,mediaType: str,imageDescription: str, \ attachImageFilename: str,mediaType: str,imageDescription: str, \
useBlurhash: bool,isModerationReport: bool,inReplyTo=None, \ useBlurhash: bool,isModerationReport: bool,inReplyTo=None, \
inReplyToAtomUri=None, subject=None, \ inReplyToAtomUri=None,subject=None, \
eventDate=None,eventTime=None,location=None) -> {}: eventDate=None,eventTime=None,location=None) -> {}:
"""Creates a message """Creates a message
""" """
@ -920,14 +920,19 @@ def createDirectMessagePost(baseDir: str,
return None return None
postTo=None postTo=None
postCc=None postCc=None
return createPostBase(baseDir,nickname,domain,port, \ messageJson= \
postTo,postCc, \ createPostBase(baseDir,nickname,domain,port, \
httpPrefix,content,followersOnly,saveToFile, \ postTo,postCc, \
clientToServer, \ httpPrefix,content,followersOnly,saveToFile, \
attachImageFilename,mediaType, \ clientToServer, \
imageDescription,useBlurhash, \ attachImageFilename,mediaType, \
False,inReplyTo,inReplyToAtomUri,subject, \ imageDescription,useBlurhash, \
eventDate,eventTime,location) 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, def createReportPost(baseDir: str,
nickname: str, domain: str, port: int,httpPrefix: str, \ nickname: str, domain: str, port: int,httpPrefix: str, \