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

Use like json if available when updating collections

merge-requests/30/head
Bob Mottram 2021-10-17 17:11:38 +01:00
parent aa11bb566f
commit 7ee48e6d20
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemon.py
View File

@ -7401,7 +7401,7 @@ class PubServer(BaseHTTPRequestHandler):
updateLikesCollection(recentPostsCache, updateLikesCollection(recentPostsCache,
baseDir, likedPostFilename, baseDir, likedPostFilename,
likeUrl, likeActor, self.postToNickname, likeUrl, likeActor, self.postToNickname,
domain, debug) domain, debug, likedPostJson)
likeUrl = origPostUrl likeUrl = origPostUrl
likedPostFilename = origFilename likedPostFilename = origFilename
if debug: if debug:
@ -7409,7 +7409,7 @@ class PubServer(BaseHTTPRequestHandler):
updateLikesCollection(recentPostsCache, updateLikesCollection(recentPostsCache,
baseDir, likedPostFilename, likeUrl, baseDir, likedPostFilename, likeUrl,
likeActor, self.postToNickname, domain, likeActor, self.postToNickname, domain,
debug) debug, None)
if debug: if debug:
print('Regenerating html post for changed likes collection') print('Regenerating html post for changed likes collection')
# clear the icon from the cache so that it gets updated # clear the icon from the cache so that it gets updated
@ -7570,7 +7570,8 @@ class PubServer(BaseHTTPRequestHandler):
if origFilename and origPostUrl: if origFilename and origPostUrl:
undoLikesCollectionEntry(recentPostsCache, undoLikesCollectionEntry(recentPostsCache,
baseDir, likedPostFilename, baseDir, likedPostFilename,
likeUrl, undoActor, domain, debug) likeUrl, undoActor, domain, debug,
likedPostJson)
likeUrl = origPostUrl likeUrl = origPostUrl
likedPostFilename = origFilename likedPostFilename = origFilename
if debug: if debug:
@ -7578,7 +7579,7 @@ class PubServer(BaseHTTPRequestHandler):
undoLikesCollectionEntry(recentPostsCache, undoLikesCollectionEntry(recentPostsCache,
baseDir, baseDir,
likedPostFilename, likeUrl, likedPostFilename, likeUrl,
undoActor, domain, debug) undoActor, domain, debug, None)
if debug: if debug:
print('Regenerating html post for changed likes collection') print('Regenerating html post for changed likes collection')
if likedPostJson: if likedPostJson:

9
inbox.py
View File

@ -940,7 +940,7 @@ def _receiveLike(recentPostsCache: {},
likeActor, postLikedId) likeActor, postLikedId)
updateLikesCollection(recentPostsCache, baseDir, postFilename, updateLikesCollection(recentPostsCache, baseDir, postFilename,
postLikedId, likeActor, postLikedId, likeActor,
handleName, domain, debug) handleName, domain, debug, None)
# regenerate the html # regenerate the html
likedPostJson = loadJson(postFilename, 0, 1) likedPostJson = loadJson(postFilename, 0, 1)
if likedPostJson: if likedPostJson:
@ -961,7 +961,7 @@ def _receiveLike(recentPostsCache: {},
postLikedId, postLikedId,
likeActor, likeActor,
handleName, handleName,
domain, debug) domain, debug, None)
if likedPostJson: if likedPostJson:
if debug: if debug:
cachedPostFilename = \ cachedPostFilename = \
@ -1052,7 +1052,7 @@ def _receiveUndoLike(recentPostsCache: {},
likeActor = messageJson['actor'] likeActor = messageJson['actor']
postLikedId = messageJson['object'] postLikedId = messageJson['object']
undoLikesCollectionEntry(recentPostsCache, baseDir, postFilename, undoLikesCollectionEntry(recentPostsCache, baseDir, postFilename,
postLikedId, likeActor, domain, debug) postLikedId, likeActor, domain, debug, None)
# regenerate the html # regenerate the html
likedPostJson = loadJson(postFilename, 0, 1) likedPostJson = loadJson(postFilename, 0, 1)
if likedPostJson: if likedPostJson:
@ -1069,7 +1069,8 @@ def _receiveUndoLike(recentPostsCache: {},
postFilename = announceLikedFilename postFilename = announceLikedFilename
undoLikesCollectionEntry(recentPostsCache, baseDir, undoLikesCollectionEntry(recentPostsCache, baseDir,
postFilename, postLikedId, postFilename, postLikedId,
likeActor, domain, debug) likeActor, domain, debug,
None)
if likedPostJson: if likedPostJson:
if debug: if debug:
cachedPostFilename = \ cachedPostFilename = \

10
like.py
View File

@ -129,7 +129,7 @@ def _like(recentPostsCache: {},
updateLikesCollection(recentPostsCache, updateLikesCollection(recentPostsCache,
baseDir, postFilename, objectUrl, baseDir, postFilename, objectUrl,
newLikeJson['actor'], newLikeJson['actor'],
nickname, domain, debug) nickname, domain, debug, None)
sendSignedJson(newLikeJson, session, baseDir, sendSignedJson(newLikeJson, session, baseDir,
nickname, domain, port, nickname, domain, port,
@ -368,7 +368,7 @@ def outboxLike(recentPostsCache: {},
updateLikesCollection(recentPostsCache, updateLikesCollection(recentPostsCache,
baseDir, postFilename, messageId, baseDir, postFilename, messageId,
messageJson['actor'], messageJson['actor'],
nickname, domain, debug) nickname, domain, debug, None)
if debug: if debug:
print('DEBUG: post liked via c2s - ' + postFilename) print('DEBUG: post liked via c2s - ' + postFilename)
@ -404,7 +404,7 @@ def outboxUndoLike(recentPostsCache: {},
return True return True
undoLikesCollectionEntry(recentPostsCache, baseDir, postFilename, undoLikesCollectionEntry(recentPostsCache, baseDir, postFilename,
messageId, messageJson['actor'], messageId, messageJson['actor'],
domain, debug) domain, debug, None)
if debug: if debug:
print('DEBUG: post undo liked via c2s - ' + postFilename) print('DEBUG: post undo liked via c2s - ' + postFilename)
@ -412,9 +412,11 @@ def outboxUndoLike(recentPostsCache: {},
def updateLikesCollection(recentPostsCache: {}, def updateLikesCollection(recentPostsCache: {},
baseDir: str, postFilename: str, baseDir: str, postFilename: str,
objectUrl: str, actor: str, objectUrl: str, actor: str,
nickname: str, domain: str, debug: bool) -> None: nickname: str, domain: str, debug: bool,
postJsonObject: {}) -> None:
"""Updates the likes collection within a post """Updates the likes collection within a post
""" """
if not postJsonObject:
postJsonObject = loadJson(postFilename) postJsonObject = loadJson(postFilename)
if not postJsonObject: if not postJsonObject:
return return

4
utils.py
View File

@ -2161,9 +2161,11 @@ def getFileCaseInsensitive(path: str) -> str:
def undoLikesCollectionEntry(recentPostsCache: {}, def undoLikesCollectionEntry(recentPostsCache: {},
baseDir: str, postFilename: str, objectUrl: str, baseDir: str, postFilename: str, objectUrl: str,
actor: str, domain: str, debug: bool) -> None: actor: str, domain: str, debug: bool,
postJsonObject: {}) -> None:
"""Undoes a like for a particular actor """Undoes a like for a particular actor
""" """
if not postJsonObject:
postJsonObject = loadJson(postFilename) postJsonObject = loadJson(postFilename)
if not postJsonObject: if not postJsonObject:
return return