indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Tidying

merge-requests/6/head
Bob Mottram 2020-02-21 12:39:50 +00:00
parent dcd413c99a
commit 39c6c42549
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -3642,7 +3642,7 @@ class PubServer(BaseHTTPRequestHandler):
self.server.useBlurHash, \ self.server.useBlurHash, \
fields['replyTo'],fields['replyTo'], \ fields['replyTo'],fields['replyTo'], \
fields['subject'], \ fields['subject'], \
self.server.debug,fields['schedulePost'], \ True,fields['schedulePost'], \
fields['eventDate'], \ fields['eventDate'], \
fields['eventTime'], \ fields['eventTime'], \
fields['location']) fields['location'])
@ -3830,7 +3830,7 @@ class PubServer(BaseHTTPRequestHandler):
# Note sending new posts needs to be synchronous, otherwise any attachments # Note sending new posts needs to be synchronous, otherwise any attachments
# can get mangled if other events happen during their decoding # can get mangled if other events happen during their decoding
print('Creating new post: '+newPostThreadName) print('Creating new post from: '+newPostThreadName)
self._receiveNewPostProcess(authorized,postType,path,headers,length,postBytes,boundary) self._receiveNewPostProcess(authorized,postType,path,headers,length,postBytes,boundary)
return pageNumber return pageNumber

7
posts.py
View File

@ -430,7 +430,9 @@ def savePostToBox(baseDir: str,httpPrefix: str,postId: str, \
if not postId: if not postId:
statusNumber,published = getStatusNumber() statusNumber,published = getStatusNumber()
postId=httpPrefix+'://'+originalDomain+'/users/'+nickname+'/statuses/'+statusNumber postId= \
httpPrefix+'://'+originalDomain+'/users/'+nickname+ \
'/statuses/'+statusNumber
postJsonObject['id']=postId+'/activity' postJsonObject['id']=postId+'/activity'
if postJsonObject.get('object'): if postJsonObject.get('object'):
if isinstance(postJsonObject['object'], dict): if isinstance(postJsonObject['object'], dict):
@ -1019,7 +1021,8 @@ def createDirectMessagePost(baseDir: str,
eventDate=None,eventTime=None,location=None) -> {}: eventDate=None,eventTime=None,location=None) -> {}:
"""Direct Message post """Direct Message post
""" """
mentionedPeople=getMentionedPeople(baseDir,httpPrefix,content,domain,debug) mentionedPeople= \
getMentionedPeople(baseDir,httpPrefix,content,domain,debug)
if debug: if debug:
print('mentionedPeople: '+str(mentionedPeople)) print('mentionedPeople: '+str(mentionedPeople))
if not mentionedPeople: if not mentionedPeople: