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

Check outbox

main
Bob Mottram 2020-02-24 18:45:24 +00:00
parent 5411344622
commit 006cfd4b8c
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
daemon.py
View File

@ -68,6 +68,7 @@ from posts import createDirectMessagePost
from posts import populateRepliesJson from posts import populateRepliesJson
from posts import addToField from posts import addToField
from posts import expireCache from posts import expireCache
from inbox import isBlogPost
from inbox import inboxPermittedMessage from inbox import inboxPermittedMessage
from inbox import inboxMessageHasParams from inbox import inboxMessageHasParams
from inbox import runInboxQueue from inbox import runInboxQueue
@ -890,8 +891,8 @@ class PubServer(BaseHTTPRequestHandler):
print('Test5') print('Test5')
nickname=userEnding[0] nickname=userEnding[0]
# check for blog posts # check for blog posts
print('Test6') blogIndexFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/outbox.index'
blogIndexFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/tlblogs.index' print('Test6 '+blogIndexFilename)
if not os.path.isfile(blogIndexFilename): if not os.path.isfile(blogIndexFilename):
return None,None return None,None
print('Test7') print('Test7')
@ -938,15 +939,16 @@ class PubServer(BaseHTTPRequestHandler):
self.path) self.path)
if blogFilename and nickname: if blogFilename and nickname:
postJsonObject=loadJson(blogFilename) postJsonObject=loadJson(blogFilename)
msg=htmlBlogPost(self.server.baseDir, \ if isBlogPost(postJsonObject):
self.server.httpPrefix, \ msg=htmlBlogPost(self.server.baseDir, \
self.server.translate, \ self.server.httpPrefix, \
nickname,self.server.domain, \ self.server.translate, \
postJsonObject) nickname,self.server.domain, \
if msg: postJsonObject)
self._set_headers('text/html',len(msg),cookie) if msg:
self._write(msg) self._set_headers('text/html',len(msg),cookie)
return self._write(msg)
return
self._404() self._404()
return return