Posting scheduled posts

main
Bob Mottram 2020-01-13 10:45:02 +00:00
parent 8cf1a6266a
commit 0b2a6910ec
2 changed files with 19 additions and 5 deletions

View File

@ -656,9 +656,6 @@ class PubServer(BaseHTTPRequestHandler):
self.server.personCache,self.server.allowDeletion, \
self.server.useTor,version,self.server.debug)
def externalPostToOutbox(self,messageJson: {},postToNickname: str) -> bool:
return self._postToOutbox(messageJson,__version__,postToNickname)
def _postToOutboxThread(self,messageJson: {}) -> bool:
"""Creates a thread to send a post
"""
@ -5604,7 +5601,7 @@ def runDaemon(mediaInstance: bool,maxRecentPosts: int, \
print('Creating scheduled post thread')
httpd.thrPostSchedule= \
threadWithTrace(target=runPostSchedule, \
args=(baseDir,pubHandler,20),daemon=True)
args=(baseDir,httpd,20),daemon=True)
if not unitTest:
print('Creating inbox queue watchdog')
httpd.thrWatchdog= \

View File

@ -10,6 +10,7 @@ import os
import time
import datetime
from utils import loadJson
from outbox import postMessageToOutbox
def addSchedulePost(baseDir: str,nickname: str,domain: str, \
eventDateStr: str,postId: str) -> None:
@ -95,7 +96,23 @@ def updatePostSchedule(baseDir: str,handle: str,httpd,maxScheduledPosts: int) ->
print('Sending scheduled post '+postId)
if not httpd.externalPostToOutbox(postJsonObject,nickname):
if not postMessageToOutbox(postJsonObject,nickname, \
httpd.server,baseDir, \
httpd.server.httpPrefix, \
httpd.server.domain, \
httpd.server.domainFull, \
httpd.server.port, \
httpd.server.recentPostsCache, \
httpd.server.followersThreads, \
httpd.server.federationList, \
httpd.server.sendThreads, \
httpd.server.postLog, \
httpd.server.cachedWebfingers, \
httpd.server.personCache, \
httpd.server.allowDeletion, \
httpd.server.useTor, \
httpd.server.projectVersion, \
httpd.server.debug):
indexLines.remove(line)
continue