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

Fixing sending question replies

main
Bob Mottram 2019-12-10 21:08:03 +00:00
parent f1beb08b89
commit 243a0eaca8
1 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
daemon.py
View File

@ -217,10 +217,16 @@ class PubServer(BaseHTTPRequestHandler):
if messageJson: if messageJson:
self.postToNickname=nickname self.postToNickname=nickname
if self._postToOutbox(messageJson,__version__): if self._postToOutbox(messageJson,__version__):
postFilename= \
locatePost(self.server.baseDir,nickname, \
self.server.domain,messageId)
if postFilename:
postJsonObject=loadJson(postFilename)
if postJsonObject:
populateReplies(self.server.baseDir, \ populateReplies(self.server.baseDir, \
self.server.httpPrefix, \ self.server.httpPrefix, \
self.server.domainFull, \ self.server.domainFull, \
messageJson, \ postJsonObject, \
self.server.maxReplies, \ self.server.maxReplies, \
self.server.debug) self.server.debug)
# record the vote # record the vote
@ -229,17 +235,19 @@ class PubServer(BaseHTTPRequestHandler):
votesFile.write(messageId+'\n') votesFile.write(messageId+'\n')
votesFile.close() votesFile.close()
# ensure that the cached post is removed if it exists, so # ensure that the cached post is removed if it exists,
# that it then will be recreated # so that it then will be recreated
cachedPostFilename= \ cachedPostFilename= \
getCachedPostFilename(self.server.baseDir, \ getCachedPostFilename(self.server.baseDir, \
nickname, \ nickname, \
self.server.domain,messageJson) self.server.domain, \
postJsonObject)
if cachedPostFilename: if cachedPostFilename:
if os.path.isfile(cachedPostFilename): if os.path.isfile(cachedPostFilename):
os.remove(cachedPostFilename) os.remove(cachedPostFilename)
# remove from memory cache # remove from memory cache
removePostFromCache(messageJson,self.server.recentPostsCache) removePostFromCache(postJsonObject, \
self.server.recentPostsCache)
else: else:
print('ERROR: unable to post vote to outbox') print('ERROR: unable to post vote to outbox')
else: else:
@ -4587,7 +4595,7 @@ class PubServer(BaseHTTPRequestHandler):
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
questionParams=self.rfile.read(length).decode('utf-8') questionParams=self.rfile.read(length).decode('utf-8')
questionParams= \ questionParams= \
questionParams.replace('+',' ').replace('%40','@').replace('%3A',':').replace('%23','#').replace('%2F','#').strip() questionParams.replace('+',' ').replace('%40','@').replace('%3A',':').replace('%23','#').replace('%2F','/').strip()
# post being voted on # post being voted on
messageId=None messageId=None
if 'messageId=' in questionParams: if 'messageId=' in questionParams: