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

Don't update announce

merge-requests/30/head
Bob Mottram 2020-06-06 20:28:12 +01:00
parent 51f2b060c9
commit c8844bba5e
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
daemon.py
View File

@ -143,8 +143,6 @@ from shares import getSharesFeedForPerson
from shares import addShare from shares import addShare
from shares import removeShare from shares import removeShare
from shares import expireShares from shares import expireShares
from utils import undoAnnounceCollectionEntry
from utils import updateAnnounceCollection
from utils import updateLikesCollection from utils import updateLikesCollection
from utils import undoLikesCollectionEntry from utils import undoLikesCollectionEntry
from utils import deletePost from utils import deletePost
@ -2277,18 +2275,6 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug, self.server.debug,
self.server.projectVersion) self.server.projectVersion)
if announceJson: if announceJson:
# directly announce the post file
announcePostFilename = \
locatePost(self.server.baseDir,
self.postToNickname,
self.server.domain,
repeatUrl)
if announcePostFilename:
updateAnnounceCollection(self.server.recentPostsCache,
self.server.baseDir,
announcePostFilename,
actor, self.server.domain,
self.server.debug)
self._postToOutboxThread(announceJson) self._postToOutboxThread(announceJson)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self.server.httpPrefix + '://' + \ actorAbsolute = self.server.httpPrefix + '://' + \
@ -2374,18 +2360,6 @@ class PubServer(BaseHTTPRequestHandler):
'type': 'Announce' 'type': 'Announce'
} }
} }
# directly undo announce in post file
announcePostFilename = \
locatePost(self.server.baseDir,
self.postToNickname,
self.server.domain,
repeatUrl)
if announcePostFilename:
undoAnnounceCollectionEntry(self.server.recentPostsCache,
self.server.baseDir,
announcePostFilename,
actor, self.server.domain,
self.server.debug)
self._postToOutboxThread(newUndoAnnounce) self._postToOutboxThread(newUndoAnnounce)
self.server.GETbusy = False self.server.GETbusy = False
actorAbsolute = self.server.httpPrefix + '://' + \ actorAbsolute = self.server.httpPrefix + '://' + \