From abe216a2b3ec136d71d764368138645b6d7ac3f6 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 1 Apr 2020 10:44:33 +0000 Subject: [PATCH] flake8 style --- like.py | 512 ++++++++++++++++++++++++++------------------------------ 1 file changed, 233 insertions(+), 279 deletions(-) diff --git a/like.py b/like.py index 50891c04..8071e810 100644 --- a/like.py +++ b/like.py @@ -1,14 +1,12 @@ -__filename__="like.py" -__author__="Bob Mottram" -__license__="AGPL3+" -__version__="1.1.0" -__maintainer__="Bob Mottram" -__email__="bob@freedombone.net" -__status__="Production" +__filename__ = "like.py" +__author__ = "Bob Mottram" +__license__ = "AGPL3+" +__version__ = "1.1.0" +__maintainer__ = "Bob Mottram" +__email__ = "bob@freedombone.net" +__status__ = "Production" import os -import json -import time from pprint import pprint from utils import removePostFromCache from utils import urlPermitted @@ -24,25 +22,27 @@ from webfinger import webfingerHandle from auth import createBasicAuthHeader from posts import getPersonBox -def undoLikesCollectionEntry(recentPostsCache: {}, \ - baseDir: str,postFilename: str,objectUrl: str, \ - actor: str,domain: str,debug: bool) -> None: + +def undoLikesCollectionEntry(recentPostsCache: {}, + baseDir: str, postFilename: str, objectUrl: str, + actor: str, domain: str, debug: bool) -> None: """Undoes a like for a particular actor """ - postJsonObject=loadJson(postFilename) + postJsonObject = loadJson(postFilename) if postJsonObject: - # remove any cached version of this post so that the like icon is changed - nickname=getNicknameFromActor(actor) - cachedPostFilename= \ - getCachedPostFilename(baseDir,nickname,domain,postJsonObject) + # remove any cached version of this post so that the + # like icon is changed + nickname = getNicknameFromActor(actor) + cachedPostFilename = getCachedPostFilename(baseDir, nickname, + domain, postJsonObject) if cachedPostFilename: if os.path.isfile(cachedPostFilename): os.remove(cachedPostFilename) - removePostFromCache(postJsonObject,recentPostsCache) + removePostFromCache(postJsonObject, recentPostsCache) if not postJsonObject.get('type'): return - if postJsonObject['type']!='Create': + if postJsonObject['type'] != 'Create': return if not postJsonObject.get('object'): if debug: @@ -57,39 +57,42 @@ def undoLikesCollectionEntry(recentPostsCache: {}, \ return if not postJsonObject['object']['likes'].get('items'): return - totalItems=0 + totalItems = 0 if postJsonObject['object']['likes'].get('totalItems'): - totalItems=postJsonObject['object']['likes']['totalItems'] - itemFound=False + totalItems = postJsonObject['object']['likes']['totalItems'] + itemFound = False for likeItem in postJsonObject['object']['likes']['items']: if likeItem.get('actor'): - if likeItem['actor']==actor: + if likeItem['actor'] == actor: if debug: print('DEBUG: like was removed for '+actor) postJsonObject['object']['likes']['items'].remove(likeItem) - itemFound=True + itemFound = True break if itemFound: - if totalItems==1: + if totalItems == 1: if debug: print('DEBUG: likes was removed from post') del postJsonObject['object']['likes'] else: - postJsonObject['object']['likes']['totalItems']= \ - len(postJsonObject['object']['likes']['items']) - saveJson(postJsonObject,postFilename) + itlen = len(postJsonObject['object']['likes']['items']) + postJsonObject['object']['likes']['totalItems'] = itlen -def likedByPerson(postJsonObject: {}, nickname: str,domain: str) -> bool: + saveJson(postJsonObject, postFilename) + + +def likedByPerson(postJsonObject: {}, nickname: str, domain: str) -> bool: """Returns True if the given post is liked by the given person """ - if noOfLikes(postJsonObject)==0: + if noOfLikes(postJsonObject) == 0: return False - actorMatch=domain+'/users/'+nickname + actorMatch = domain+'/users/'+nickname for item in postJsonObject['object']['likes']['items']: if item['actor'].endswith(actorMatch): return True return False + def noOfLikes(postJsonObject: {}) -> int: """Returns the number of likes ona given post """ @@ -102,26 +105,28 @@ def noOfLikes(postJsonObject: {}) -> int: if not isinstance(postJsonObject['object']['likes'], dict): return 0 if not postJsonObject['object']['likes'].get('items'): - postJsonObject['object']['likes']['items']=[] - postJsonObject['object']['likes']['totalItems']=0 + postJsonObject['object']['likes']['items'] = [] + postJsonObject['object']['likes']['totalItems'] = 0 return len(postJsonObject['object']['likes']['items']) -def updateLikesCollection(recentPostsCache: {}, \ - baseDir: str,postFilename: str, \ - objectUrl: str, \ - actor: str,domain: str,debug: bool) -> None: + +def updateLikesCollection(recentPostsCache: {}, + baseDir: str, postFilename: str, + objectUrl: str, + actor: str, domain: str, debug: bool) -> None: """Updates the likes collection within a post """ - postJsonObject=loadJson(postFilename) + postJsonObject = loadJson(postFilename) if postJsonObject: - # remove any cached version of this post so that the like icon is changed - nickname=getNicknameFromActor(actor) - cachedPostFilename= \ - getCachedPostFilename(baseDir,nickname,domain,postJsonObject) + # remove any cached version of this post so that the + # like icon is changed + nickname = getNicknameFromActor(actor) + cachedPostFilename = getCachedPostFilename(baseDir, nickname, + domain, postJsonObject) if cachedPostFilename: if os.path.isfile(cachedPostFilename): os.remove(cachedPostFilename) - removePostFromCache(postJsonObject,recentPostsCache) + removePostFromCache(postJsonObject, recentPostsCache) if not postJsonObject.get('object'): if debug: @@ -131,11 +136,11 @@ def updateLikesCollection(recentPostsCache: {}, \ if not isinstance(postJsonObject['object'], dict): return if not objectUrl.endswith('/likes'): - objectUrl=objectUrl+'/likes' + objectUrl = objectUrl+'/likes' if not postJsonObject['object'].get('likes'): if debug: print('DEBUG: Adding initial likes to '+objectUrl) - likesJson={ + likesJson = { "@context": "https://www.w3.org/ns/activitystreams", 'id': objectUrl, 'type': 'Collection', @@ -145,80 +150,77 @@ def updateLikesCollection(recentPostsCache: {}, \ 'actor': actor }] } - postJsonObject['object']['likes']=likesJson + postJsonObject['object']['likes'] = likesJson else: if not postJsonObject['object']['likes'].get('items'): - postJsonObject['object']['likes']['items']=[] + postJsonObject['object']['likes']['items'] = [] for likeItem in postJsonObject['object']['likes']['items']: if likeItem.get('actor'): - if likeItem['actor']==actor: + if likeItem['actor'] == actor: return - newLike={ + newLike = { 'type': 'Like', 'actor': actor } postJsonObject['object']['likes']['items'].append(newLike) - postJsonObject['object']['likes']['totalItems']= \ - len(postJsonObject['object']['likes']['items']) + itlen = len(postJsonObject['object']['likes']['items']) + postJsonObject['object']['likes']['totalItems'] = itlen if debug: print('DEBUG: saving post with likes added') pprint(postJsonObject) - saveJson(postJsonObject,postFilename) + saveJson(postJsonObject, postFilename) -def like(recentPostsCache: {}, \ - session,baseDir: str,federationList: [], \ - nickname: str,domain: str,port: int, \ - ccList: [],httpPrefix: str, \ - objectUrl: str,actorLiked: str, \ - clientToServer: bool, \ - sendThreads: [],postLog: [], \ - personCache: {},cachedWebfingers: {}, \ - debug: bool,projectVersion: str) -> {}: + +def like(recentPostsCache: {}, + session, baseDir: str, federationList: [], + nickname: str, domain: str, port: int, + ccList: [], httpPrefix: str, + objectUrl: str, actorLiked: str, + clientToServer: bool, + sendThreads: [], postLog: [], + personCache: {}, cachedWebfingers: {}, + debug: bool, projectVersion: str) -> {}: """Creates a like actor is the person doing the liking 'to' might be a specific person (actor) whose post was liked object is typically the url of the message which was liked """ - if not urlPermitted(objectUrl,federationList,"inbox:write"): + if not urlPermitted(objectUrl, federationList, "inbox:write"): return None - fullDomain=domain + fullDomain = domain if port: - if port!=80 and port!=443: + if port != 80 and port != 443: if ':' not in domain: - fullDomain=domain+':'+str(port) + fullDomain = domain+':'+str(port) - likeTo=[] - if '/statuses/' in objectUrl: - likeTo=[objectUrl.split('/statuses/')[0]] - - newLikeJson={ + newLikeJson = { "@context": "https://www.w3.org/ns/activitystreams", 'type': 'Like', 'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname, 'object': objectUrl } if ccList: - if len(ccList)>0: - newLikeJson['cc']=ccList + if len(ccList) > 0: + newLikeJson['cc'] = ccList # Extract the domain and nickname from a statuses link - likedPostNickname=None - likedPostDomain=None - likedPostPort=None + likedPostNickname = None + likedPostDomain = None + likedPostPort = None if actorLiked: - likedPostNickname=getNicknameFromActor(actorLiked) - likedPostDomain,likedPostPort=getDomainFromActor(actorLiked) + likedPostNickname = getNicknameFromActor(actorLiked) + likedPostDomain, likedPostPort = getDomainFromActor(actorLiked) else: if '/users/' in objectUrl or \ '/channel/' in objectUrl or \ '/profile/' in objectUrl: - likedPostNickname=getNicknameFromActor(objectUrl) - likedPostDomain,likedPostPort=getDomainFromActor(objectUrl) + likedPostNickname = getNicknameFromActor(objectUrl) + likedPostDomain, likedPostPort = getDomainFromActor(objectUrl) if likedPostNickname: - postFilename=locatePost(baseDir,nickname,domain,objectUrl) + postFilename = locatePost(baseDir, nickname, domain, objectUrl) if not postFilename: print('DEBUG: like baseDir: '+baseDir) print('DEBUG: like nickname: '+nickname) @@ -226,83 +228,72 @@ def like(recentPostsCache: {}, \ print('DEBUG: like objectUrl: '+objectUrl) return None - updateLikesCollection(recentPostsCache, \ - baseDir,postFilename,objectUrl, \ - newLikeJson['actor'],domain,debug) + updateLikesCollection(recentPostsCache, + baseDir, postFilename, objectUrl, + newLikeJson['actor'], domain, debug) - sendSignedJson(newLikeJson,session,baseDir, \ - nickname,domain,port, \ - likedPostNickname,likedPostDomain,likedPostPort, \ - 'https://www.w3.org/ns/activitystreams#Public', \ - httpPrefix,True,clientToServer,federationList, \ - sendThreads,postLog,cachedWebfingers,personCache, \ - debug,projectVersion) + sendSignedJson(newLikeJson, session, baseDir, + nickname, domain, port, + likedPostNickname, likedPostDomain, likedPostPort, + 'https://www.w3.org/ns/activitystreams#Public', + httpPrefix, True, clientToServer, federationList, + sendThreads, postLog, cachedWebfingers, personCache, + debug, projectVersion) return newLikeJson -def likePost(recentPostsCache: {}, \ - session,baseDir: str,federationList: [], \ - nickname: str,domain: str,port: int,httpPrefix: str, \ - likeNickname: str,likeDomain: str,likePort: int, \ - ccList: [], \ - likeStatusNumber: int,clientToServer: bool, \ - sendThreads: [],postLog: [], \ - personCache: {},cachedWebfingers: {}, \ - debug: bool,projectVersion: str) -> {}: + +def likePost(recentPostsCache: {}, + session, baseDir: str, federationList: [], + nickname: str, domain: str, port: int, httpPrefix: str, + likeNickname: str, likeDomain: str, likePort: int, + ccList: [], + likeStatusNumber: int, clientToServer: bool, + sendThreads: [], postLog: [], + personCache: {}, cachedWebfingers: {}, + debug: bool, projectVersion: str) -> {}: """Likes a given status post. This is only used by unit tests """ - likeDomain=likeDomain + likeDomain = likeDomain if likePort: - if likePort!=80 and likePort!=443: + if likePort != 80 and likePort != 443: if ':' not in likeDomain: - likeDomain=likeDomain+':'+str(likePort) + likeDomain = likeDomain+':'+str(likePort) - actorLiked= \ - httpPrefix + '://'+likeDomain+'/users/'+likeNickname - objectUrl=actorLiked+'/statuses/'+str(likeStatusNumber) + actorLiked = httpPrefix + '://'+likeDomain+'/users/'+likeNickname + objectUrl = actorLiked+'/statuses/'+str(likeStatusNumber) - ccUrl=httpPrefix+'://'+likeDomain+'/users/'+likeNickname - if likePort: - if likePort!=80 and likePort!=443: - if ':' not in likeDomain: - ccUrl= \ - httpPrefix+'://'+likeDomain+':'+ \ - str(likePort)+'/users/'+likeNickname + return like(recentPostsCache, + session, baseDir, federationList, nickname, domain, port, + ccList, httpPrefix, objectUrl, actorLiked, clientToServer, + sendThreads, postLog, personCache, cachedWebfingers, + debug, projectVersion) - return like(recentPostsCache, \ - session,baseDir,federationList,nickname,domain,port, \ - ccList,httpPrefix,objectUrl,actorLiked,clientToServer, \ - sendThreads,postLog,personCache,cachedWebfingers, \ - debug,projectVersion) -def undolike(recentPostsCache: {}, \ - session,baseDir: str,federationList: [], \ - nickname: str,domain: str,port: int, \ - ccList: [],httpPrefix: str, \ - objectUrl: str,actorLiked: str, \ - clientToServer: bool, \ - sendThreads: [],postLog: [], \ - personCache: {},cachedWebfingers: {}, \ - debug: bool,projectVersion: str) -> {}: +def undolike(recentPostsCache: {}, + session, baseDir: str, federationList: [], + nickname: str, domain: str, port: int, + ccList: [], httpPrefix: str, + objectUrl: str, actorLiked: str, + clientToServer: bool, + sendThreads: [], postLog: [], + personCache: {}, cachedWebfingers: {}, + debug: bool, projectVersion: str) -> {}: """Removes a like actor is the person doing the liking 'to' might be a specific person (actor) whose post was liked object is typically the url of the message which was liked """ - if not urlPermitted(objectUrl,federationList,"inbox:write"): + if not urlPermitted(objectUrl, federationList, "inbox:write"): return None - fullDomain=domain + fullDomain = domain if port: - if port!=80 and port!=443: + if port != 80 and port != 443: if ':' not in domain: - fullDomain=domain+':'+str(port) + fullDomain = domain+':'+str(port) - likeTo=[] - if '/statuses/' in objectUrl: - likeTo=[objectUrl.split('/statuses/')[0]] - - newUndoLikeJson={ + newUndoLikeJson = { "@context": "https://www.w3.org/ns/activitystreams", 'type': 'Undo', 'actor': httpPrefix+'://'+fullDomain+'/users/'+nickname, @@ -313,126 +304,91 @@ def undolike(recentPostsCache: {}, \ } } if ccList: - if len(ccList)>0: - newUndoLikeJson['cc']=ccList - newUndoLikeJson['object']['cc']=ccList + if len(ccList) > 0: + newUndoLikeJson['cc'] = ccList + newUndoLikeJson['object']['cc'] = ccList # Extract the domain and nickname from a statuses link - likedPostNickname=None - likedPostDomain=None - likedPostPort=None + likedPostNickname = None + likedPostDomain = None + likedPostPort = None if actorLiked: - likedPostNickname=getNicknameFromActor(actorLiked) - likedPostDomain,likedPostPort=getDomainFromActor(actorLiked) + likedPostNickname = getNicknameFromActor(actorLiked) + likedPostDomain, likedPostPort = getDomainFromActor(actorLiked) else: if '/users/' in objectUrl or \ '/channel/' in objectUrl or \ '/profile/' in objectUrl: - likedPostNickname=getNicknameFromActor(objectUrl) - likedPostDomain,likedPostPort=getDomainFromActor(objectUrl) + likedPostNickname = getNicknameFromActor(objectUrl) + likedPostDomain, likedPostPort = getDomainFromActor(objectUrl) if likedPostNickname: - postFilename=locatePost(baseDir,nickname,domain,objectUrl) + postFilename = locatePost(baseDir, nickname, domain, objectUrl) if not postFilename: return None - undoLikesCollectionEntry(baseDir,postFilename,objectUrl, \ - newLikeJson['actor'],domain,debug) + undoLikesCollectionEntry(baseDir, postFilename, objectUrl, + newUndoLikeJson['actor'], domain, debug) - sendSignedJson(newUndoLikeJson,session,baseDir, \ - nickname,domain,port, \ - likedPostNickname,likedPostDomain,likedPostPort, \ - 'https://www.w3.org/ns/activitystreams#Public', \ - httpPrefix,True,clientToServer,federationList, \ - sendThreads,postLog,cachedWebfingers,personCache, \ - debug,projectVersion) + sendSignedJson(newUndoLikeJson, session, baseDir, + nickname, domain, port, + likedPostNickname, likedPostDomain, likedPostPort, + 'https://www.w3.org/ns/activitystreams#Public', + httpPrefix, True, clientToServer, federationList, + sendThreads, postLog, cachedWebfingers, personCache, + debug, projectVersion) else: return None return newUndoLikeJson -def undoLikePost(recentPostsCache: {}, \ - session,baseDir: str,federationList: [], \ - nickname: str,domain: str,port: int,httpPrefix: str, \ - likeNickname: str,likeDomain: str,likePort: int, \ - ccList: [], \ - likeStatusNumber: int,clientToServer: bool, \ - sendThreads: [],postLog: [], \ - personCache: {},cachedWebfingers: {}, \ - debug: bool) -> {}: - """Removes a liked post - """ - likeDomain=likeDomain - if likePort: - if likePort!=80 and likePort!=443: - if ':' not in likeDomain: - likeDomain=likeDomain+':'+str(likePort) - objectUrl= \ - httpPrefix+'://'+likeDomain+'/users/'+likeNickname+ \ - '/statuses/'+str(likeStatusNumber) - - ccUrl=httpPrefix+'://'+likeDomain+'/users/'+likeNickname - if likePort: - if likePort!=80 and likePort!=443: - if ':' not in likeDomain: - ccUrl= \ - httpPrefix+'://'+likeDomain+':'+ \ - str(likePort)+'/users/'+likeNickname - - return undoLike(recentPostsCache, \ - session,baseDir,federationList,nickname,domain,port, \ - ccList,httpPrefix,objectUrl,clientToServer, \ - sendThreads,postLog,personCache,cachedWebfingers,debug) - -def sendLikeViaServer(baseDir: str,session, \ - fromNickname: str,password: str, - fromDomain: str,fromPort: int, \ - httpPrefix: str,likeUrl: str, \ - cachedWebfingers: {},personCache: {}, \ - debug: bool,projectVersion: str) -> {}: +def sendLikeViaServer(baseDir: str, session, + fromNickname: str, password: str, + fromDomain: str, fromPort: int, + httpPrefix: str, likeUrl: str, + cachedWebfingers: {}, personCache: {}, + debug: bool, projectVersion: str) -> {}: """Creates a like via c2s """ if not session: print('WARN: No session for sendLikeViaServer') return 6 - fromDomainFull=fromDomain + fromDomainFull = fromDomain if fromPort: - if fromPort!=80 and fromPort!=443: + if fromPort != 80 and fromPort != 443: if ':' not in fromDomain: - fromDomainFull=fromDomain+':'+str(fromPort) + fromDomainFull = fromDomain+':'+str(fromPort) - toUrl=['https://www.w3.org/ns/activitystreams#Public'] - ccUrl=httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname+'/followers' - - if '/statuses/' in likeUrl: - toUrl=[likeUrl.split('/statuses/')[0]] - - newLikeJson={ + newLikeJson = { "@context": "https://www.w3.org/ns/activitystreams", 'type': 'Like', 'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname, 'object': likeUrl } - handle=httpPrefix+'://'+fromDomainFull+'/@'+fromNickname + handle = httpPrefix+'://'+fromDomainFull+'/@'+fromNickname # lookup the inbox for the To handle - wfRequest=webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ - fromDomain,projectVersion) + wfRequest = webfingerHandle(session, handle, httpPrefix, + cachedWebfingers, + fromDomain, projectVersion) if not wfRequest: if debug: print('DEBUG: announce webfinger failed for '+handle) return 1 - postToBox='outbox' + postToBox = 'outbox' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ - getPersonBox(baseDir,session,wfRequest,personCache, \ - projectVersion,httpPrefix,fromNickname, \ - fromDomain,postToBox) + (inboxUrl, pubKeyId, pubKey, fromPersonId, + sharedInbox, capabilityAcquisition, + avatarUrl, displayName) = getPersonBox(baseDir, session, wfRequest, + personCache, + projectVersion, httpPrefix, + fromNickname, fromDomain, + postToBox) if not inboxUrl: if debug: @@ -443,50 +399,44 @@ def sendLikeViaServer(baseDir: str,session, \ print('DEBUG: No actor was found for '+handle) return 4 - authHeader=createBasicAuthHeader(fromNickname,password) + authHeader = createBasicAuthHeader(fromNickname, password) - headers={ - 'host': fromDomain, \ - 'Content-type': 'application/json', \ + headers = { + 'host': fromDomain, + 'Content-type': 'application/json', 'Authorization': authHeader } - postResult= \ - postJson(session,newLikeJson,[],inboxUrl,headers,"inbox:write") - #if not postResult: - # if debug: - # print('DEBUG: POST announce failed for c2s to '+inboxUrl) - # return 5 + postResult = postJson(session, newLikeJson, [], inboxUrl, + headers, "inbox:write") + if not postResult: + print('WARN: POST announce failed for c2s to ' + inboxUrl) + return 5 if debug: print('DEBUG: c2s POST like success') return newLikeJson -def sendUndoLikeViaServer(baseDir: str,session, \ - fromNickname: str,password: str, \ - fromDomain: str,fromPort: int, \ - httpPrefix: str,likeUrl: str, \ - cachedWebfingers: {},personCache: {}, \ - debug: bool,projectVersion: str) -> {}: + +def sendUndoLikeViaServer(baseDir: str, session, + fromNickname: str, password: str, + fromDomain: str, fromPort: int, + httpPrefix: str, likeUrl: str, + cachedWebfingers: {}, personCache: {}, + debug: bool, projectVersion: str) -> {}: """Undo a like via c2s """ if not session: print('WARN: No session for sendUndoLikeViaServer') return 6 - fromDomainFull=fromDomain + fromDomainFull = fromDomain if fromPort: - if fromPort!=80 and fromPort!=443: + if fromPort != 80 and fromPort != 443: if ':' not in fromDomain: - fromDomainFull=fromDomain+':'+str(fromPort) + fromDomainFull = fromDomain+':'+str(fromPort) - toUrl=['https://www.w3.org/ns/activitystreams#Public'] - ccUrl=httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname+'/followers' - - if '/statuses/' in likeUrl: - toUrl=[likeUrl.split('/statuses/')[0]] - - newUndoLikeJson={ + newUndoLikeJson = { "@context": "https://www.w3.org/ns/activitystreams", 'type': 'Undo', 'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname, @@ -497,24 +447,26 @@ def sendUndoLikeViaServer(baseDir: str,session, \ } } - handle=httpPrefix+'://'+fromDomainFull+'/@'+fromNickname + handle = httpPrefix+'://'+fromDomainFull+'/@'+fromNickname # lookup the inbox for the To handle - wfRequest= \ - webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ - fromDomain,projectVersion) + wfRequest = webfingerHandle(session, handle, httpPrefix, + cachedWebfingers, + fromDomain, projectVersion) if not wfRequest: if debug: print('DEBUG: announce webfinger failed for '+handle) return 1 - postToBox='outbox' + postToBox = 'outbox' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ - getPersonBox(baseDir,session,wfRequest,personCache, \ - projectVersion,httpPrefix,fromNickname, \ - fromDomain,postToBox) + (inboxUrl, pubKeyId, pubKey, fromPersonId, + sharedInbox, capabilityAcquisition, + avatarUrl, displayName) = getPersonBox(baseDir, session, wfRequest, + personCache, projectVersion, + httpPrefix, fromNickname, + fromDomain, postToBox) if not inboxUrl: if debug: @@ -525,36 +477,36 @@ def sendUndoLikeViaServer(baseDir: str,session, \ print('DEBUG: No actor was found for '+handle) return 4 - authHeader=createBasicAuthHeader(fromNickname,password) + authHeader = createBasicAuthHeader(fromNickname, password) - headers={ - 'host': fromDomain, \ - 'Content-type': 'application/json', \ + headers = { + 'host': fromDomain, + 'Content-type': 'application/json', 'Authorization': authHeader } - postResult= \ - postJson(session,newUndoLikeJson,[],inboxUrl,headers,"inbox:write") - #if not postResult: - # if debug: - # print('DEBUG: POST announce failed for c2s to '+inboxUrl) - # return 5 + postResult = postJson(session, newUndoLikeJson, [], inboxUrl, + headers, "inbox:write") + if not postResult: + print('WARN: POST announce failed for c2s to ' + inboxUrl) + return 5 if debug: print('DEBUG: c2s POST undo like success') return newUndoLikeJson -def outboxLike(recentPostsCache: {}, \ - baseDir: str,httpPrefix: str, \ - nickname: str,domain: str,port: int, \ - messageJson: {},debug: bool) -> None: + +def outboxLike(recentPostsCache: {}, + baseDir: str, httpPrefix: str, + nickname: str, domain: str, port: int, + messageJson: {}, debug: bool) -> None: """ When a like request is received by the outbox from c2s """ if not messageJson.get('type'): if debug: print('DEBUG: like - no type') return - if not messageJson['type']=='Like': + if not messageJson['type'] == 'Like': if debug: print('DEBUG: not a like') return @@ -569,30 +521,31 @@ def outboxLike(recentPostsCache: {}, \ if debug: print('DEBUG: c2s like request arrived in outbox') - messageId=messageJson['object'].replace('/activity','') + messageId = messageJson['object'].replace('/activity', '') if ':' in domain: - domain=domain.split(':')[0] - postFilename=locatePost(baseDir,nickname,domain,messageId) + domain = domain.split(':')[0] + postFilename = locatePost(baseDir, nickname, domain, messageId) if not postFilename: if debug: print('DEBUG: c2s like post not found in inbox or outbox') print(messageId) return True - updateLikesCollection(recentPostsCache, \ - baseDir,postFilename,messageId, \ - messageJson['actor'],domain,debug) + updateLikesCollection(recentPostsCache, + baseDir, postFilename, messageId, + messageJson['actor'], domain, debug) if debug: print('DEBUG: post liked via c2s - '+postFilename) -def outboxUndoLike(recentPostsCache: {}, \ - baseDir: str,httpPrefix: str, \ - nickname: str,domain: str,port: int, \ - messageJson: {},debug: bool) -> None: + +def outboxUndoLike(recentPostsCache: {}, + baseDir: str, httpPrefix: str, + nickname: str, domain: str, port: int, + messageJson: {}, debug: bool) -> None: """ When an undo like request is received by the outbox from c2s """ if not messageJson.get('type'): return - if not messageJson['type']=='Undo': + if not messageJson['type'] == 'Undo': return if not messageJson.get('object'): return @@ -604,7 +557,7 @@ def outboxUndoLike(recentPostsCache: {}, \ if debug: print('DEBUG: undo like - no type') return - if not messageJson['object']['type']=='Like': + if not messageJson['object']['type'] == 'Like': if debug: print('DEBUG: not a undo like') return @@ -619,16 +572,17 @@ def outboxUndoLike(recentPostsCache: {}, \ if debug: print('DEBUG: c2s undo like request arrived in outbox') - messageId=messageJson['object']['object'].replace('/activity','') + messageId = messageJson['object']['object'].replace('/activity', '') if ':' in domain: - domain=domain.split(':')[0] - postFilename=locatePost(baseDir,nickname,domain,messageId) + domain = domain.split(':')[0] + postFilename = locatePost(baseDir, nickname, domain, messageId) if not postFilename: if debug: print('DEBUG: c2s undo like post not found in inbox or outbox') print(messageId) return True - undoLikesCollectionEntry(recentPostsCache,baseDir,postFilename,messageId, \ - messageJson['actor'],domain,debug) + undoLikesCollectionEntry(recentPostsCache, baseDir, postFilename, + messageId, messageJson['actor'], + domain, debug) if debug: print('DEBUG: post undo liked via c2s - '+postFilename)