mirror of https://gitlab.com/bashrc2/epicyon
Merge branch 'main' of ssh://code.freedombone.net:2222/bashrc/epicyon
commit
75cb2dbbaf
|
|
@ -48,7 +48,8 @@ def outboxAnnounce(recentPostsCache: {},
|
|||
messageJson['object'])
|
||||
if postFilename:
|
||||
updateAnnounceCollection(recentPostsCache, baseDir, postFilename,
|
||||
messageJson['actor'], domain, debug)
|
||||
messageJson['actor'],
|
||||
nickname, domain, debug)
|
||||
return True
|
||||
elif messageJson['type'] == 'Undo':
|
||||
if not isinstance(messageJson['object'], dict):
|
||||
|
|
|
|||
|
|
@ -6721,7 +6721,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
updateLikesCollection(self.server.recentPostsCache,
|
||||
baseDir,
|
||||
likedPostFilename, likeUrl,
|
||||
likeActor, domain,
|
||||
likeActor,
|
||||
self.postToNickname, domain,
|
||||
debug)
|
||||
# clear the icon from the cache so that it gets updated
|
||||
if self.server.iconsCache.get('like.png'):
|
||||
|
|
|
|||
16
inbox.py
16
inbox.py
|
|
@ -991,12 +991,12 @@ def _receiveLike(recentPostsCache: {},
|
|||
# if this post in the outbox of the person?
|
||||
handleName = handle.split('@')[0]
|
||||
handleDom = handle.split('@')[1]
|
||||
postFilename = locatePost(baseDir, handleName, handleDom,
|
||||
messageJson['object'])
|
||||
postLikedId = messageJson['object']
|
||||
postFilename = locatePost(baseDir, handleName, handleDom, postLikedId)
|
||||
if not postFilename:
|
||||
if debug:
|
||||
print('DEBUG: post not found in inbox or outbox')
|
||||
print(messageJson['object'])
|
||||
print(postLikedId)
|
||||
return True
|
||||
if debug:
|
||||
print('DEBUG: liked post found in inbox')
|
||||
|
|
@ -1005,13 +1005,13 @@ def _receiveLike(recentPostsCache: {},
|
|||
handleDom = handle.split('@')[1]
|
||||
if not _alreadyLiked(baseDir,
|
||||
handleName, handleDom,
|
||||
messageJson['object'],
|
||||
postLikedId,
|
||||
messageJson['actor']):
|
||||
_likeNotify(baseDir, domain, onionDomain, handle,
|
||||
messageJson['actor'], messageJson['object'])
|
||||
messageJson['actor'], postLikedId)
|
||||
updateLikesCollection(recentPostsCache, baseDir, postFilename,
|
||||
messageJson['object'],
|
||||
messageJson['actor'], domain, debug)
|
||||
postLikedId, messageJson['actor'],
|
||||
handleName, domain, debug)
|
||||
return True
|
||||
|
||||
|
||||
|
|
@ -1398,7 +1398,7 @@ def _receiveAnnounce(recentPostsCache: {},
|
|||
print(messageJson['object'])
|
||||
return True
|
||||
updateAnnounceCollection(recentPostsCache, baseDir, postFilename,
|
||||
messageJson['actor'], domain, debug)
|
||||
messageJson['actor'], nickname, domain, debug)
|
||||
if debug:
|
||||
print('DEBUG: Downloading announce post ' + messageJson['actor'] +
|
||||
' -> ' + messageJson['object'])
|
||||
|
|
|
|||
6
like.py
6
like.py
|
|
@ -103,7 +103,8 @@ def _like(recentPostsCache: {},
|
|||
|
||||
updateLikesCollection(recentPostsCache,
|
||||
baseDir, postFilename, objectUrl,
|
||||
newLikeJson['actor'], domain, debug)
|
||||
newLikeJson['actor'],
|
||||
nickname, domain, debug)
|
||||
|
||||
sendSignedJson(newLikeJson, session, baseDir,
|
||||
nickname, domain, port,
|
||||
|
|
@ -334,7 +335,8 @@ def outboxLike(recentPostsCache: {},
|
|||
return True
|
||||
updateLikesCollection(recentPostsCache,
|
||||
baseDir, postFilename, messageId,
|
||||
messageJson['actor'], domain, debug)
|
||||
messageJson['actor'],
|
||||
nickname, domain, debug)
|
||||
if debug:
|
||||
print('DEBUG: post liked via c2s - ' + postFilename)
|
||||
|
||||
|
|
|
|||
11
utils.py
11
utils.py
|
|
@ -1886,8 +1886,8 @@ def undoLikesCollectionEntry(recentPostsCache: {},
|
|||
|
||||
def updateLikesCollection(recentPostsCache: {},
|
||||
baseDir: str, postFilename: str,
|
||||
objectUrl: str,
|
||||
actor: str, domain: str, debug: bool) -> None:
|
||||
objectUrl: str, actor: str,
|
||||
nickname: str, domain: str, debug: bool) -> None:
|
||||
"""Updates the likes collection within a post
|
||||
"""
|
||||
postJsonObject = loadJson(postFilename)
|
||||
|
|
@ -1895,13 +1895,12 @@ def updateLikesCollection(recentPostsCache: {},
|
|||
return
|
||||
# remove any cached version of this post so that the
|
||||
# like icon is changed
|
||||
nickname = getNicknameFromActor(actor)
|
||||
removePostFromCache(postJsonObject, recentPostsCache)
|
||||
cachedPostFilename = getCachedPostFilename(baseDir, nickname,
|
||||
domain, postJsonObject)
|
||||
if cachedPostFilename:
|
||||
if os.path.isfile(cachedPostFilename):
|
||||
os.remove(cachedPostFilename)
|
||||
removePostFromCache(postJsonObject, recentPostsCache)
|
||||
|
||||
if not postJsonObject.get('object'):
|
||||
if debug:
|
||||
|
|
@ -2011,7 +2010,8 @@ def undoAnnounceCollectionEntry(recentPostsCache: {},
|
|||
|
||||
def updateAnnounceCollection(recentPostsCache: {},
|
||||
baseDir: str, postFilename: str,
|
||||
actor: str, domain: str, debug: bool) -> None:
|
||||
actor: str,
|
||||
nickname: str, domain: str, debug: bool) -> None:
|
||||
"""Updates the announcements collection within a post
|
||||
Confusingly this is known as "shares", but isn't the
|
||||
same as shared items within shares.py
|
||||
|
|
@ -2022,7 +2022,6 @@ def updateAnnounceCollection(recentPostsCache: {},
|
|||
return
|
||||
# remove any cached version of this announce so that the announce
|
||||
# icon is changed
|
||||
nickname = getNicknameFromActor(actor)
|
||||
cachedPostFilename = getCachedPostFilename(baseDir, nickname, domain,
|
||||
postJsonObject)
|
||||
if cachedPostFilename:
|
||||
|
|
|
|||
|
|
@ -1320,7 +1320,7 @@ def individualPostAsHtml(allowDownloads: bool,
|
|||
if announceFilename:
|
||||
updateAnnounceCollection(recentPostsCache,
|
||||
baseDir, announceFilename,
|
||||
postActor, domainFull, False)
|
||||
postActor, nickname, domainFull, False)
|
||||
|
||||
# create a file for use by text-to-speech
|
||||
if isRecentPost(postJsonObject):
|
||||
|
|
|
|||
Loading…
Reference in New Issue