Admin of '+domain+'
', - 'statuses_count': 1, - 'url': httpPrefix+'://'+domainFull+'/@'+adminActor['preferredUsername'], - 'username': adminActor['preferredUsername'] + 'contact_account': { + 'acct': adminActor['preferredUsername'], + 'avatar': adminActor['icon']['url'], + 'avatar_static': adminActor['icon']['url'], + 'bot': isBot, + 'created_at': '2019-07-01T10:30:00Z', + 'display_name': adminActor['name'], + 'emojis': [], + 'fields': [], + 'followers_count': 1, + 'following_count': 1, + 'header': adminActor['image']['url'], + 'header_static': adminActor['image']['url'], + 'id': '1', + 'last_status_at': '2019-07-01T10:30:00Z', + 'locked': adminActor['manuallyApprovesFollowers'], + 'note': 'Admin of '+domain+'
', + 'statuses_count': 1, + 'url': httpPrefix+'://'+domainFull+'/@'+adminActor['preferredUsername'], + 'username': adminActor['preferredUsername'] }, 'description': instanceDescription, 'email': 'admin@'+domain, diff --git a/migrate.py b/migrate.py index 63bf666bb..9d561c30d 100644 --- a/migrate.py +++ b/migrate.py @@ -1,10 +1,10 @@ -__filename__ = "migrate.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="migrate.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os diff --git a/outbox.py b/outbox.py index 6878b35b0..91e24bcf8 100644 --- a/outbox.py +++ b/outbox.py @@ -1,10 +1,10 @@ -__filename__ = "outbox.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="outbox.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os import json diff --git a/person.py b/person.py index 977bd1ecd..2876cb3c9 100644 --- a/person.py +++ b/person.py @@ -1,10 +1,10 @@ -__filename__ = "person.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="person.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json import time @@ -42,9 +42,9 @@ from config import setConfigParam from config import getConfigParam def generateRSAKey() -> (str,str): - key = RSA.generate(2048) - privateKeyPem = key.exportKey("PEM").decode("utf-8") - publicKeyPem = key.publickey().exportKey("PEM").decode("utf-8") + key=RSA.generate(2048) + privateKeyPem=key.exportKey("PEM").decode("utf-8") + publicKeyPem=key.publickey().exportKey("PEM").decode("utf-8") return privateKeyPem,publicKeyPem def setProfileImage(baseDir: str,httpPrefix :str,nickname: str,domain: str, \ @@ -100,10 +100,13 @@ def setProfileImage(baseDir: str,httpPrefix :str,nickname: str,domain: str, \ personJson=loadJson(personFilename) if personJson: personJson[iconFilenameBase]['mediaType']=mediaType - personJson[iconFilenameBase]['url']=httpPrefix+'://'+fullDomain+'/users/'+nickname+'/'+iconFilename + personJson[iconFilenameBase]['url']= \ + httpPrefix+'://'+fullDomain+'/users/'+nickname+'/'+iconFilename saveJson(personJson,personFilename) - cmd = '/usr/bin/convert '+imageFilename+' -size '+resolution+' -quality 50 '+profileFilename + cmd= \ + '/usr/bin/convert '+imageFilename+' -size '+ \ + resolution+' -quality 50 '+profileFilename subprocess.call(cmd, shell=True) removeMetaData(profileFilename,profileFilename) return True @@ -180,61 +183,66 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \ approveFollowers=True personType='Application' - newPerson = {'@context': ['https://www.w3.org/ns/activitystreams', - 'https://w3id.org/security/v1', - {'Emoji': 'toot:Emoji', - 'Hashtag': 'as:Hashtag', - 'IdentityProof': 'toot:IdentityProof', - 'PropertyValue': 'schema:PropertyValue', - 'alsoKnownAs': {'@id': 'as:alsoKnownAs', '@type': '@id'}, - 'focalPoint': {'@container': '@list', '@id': 'toot:focalPoint'}, - 'manuallyApprovesFollowers': 'as:manuallyApprovesFollowers', - 'movedTo': {'@id': 'as:movedTo', '@type': '@id'}, - 'schema': 'http://schema.org#', - 'value': 'schema:value'}], - 'attachment': [], - 'alsoKnownAs': [], - 'discoverable': False, - 'endpoints': { - 'id': personId+'/endpoints', - 'sharedInbox': httpPrefix+'://'+domain+'/inbox', - }, - 'capabilityAcquisitionEndpoint': httpPrefix+'://'+domain+'/caps/new', - 'followers': personId+'/followers', - 'following': personId+'/following', - 'shares': personId+'/shares', - 'orgSchema': None, - 'skills': {}, - 'roles': {}, - 'availability': None, - 'icon': {'mediaType': 'image/png', - 'type': 'Image', - 'url': personId+'/avatar'+str(randint(10000000000000,99999999999999))+'.png'}, - 'id': personId, - 'image': {'mediaType': 'image/png', - 'type': 'Image', - 'url': personId+'/image'+str(randint(10000000000000,99999999999999))+'.png'}, - 'inbox': inboxStr, - 'manuallyApprovesFollowers': approveFollowers, - 'name': personName, - 'outbox': personId+'/outbox', - 'preferredUsername': personName, - 'summary': '', - 'publicKey': { - 'id': personId+'#main-key', - 'owner': personId, - 'publicKeyPem': publicKeyPem - }, - 'tag': [], - 'type': personType, - 'url': personUrl, - 'nomadicLocations': [{ - 'id': personId, - 'type': 'nomadicLocation', - 'locationAddress':'acct:'+nickname+'@'+domain, - 'locationPrimary':True, - 'locationDeleted':False - }] + newPerson={ + '@context': ['https://www.w3.org/ns/activitystreams', + 'https://w3id.org/security/v1', + {'Emoji': 'toot:Emoji', + 'Hashtag': 'as:Hashtag', + 'IdentityProof': 'toot:IdentityProof', + 'PropertyValue': 'schema:PropertyValue', + 'alsoKnownAs': {'@id': 'as:alsoKnownAs', '@type': '@id'}, + 'focalPoint': {'@container': '@list', '@id': 'toot:focalPoint'}, + 'manuallyApprovesFollowers': 'as:manuallyApprovesFollowers', + 'movedTo': {'@id': 'as:movedTo', '@type': '@id'}, + 'schema': 'http://schema.org#', + 'value': 'schema:value'}], + 'attachment': [], + 'alsoKnownAs': [], + 'discoverable': False, + 'endpoints': { + 'id': personId+'/endpoints', + 'sharedInbox': httpPrefix+'://'+domain+'/inbox', + }, + 'capabilityAcquisitionEndpoint': httpPrefix+'://'+domain+'/caps/new', + 'followers': personId+'/followers', + 'following': personId+'/following', + 'shares': personId+'/shares', + 'orgSchema': None, + 'skills': {}, + 'roles': {}, + 'availability': None, + 'icon': { + 'mediaType': 'image/png', + 'type': 'Image', + 'url': personId+'/avatar'+str(randint(10000000000000,99999999999999))+'.png' + }, + 'id': personId, + 'image': { + 'mediaType': 'image/png', + 'type': 'Image', + 'url': personId+'/image'+str(randint(10000000000000,99999999999999))+'.png' + }, + 'inbox': inboxStr, + 'manuallyApprovesFollowers': approveFollowers, + 'name': personName, + 'outbox': personId+'/outbox', + 'preferredUsername': personName, + 'summary': '', + 'publicKey': { + 'id': personId+'#main-key', + 'owner': personId, + 'publicKeyPem': publicKeyPem + }, + 'tag': [], + 'type': personType, + 'url': personUrl, + 'nomadicLocations': [{ + 'id': personId, + 'type': 'nomadicLocation', + 'locationAddress':'acct:'+nickname+'@'+domain, + 'locationPrimary':True, + 'locationDeleted':False + }] } if nickname=='inbox': @@ -344,7 +352,7 @@ def createPerson(baseDir: str,nickname: str,domain: str,port: int, \ if registrationsRemaining<=0: return None,None,None,None - privateKeyPem,publicKeyPem,newPerson,webfingerEndpoint = \ + privateKeyPem,publicKeyPem,newPerson,webfingerEndpoint= \ createPersonBase(baseDir,nickname,domain,port,httpPrefix,saveToFile,password) if noOfAccounts(baseDir)==1: #print(nickname+' becomes the instance admin and a moderator') @@ -621,7 +629,7 @@ def isSuspended(baseDir: str,nickname: str) -> bool: suspendedFilename=baseDir+'/accounts/suspended.txt' if os.path.isfile(suspendedFilename): with open(suspendedFilename, "r") as f: - lines = f.readlines() + lines=f.readlines() suspendedFile=open(suspendedFilename,"w+") for suspended in lines: if suspended.strip('\n')==nickname: @@ -634,7 +642,7 @@ def unsuspendAccount(baseDir: str,nickname: str) -> None: suspendedFilename=baseDir+'/accounts/suspended.txt' if os.path.isfile(suspendedFilename): with open(suspendedFilename, "r") as f: - lines = f.readlines() + lines=f.readlines() suspendedFile=open(suspendedFilename,"w+") for suspended in lines: if suspended.strip('\n')!=nickname: @@ -653,7 +661,7 @@ def suspendAccount(baseDir: str,nickname: str,domain: str) -> None: moderatorsFile=baseDir+'/accounts/moderators.txt' if os.path.isfile(moderatorsFile): with open(moderatorsFile, "r") as f: - lines = f.readlines() + lines=f.readlines() for moderator in lines: if moderator.strip('\n')==nickname: return @@ -668,7 +676,7 @@ def suspendAccount(baseDir: str,nickname: str,domain: str) -> None: suspendedFilename=baseDir+'/accounts/suspended.txt' if os.path.isfile(suspendedFilename): with open(suspendedFilename, "r") as f: - lines = f.readlines() + lines=f.readlines() for suspended in lines: if suspended.strip('\n')==nickname: return @@ -703,7 +711,7 @@ def canRemovePost(baseDir: str,nickname: str,domain: str,port: int,postId: str) moderatorsFile=baseDir+'/accounts/moderators.txt' if os.path.isfile(moderatorsFile): with open(moderatorsFile, "r") as f: - lines = f.readlines() + lines=f.readlines() for moderator in lines: if domainFull+'/users/'+moderator.strip('\n')+'/' in postId: return False @@ -720,10 +728,10 @@ def removeTagsForNickname(baseDir: str,nickname: str,domain: str,port: int) -> N if ':' not in domain: domainFull=domain+':'+str(port) matchStr=domainFull+'/users/'+nickname+'/' - directory = os.fsencode(baseDir+'/tags/') + directory=os.fsencode(baseDir+'/tags/') for f in os.scandir(directory): f=f.name - filename = os.fsdecode(f) + filename=os.fsdecode(f) if not filename.endswith(".txt"): continue tagFilename=os.path.join(directory,filename) @@ -732,7 +740,7 @@ def removeTagsForNickname(baseDir: str,nickname: str,domain: str,port: int) -> N if matchStr not in open(tagFilename).read(): continue with open(tagFilename, "r") as f: - lines = f.readlines() + lines=f.readlines() tagFile=open(tagFilename,"w+") if tagFile: for tagline in lines: @@ -752,7 +760,7 @@ def removeAccount(baseDir: str,nickname: str,domain: str,port: int) -> bool: moderatorsFile=baseDir+'/accounts/moderators.txt' if os.path.isfile(moderatorsFile): with open(moderatorsFile, "r") as f: - lines = f.readlines() + lines=f.readlines() for moderator in lines: if moderator.strip('\n')==nickname: return False diff --git a/pgp.py b/pgp.py index 62679319e..88e6587d8 100644 --- a/pgp.py +++ b/pgp.py @@ -1,10 +1,10 @@ -__filename__ = "pgp.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="pgp.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json diff --git a/posts.py b/posts.py index e0b74d6db..f761d441a 100644 --- a/posts.py +++ b/posts.py @@ -1,10 +1,10 @@ -__filename__ = "posts.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="posts.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import requests import json @@ -68,7 +68,7 @@ def isModerator(baseDir: str,nickname: str) -> bool: return False with open(moderatorsFile, "r") as f: - lines = f.readlines() + lines=f.readlines() if len(lines)==0: if getConfigParam(baseDir,'admin')==nickname: return True @@ -116,7 +116,7 @@ def getPersonKey(nickname: str,domain: str,baseDir: str,keyType='public', \ return keyPem def cleanHtml(rawHtml: str) -> str: - #text = BeautifulSoup(rawHtml, 'html.parser').get_text() + #text=BeautifulSoup(rawHtml, 'html.parser').get_text() text=rawHtml return html.unescape(text) @@ -134,8 +134,8 @@ def getUserUrl(wfRequest: {}) -> str: def parseUserFeed(session,feedUrl: str,asHeader: {}, \ projectVersion: str,httpPrefix: str,domain: str) -> None: - feedJson = getJson(session,feedUrl,asHeader,None, \ - projectVersion,httpPrefix,domain) + feedJson=getJson(session,feedUrl,asHeader,None, \ + projectVersion,httpPrefix,domain) if not feedJson: return @@ -143,11 +143,11 @@ def parseUserFeed(session,feedUrl: str,asHeader: {}, \ for item in feedJson['orderedItems']: yield item - nextUrl = None + nextUrl=None if 'first' in feedJson: - nextUrl = feedJson['first'] + nextUrl=feedJson['first'] elif 'next' in feedJson: - nextUrl = feedJson['next'] + nextUrl=feedJson['next'] if nextUrl: if isinstance(nextUrl, str): @@ -165,29 +165,37 @@ def getPersonBox(baseDir: str,session,wfRequest: {},personCache: {}, \ projectVersion: str,httpPrefix: str, \ nickname: str,domain: str, \ boxName='inbox') -> (str,str,str,str,str,str,str,str): - asHeader = {'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'} + asHeader={ + 'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"' + } if not wfRequest.get('errors'): - personUrl = getUserUrl(wfRequest) + personUrl=getUserUrl(wfRequest) else: if nickname=='dev': # try single user instance print('getPersonBox: Trying single user instance with ld+json') - personUrl = httpPrefix+'://'+domain - asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} + personUrl=httpPrefix+'://'+domain + asHeader={ + 'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' + } else: - personUrl = httpPrefix+'://'+domain+'/users/'+nickname + personUrl=httpPrefix+'://'+domain+'/users/'+nickname if not personUrl: return None,None,None,None,None,None,None,None - personJson = getPersonFromCache(baseDir,personUrl,personCache) + personJson=getPersonFromCache(baseDir,personUrl,personCache) if not personJson: if '/channel/' in personUrl: - asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} - personJson = getJson(session,personUrl,asHeader,None, \ - projectVersion,httpPrefix,domain) + asHeader={ + 'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' + } + personJson=getJson(session,personUrl,asHeader,None, \ + projectVersion,httpPrefix,domain) if not personJson: - asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} - personJson = getJson(session,personUrl,asHeader,None, \ - projectVersion,httpPrefix,domain) + asHeader={ + 'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' + } + personJson=getJson(session,personUrl,asHeader,None, \ + projectVersion,httpPrefix,domain) if not personJson: print('Unable to get actor') return None,None,None,None,None,None,None,None @@ -246,12 +254,16 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ personPosts={} if not outboxUrl: return personPosts - asHeader = {'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"'} + asHeader={ + 'Accept': 'application/activity+json; profile="https://www.w3.org/ns/activitystreams"' + } if '/outbox/' in outboxUrl: - asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} + asHeader={ + 'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' + } if raw: - result = [] - i = 0 + result=[] + i=0 userFeed=parseUserFeed(session,outboxUrl,asHeader, \ projectVersion,httpPrefix,domain) for item in userFeed: @@ -262,7 +274,7 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ pprint(result) return None - i = 0 + i=0 userFeed=parseUserFeed(session,outboxUrl,asHeader, \ projectVersion,httpPrefix,domain) for item in userFeed: @@ -291,7 +303,7 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ print('No published attribute') continue #pprint(item) - published = item['object']['published'] + published=item['object']['published'] if not personPosts.get(item['id']): # check that this is a public post # #Public should appear in the "to" list @@ -304,7 +316,7 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ if not isPublic: continue - content = item['object']['content'].replace(''',"'") + content=item['object']['content'].replace(''',"'") mentions=[] emoji={} @@ -337,12 +349,12 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ print('max emojis reached') continue - summary = '' + summary='' if item['object'].get('summary'): if item['object']['summary']: - summary = item['object']['summary'] + summary=item['object']['summary'] - inReplyTo = '' + inReplyTo='' if item['object'].get('inReplyTo'): if item['object']['inReplyTo']: # No replies to non-permitted domains @@ -352,17 +364,17 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ if debug: print('url not permitted '+item['object']['inReplyTo']) continue - inReplyTo = item['object']['inReplyTo'] + inReplyTo=item['object']['inReplyTo'] - conversation = '' + conversation='' if item['object'].get('conversation'): if item['object']['conversation']: # no conversations originated in non-permitted domains if urlPermitted(item['object']['conversation'], \ federationList,"objects:read"): - conversation = item['object']['conversation'] + conversation=item['object']['conversation'] - attachment = [] + attachment=[] if item['object'].get('attachment'): if item['object']['attachment']: for attach in item['object']['attachment']: @@ -376,15 +388,15 @@ def getPosts(session,outboxUrl: str,maxPosts: int, \ if debug: print('url not permitted '+attach['url']) - sensitive = False + sensitive=False if item['object'].get('sensitive'): - sensitive = item['object']['sensitive'] + sensitive=item['object']['sensitive'] if simple: print(cleanHtml(content)+'\n') else: pprint(item) - personPosts[item['id']] = { + personPosts[item['id']]={ "sensitive": sensitive, "inreplyto": inReplyTo, "summary": summary, @@ -406,10 +418,10 @@ def deleteAllPosts(baseDir: str,nickname: str, domain: str,boxname: str) -> None """ if boxname!='inbox' and boxname!='outbox' and boxname!='tlblogs': return - boxDir = createPersonDir(nickname,domain,baseDir,boxname) + boxDir=createPersonDir(nickname,domain,baseDir,boxname) for deleteFilename in os.scandir(boxDir): deleteFilename=deleteFilename.name - filePath = os.path.join(boxDir, deleteFilename) + filePath=os.path.join(boxDir,deleteFilename) try: if os.path.isfile(filePath): os.unlink(filePath) @@ -431,7 +443,7 @@ def savePostToBox(baseDir: str,httpPrefix: str,postId: str, \ domain=domain.split(':')[0] if not postId: - statusNumber,published = getStatusNumber() + statusNumber,published=getStatusNumber() postId= \ httpPrefix+'://'+originalDomain+'/users/'+nickname+ \ '/statuses/'+statusNumber @@ -441,7 +453,7 @@ def savePostToBox(baseDir: str,httpPrefix: str,postId: str, \ postJsonObject['object']['id']=postId postJsonObject['object']['atomUri']=postId - boxDir = createPersonDir(nickname,domain,baseDir,boxname) + boxDir=createPersonDir(nickname,domain,baseDir,boxname) filename=boxDir+'/'+postId.replace('/','#')+'.json' saveJson(postJsonObject,filename) return filename @@ -472,7 +484,7 @@ def updateHashtagsIndex(baseDir: str,tag: {},newPostId: str) -> None: if tagline not in open(tagsFilename).read(): try: with open(tagsFilename, 'r+') as tagsFile: - content = tagsFile.read() + content=tagsFile.read() tagsFile.seek(0, 0) tagsFile.write(tagline+content) except Exception as e: @@ -491,7 +503,7 @@ def addSchedulePost(baseDir: str,nickname: str,domain: str, \ if indexStr not in open(scheduleIndexFilename).read(): try: with open(scheduleIndexFilename, 'r+') as scheduleFile: - content = scheduleFile.read() + content=scheduleFile.read() scheduleFile.seek(0, 0) scheduleFile.write(indexStr+'\n'+content) print('DEBUG: scheduled post added to index') @@ -551,7 +563,7 @@ def createPostBase(baseDir: str,nickname: str,domain: str,port: int, \ if tag['name'] not in content: del hashtagsDict[tagName] - statusNumber,published = getStatusNumber() + statusNumber,published=getStatusNumber() postTo='https://www.w3.org/ns/activitystreams#Public' postCC=httpPrefix+'://'+domain+'/users/'+nickname+'/followers' if followersOnly: @@ -659,7 +671,7 @@ def createPostBase(baseDir: str,nickname: str,domain: str,port: int, \ if oc: if oc.get('id'): capabilityIdList=[oc['id']] - newPost = { + newPost={ "@context": postContext, 'id': newPostId+'/activity', 'capability': capabilityIdList, @@ -704,7 +716,7 @@ def createPostBase(baseDir: str,nickname: str,domain: str,port: int, \ newPost['object'],attachImageFilename, \ mediaType,imageDescription,useBlurhash) else: - newPost = { + newPost={ "@context": postContext, 'id': newPostId, 'type': 'Note', @@ -788,16 +800,16 @@ def outboxMessageCreateWrap(httpPrefix: str, \ if port!=80 and port!=443: if ':' not in domain: domain=domain+':'+str(port) - statusNumber,published = getStatusNumber() + statusNumber,published=getStatusNumber() if messageJson.get('published'): - published = messageJson['published'] + published=messageJson['published'] newPostId=httpPrefix+'://'+domain+'/users/'+nickname+'/statuses/'+statusNumber cc=[] if messageJson.get('cc'): cc=messageJson['cc'] # TODO capabilityUrl=[] - newPost = { + newPost={ "@context": "https://www.w3.org/ns/activitystreams", 'id': newPostId+'/activity', 'capability': capabilityUrl, @@ -1207,7 +1219,7 @@ def threadSendPost(session,postJsonStr: str,federationList: [],\ postResult=None unauthorized=False try: - postResult,unauthorized = \ + postResult,unauthorized= \ postJsonString(session,postJsonStr,federationList, \ inboxUrl,signatureHeaderJson, \ "inbox:write",debug) @@ -1272,8 +1284,8 @@ def sendPost(projectVersion: str, \ handle=httpPrefix+'://'+toDomain+'/@'+toNickname # lookup the inbox for the To handle - wfRequest = webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ - domain,projectVersion) + wfRequest=webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ + domain,projectVersion) if not wfRequest: return 1 @@ -1285,7 +1297,7 @@ def sendPost(projectVersion: str, \ postToBox='tlblogs' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,toPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,toPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix, \ nickname,domain,postToBox) @@ -1305,7 +1317,7 @@ def sendPost(projectVersion: str, \ return 5 # sharedInbox and capabilities are optional - postJsonObject = \ + postJsonObject= \ createPostBase(baseDir,nickname,domain,port, \ toPersonId,cc,httpPrefix,content, \ followersOnly,saveToFile,clientToServer, \ @@ -1328,7 +1340,7 @@ def sendPost(projectVersion: str, \ postJsonStr=json.dumps(postJsonObject) # construct the http header, including the message body digest - signatureHeaderJson = \ + signatureHeaderJson= \ createSignedHeader(privateKeyPem,nickname,domain,port, \ toDomain,toPort, \ postPath,httpPrefix,withDigest,postJsonStr) @@ -1339,7 +1351,7 @@ def sendPost(projectVersion: str, \ sendThreads[0].kill() sendThreads.pop(0) print('WARN: thread killed') - thr = \ + thr= \ threadWithTrace(target=threadSendPost, \ args=(session, \ postJsonStr, \ @@ -1378,7 +1390,7 @@ def sendPostViaServer(projectVersion: str, \ handle=httpPrefix+'://'+fromDomain+'/@'+fromNickname # lookup the inbox for the To handle - wfRequest = \ + wfRequest= \ webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ fromDomain,projectVersion) if not wfRequest: @@ -1391,7 +1403,7 @@ def sendPostViaServer(projectVersion: str, \ postToBox='tlblogs' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix,fromNickname, \ fromDomain,postToBox) @@ -1431,7 +1443,7 @@ def sendPostViaServer(projectVersion: str, \ toDomainFull=toDomain+':'+str(toPort) toPersonId=httpPrefix+'://'+toDomainFull+'/users/'+toNickname - postJsonObject = \ + postJsonObject= \ createPostBase(baseDir, \ fromNickname,fromDomain,fromPort, \ toPersonId,cc,httpPrefix,content, \ @@ -1444,9 +1456,11 @@ def sendPostViaServer(projectVersion: str, \ authHeader=createBasicAuthHeader(fromNickname,password) if attachImageFilename: - headers = {'host': fromDomain, \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': fromDomain, \ + 'Authorization': authHeader + } + postResult= \ postImage(session,attachImageFilename,[], \ inboxUrl,headers,"inbox:write") #if not postResult: @@ -1454,10 +1468,12 @@ def sendPostViaServer(projectVersion: str, \ # print('DEBUG: Failed to upload image') # return 9 - headers = {'host': fromDomain, \ - 'Content-type': 'application/json', \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': fromDomain, \ + 'Content-type': 'application/json', \ + 'Authorization': authHeader + } + postResult= \ postJsonString(session,json.dumps(postJsonObject),[], \ inboxUrl,headers,"inbox:write",debug) #if not postResult: @@ -1578,7 +1594,7 @@ def sendSignedJson(postJsonObject: {},session,baseDir: str, \ postToBox='outbox' # get the actor inbox/outbox/capabilities for the To handle - inboxUrl,pubKeyId,pubKey,toPersonId,sharedInboxUrl,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,toPersonId,sharedInboxUrl,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix,nickname,domain,postToBox) @@ -1633,7 +1649,7 @@ def sendSignedJson(postJsonObject: {},session,baseDir: str, \ postJsonStr=json.dumps(postJsonObject) # construct the http header, including the message body digest - signatureHeaderJson = \ + signatureHeaderJson= \ createSignedHeader(privateKeyPem,nickname,domain,port, \ toDomain,toPort, \ postPath,httpPrefix,withDigest,postJsonStr) @@ -1648,14 +1664,15 @@ def sendSignedJson(postJsonObject: {},session,baseDir: str, \ if debug: print('DEBUG: starting thread to send post') pprint(postJsonObject) - thr = threadWithTrace(target=threadSendPost, \ - args=(session, \ - postJsonStr, \ - federationList, \ - inboxUrl,baseDir, \ - signatureHeaderJson.copy(), \ - postLog, - debug),daemon=True) + thr= \ + threadWithTrace(target=threadSendPost, \ + args=(session, \ + postJsonStr, \ + federationList, \ + inboxUrl,baseDir, \ + signatureHeaderJson.copy(), \ + postLog, + debug),daemon=True) sendThreads.append(thr) #thr.start() return 0 @@ -2030,7 +2047,7 @@ def createModeration(baseDir: str,nickname: str,domain: str,port: int, \ httpPrefix: str, \ itemsPerPage: int,headerOnly: bool, \ ocapAlways: bool,pageNumber=None) -> {}: - boxDir = createPersonDir(nickname,domain,baseDir,'inbox') + boxDir=createPersonDir(nickname,domain,baseDir,'inbox') boxname='moderation' if port: @@ -2042,24 +2059,28 @@ def createModeration(baseDir: str,nickname: str,domain: str,port: int, \ pageNumber=1 pageStr='?page='+str(pageNumber) - boxHeader = {'@context': 'https://www.w3.org/ns/activitystreams', - 'first': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', - 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, - 'last': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', - 'totalItems': 0, - 'type': 'OrderedCollection'} - boxItems = {'@context': 'https://www.w3.org/ns/activitystreams', - 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+pageStr, - 'orderedItems': [ - ], - 'partOf': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, - 'type': 'OrderedCollectionPage'} + boxHeader={ + '@context': 'https://www.w3.org/ns/activitystreams', + 'first': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', + 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, + 'last': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', + 'totalItems': 0, + 'type': 'OrderedCollection' + } + boxItems={ + '@context': 'https://www.w3.org/ns/activitystreams', + 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+pageStr, + 'orderedItems': [ + ], + 'partOf': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, + 'type': 'OrderedCollectionPage' + } if isModerator(baseDir,nickname): moderationIndexFile=baseDir+'/accounts/moderation.txt' if os.path.isfile(moderationIndexFile): with open(moderationIndexFile, "r") as f: - lines = f.readlines() + lines=f.readlines() boxHeader['totalItems']=len(lines) if headerOnly: return boxHeader @@ -2237,7 +2258,7 @@ def createSharedInboxIndex(baseDir: str,sharedBoxDir: str, \ # is the actor followed by this account? if not followingHandles: with open(followingFilename, 'r') as followingFile: - followingHandles = followingFile.read() + followingHandles=followingFile.read() if actorNickname+'@'+actorDomain not in followingHandles: continue @@ -2304,7 +2325,7 @@ def addPostToTimeline(filePath: str,boxname: str, \ """ Reads a post from file and decides whether it is valid """ with open(filePath, 'r') as postFile: - postStr = postFile.read() + postStr=postFile.read() return addPostStringToTimeline(postStr,boxname,postsInBox,boxActor) return False @@ -2327,17 +2348,17 @@ def createBoxIndexed(recentPostsCache: {}, \ if boxname!='dm' and boxname!='tlreplies' and \ boxname!='tlmedia' and boxname!='tlblogs' and \ boxname!='tlbookmarks': - boxDir = createPersonDir(nickname,domain,baseDir,boxname) + boxDir=createPersonDir(nickname,domain,baseDir,boxname) else: # extract DMs or replies or media from the inbox - boxDir = createPersonDir(nickname,domain,baseDir,'inbox') + boxDir=createPersonDir(nickname,domain,baseDir,'inbox') announceCacheDir=baseDir+'/cache/announce/'+nickname sharedBoxDir=None if boxname=='inbox' or boxname=='tlreplies' or \ boxname=='tlmedia' or boxname=='tlblogs': - sharedBoxDir = createPersonDir('inbox',domain,baseDir,boxname) + sharedBoxDir=createPersonDir('inbox',domain,baseDir,boxname) # bookmarks timeline is like the inbox but has its own separate index indexBoxName=boxname @@ -2365,18 +2386,22 @@ def createBoxIndexed(recentPostsCache: {}, \ pageStr='?page='+str(pageNumber) except: pass - boxHeader = {'@context': 'https://www.w3.org/ns/activitystreams', - 'first': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', - 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, - 'last': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', - 'totalItems': 0, - 'type': 'OrderedCollection'} - boxItems = {'@context': 'https://www.w3.org/ns/activitystreams', - 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+pageStr, - 'orderedItems': [ - ], - 'partOf': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, - 'type': 'OrderedCollectionPage'} + boxHeader={ + '@context': 'https://www.w3.org/ns/activitystreams', + 'first': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', + 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, + 'last': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+'?page=true', + 'totalItems': 0, + 'type': 'OrderedCollection' + } + boxItems={ + '@context': 'https://www.w3.org/ns/activitystreams', + 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname+pageStr, + 'orderedItems': [ + ], + 'partOf': httpPrefix+'://'+domain+'/users/'+nickname+'/'+boxname, + 'type': 'OrderedCollectionPage' + } postsInBox=[] @@ -2528,7 +2553,7 @@ def archivePostsForPerson(httpPrefix: str,nickname: str,domain: str,baseDir: str if archiveDir: if not os.path.isdir(archiveDir): os.mkdir(archiveDir) - boxDir = createPersonDir(nickname,domain,baseDir,boxname) + boxDir=createPersonDir(nickname,domain,baseDir,boxname) postsInBox=os.scandir(boxDir) noOfPosts=0 for f in postsInBox: @@ -2624,7 +2649,7 @@ def getPublicPostsOfPerson(baseDir: str,nickname: str,domain: str, \ debug: bool,projectVersion: str) -> None: """ This is really just for test purposes """ - session = createSession(useTor) + session=createSession(useTor) personCache={} cachedWebfingers={} federationList=[] @@ -2635,7 +2660,7 @@ def getPublicPostsOfPerson(baseDir: str,nickname: str,domain: str, \ if ':' not in domain: domainFull=domain+':'+str(port) handle=httpPrefix+"://"+domainFull+"/@"+nickname - wfRequest = \ + wfRequest= \ webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ domain,projectVersion) if not wfRequest: @@ -2644,12 +2669,12 @@ def getPublicPostsOfPerson(baseDir: str,nickname: str,domain: str, \ personUrl,pubKeyId,pubKey,personId,shaedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix,nickname,domain,'outbox') - wfResult = json.dumps(wfRequest, indent=2, sort_keys=False) + wfResult=json.dumps(wfRequest,indent=2,sort_keys=False) maxMentions=10 maxEmoji=10 maxAttachments=5 - userPosts = \ + userPosts= \ getPosts(session,personUrl,30,maxMentions,maxEmoji, \ maxAttachments,federationList, \ personCache,raw,simple,debug, \ diff --git a/question.py b/question.py index 3b2eb0948..57eb2d3e3 100644 --- a/question.py +++ b/question.py @@ -1,10 +1,10 @@ -__filename__ = "question.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="question.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os from utils import locatePost @@ -76,7 +76,7 @@ def questionUpdateVotes(baseDir: str,nickname: str,domain: str,replyJson: {}) -> else: # change an entry in the voters file with open(votersFilename, "r") as votersFile: - lines = votersFile.readlines() + lines=votersFile.readlines() newlines=[] saveVotersFile=False for voteLine in lines: @@ -101,7 +101,7 @@ def questionUpdateVotes(baseDir: str,nickname: str,domain: str,replyJson: {}) -> continue totalItems=0 with open(votersFilename, "r") as votersFile: - lines = votersFile.readlines() + lines=votersFile.readlines() for voteLine in lines: if voteLine.endswith(votersFileSeparator+possibleAnswer['name']+'\n'): totalItems+=1 diff --git a/roles.py b/roles.py index 36228aa4d..01c0c7848 100644 --- a/roles.py +++ b/roles.py @@ -1,10 +1,10 @@ -__filename__ = "roles.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="roles.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json import os @@ -23,10 +23,10 @@ def clearModeratorStatus(baseDir: str) -> None: This could be slow if there are many users, but only happens rarely when moderators are appointed or removed """ - directory = os.fsencode(baseDir+'/accounts/') + directory=os.fsencode(baseDir+'/accounts/') for f in os.scandir(directory): f=f.name - filename = os.fsdecode(f) + filename=os.fsdecode(f) if filename.endswith(".json") and '@' in filename: filename=os.path.join(baseDir+'/accounts/', filename) if '"moderator"' in open(filename).read(): @@ -46,7 +46,7 @@ def addModerator(baseDir: str,nickname: str,domain: str) -> None: if os.path.isfile(moderatorsFile): # is this nickname already in the file? with open(moderatorsFile, "r") as f: - lines = f.readlines() + lines=f.readlines() for moderator in lines: moderator=moderator.strip('\n') if line==nickname: @@ -70,7 +70,7 @@ def removeModerator(baseDir: str,nickname: str): if not os.path.isfile(moderatorsFile): return with open(moderatorsFile, "r") as f: - lines = f.readlines() + lines=f.readlines() with open(moderatorsFile, "w") as f: for moderator in lines: moderator=moderator.strip('\n') @@ -229,14 +229,17 @@ def sendRoleViaServer(baseDir: str,session, \ if ':' not in delegatorDomain: delegatorDomainFull=delegatorDomain+':'+str(fromPort) - toUrl = httpPrefix+'://'+delegatorDomainFull+'/users/'+nickname - ccUrl = httpPrefix+'://'+delegatorDomainFull+'/users/'+delegatorNickname+'/followers' + toUrl= \ + httpPrefix+'://'+delegatorDomainFull+'/users/'+nickname + ccUrl= \ + httpPrefix+'://'+delegatorDomainFull+'/users/'+ \ + delegatorNickname+'/followers' if role: roleStr=project.lower()+';'+role.lower() else: roleStr=project.lower()+';' - newRoleJson = { + newRoleJson={ 'type': 'Delegate', 'actor': httpPrefix+'://'+delegatorDomainFull+'/users/'+delegatorNickname, 'object': { @@ -253,8 +256,8 @@ def sendRoleViaServer(baseDir: str,session, \ handle=httpPrefix+'://'+delegatorDomainFull+'/@'+delegatorNickname # lookup the inbox for the To handle - wfRequest = webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ - delegatorDomain,projectVersion) + wfRequest=webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ + delegatorDomain,projectVersion) if not wfRequest: if debug: print('DEBUG: announce webfinger failed for '+handle) @@ -263,7 +266,7 @@ def sendRoleViaServer(baseDir: str,session, \ postToBox='outbox' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix, \ delegatorNickname,delegatorDomain,postToBox) @@ -279,10 +282,12 @@ def sendRoleViaServer(baseDir: str,session, \ authHeader=createBasicAuthHeader(delegatorNickname,password) - headers = {'host': delegatorDomain, \ - 'Content-type': 'application/json', \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': delegatorDomain, \ + 'Content-type': 'application/json', \ + 'Authorization': authHeader + } + postResult= \ postJson(session,newRoleJson,[],inboxUrl,headers,"inbox:write") #if not postResult: # if debug: diff --git a/schedule.py b/schedule.py index 0345358b7..895e97523 100644 --- a/schedule.py +++ b/schedule.py @@ -1,10 +1,10 @@ -__filename__ = "schedule.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="schedule.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os import time @@ -70,7 +70,7 @@ def updatePostSchedule(baseDir: str,handle: str,httpd,maxScheduledPosts: int) -> # set the published time # If this is not recent then http checks on the receiving side # will reject it - statusNumber,published = getStatusNumber() + statusNumber,published=getStatusNumber() if postJsonObject.get('published'): postJsonObject['published']=published if postJsonObject.get('object'): diff --git a/session.py b/session.py index eed603926..f6398737e 100644 --- a/session.py +++ b/session.py @@ -1,10 +1,10 @@ -__filename__ = "session.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="session.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os import sys @@ -15,11 +15,11 @@ import json baseDirectory=None def createSession(onionRoute: bool): - session = requests.session() + session=requests.session() if onionRoute: - session.proxies = {} - session.proxies['http'] = 'socks5h://localhost:9050' - session.proxies['https'] = 'socks5h://localhost:9050' + session.proxies={} + session.proxies['http']='socks5h://localhost:9050' + session.proxies['https']='socks5h://localhost:9050' return session def getJson(session,url: str,headers: {},params: {}, \ @@ -94,11 +94,12 @@ def postJsonString(session,postJsonStr: str, \ print('postJson: '+inboxUrl+' not permitted by capabilities') return None,None - postResult = session.post(url = inboxUrl, data = postJsonStr, headers=headers) + postResult= \ + session.post(url=inboxUrl,data=postJsonStr,headers=headers) if postResult.status_code<200 or postResult.status_code>202: #if postResult.status_code==400: # headers['content-type']='application/ld+json' - # postResult = session.post(url = inboxUrl, data = postJsonStr, headers=headers) + # postResult=session.post(url=inboxUrl,data=postJsonStr,headers=headers) # if not (postResult.status_code<200 or postResult.status_code>202): # return True if postResult.status_code>=400 and postResult.status_code<=405 and \ @@ -140,8 +141,8 @@ def postImage(session,attachImageFilename: str,federationList: [], \ headers['Content-type']=contentType with open(attachImageFilename, 'rb') as avFile: - mediaBinary = avFile.read() - postResult = session.post(url=inboxUrl, data=mediaBinary, headers=headers) + mediaBinary=avFile.read() + postResult=session.post(url=inboxUrl,data=mediaBinary,headers=headers) if postResult: return postResult.text return None diff --git a/shares.py b/shares.py index 350a2d54f..d85ad006f 100644 --- a/shares.py +++ b/shares.py @@ -1,10 +1,10 @@ -__filename__ = "shares.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="shares.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json import os @@ -142,7 +142,7 @@ def addShare(baseDir: str, \ os.remove(imageFilename) imageUrl=httpPrefix+'://'+domainFull+'/sharefiles/'+nickname+'/'+itemID+'.gif' - sharesJson[itemID] = { + sharesJson[itemID]={ "displayName": displayName, "summary": summary, "imageUrl": imageUrl, @@ -261,25 +261,27 @@ def getSharesFeedForPerson(baseDir: str, \ sharesJson=loadJson(sharesFilename) if sharesJson: noOfShares=len(sharesJson.items()) - shares = { + shares={ '@context': 'https://www.w3.org/ns/activitystreams', 'first': httpPrefix+'://'+domain+'/users/'+nickname+'/shares?page=1', 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/shares', 'totalItems': str(noOfShares), - 'type': 'OrderedCollection'} + 'type': 'OrderedCollection' + } return shares if not pageNumber: pageNumber=1 nextPageNumber=int(pageNumber+1) - shares = { + shares={ '@context': 'https://www.w3.org/ns/activitystreams', 'id': httpPrefix+'://'+domain+'/users/'+nickname+'/shares?page='+str(pageNumber), 'orderedItems': [], 'partOf': httpPrefix+'://'+domain+'/users/'+nickname+'/shares', 'totalItems': 0, - 'type': 'OrderedCollectionPage'} + 'type': 'OrderedCollectionPage' + } if not os.path.isfile(sharesFilename): print("test5") @@ -332,10 +334,10 @@ def sendShareViaServer(baseDir,session, \ if ':' not in fromDomain: fromDomainFull=fromDomain+':'+str(fromPort) - toUrl = 'https://www.w3.org/ns/activitystreams#Public' - ccUrl = httpPrefix + '://'+fromDomainFull+'/users/'+fromNickname+'/followers' + toUrl='https://www.w3.org/ns/activitystreams#Public' + ccUrl=httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname+'/followers' - newShareJson = { + newShareJson={ "@context": "https://www.w3.org/ns/activitystreams", 'type': 'Add', 'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname, @@ -358,8 +360,8 @@ def sendShareViaServer(baseDir,session, \ 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) @@ -368,7 +370,7 @@ def sendShareViaServer(baseDir,session, \ postToBox='outbox' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix, \ fromNickname,fromDomain,postToBox) @@ -385,15 +387,19 @@ def sendShareViaServer(baseDir,session, \ authHeader=createBasicAuthHeader(fromNickname,password) if imageFilename: - headers = {'host': fromDomain, \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': fromDomain, \ + 'Authorization': authHeader + } + postResult= \ postImage(session,imageFilename,[],inboxUrl.replace('/'+postToBox,'/shares'),headers,"inbox:write") - headers = {'host': fromDomain, \ - 'Content-type': 'application/json', \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': fromDomain, \ + 'Content-type': 'application/json', \ + 'Authorization': authHeader + } + postResult= \ postJson(session,newShareJson,[],inboxUrl,headers,"inbox:write") #if not postResult: # if debug: @@ -424,10 +430,10 @@ def sendUndoShareViaServer(baseDir: str,session, \ if ':' not in fromDomain: fromDomainFull=fromDomain+':'+str(fromPort) - toUrl = 'https://www.w3.org/ns/activitystreams#Public' - ccUrl = httpPrefix + '://'+fromDomainFull+'/users/'+fromNickname+'/followers' + toUrl='https://www.w3.org/ns/activitystreams#Public' + ccUrl=httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname+'/followers' - undoShareJson = { + undoShareJson={ "@context": "https://www.w3.org/ns/activitystreams", 'type': 'Remove', 'actor': httpPrefix+'://'+fromDomainFull+'/users/'+fromNickname, @@ -445,8 +451,8 @@ def sendUndoShareViaServer(baseDir: str,session, \ 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) @@ -455,7 +461,7 @@ def sendUndoShareViaServer(baseDir: str,session, \ postToBox='outbox' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix, \ fromNickname,fromDomain,postToBox) @@ -471,10 +477,12 @@ def sendUndoShareViaServer(baseDir: str,session, \ authHeader=createBasicAuthHeader(fromNickname,password) - headers = {'host': fromDomain, \ - 'Content-type': 'application/json', \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': fromDomain, \ + 'Content-type': 'application/json', \ + 'Authorization': authHeader + } + postResult= \ postJson(session,undoShareJson,[],inboxUrl,headers,"inbox:write") #if not postResult: # if debug: diff --git a/skills.py b/skills.py index 6a707b5c7..43b5e992c 100644 --- a/skills.py +++ b/skills.py @@ -1,10 +1,10 @@ -__filename__ = "skills.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="skills.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json import os @@ -109,14 +109,14 @@ def sendSkillViaServer(baseDir: str,session,nickname: str,password: str, if ':' not in domain: domainFull=domain+':'+str(port) - toUrl = httpPrefix+'://'+domainFull+'/users/'+nickname - ccUrl = httpPrefix+'://'+domainFull+'/users/'+nickname+'/followers' + toUrl=httpPrefix+'://'+domainFull+'/users/'+nickname + ccUrl=httpPrefix+'://'+domainFull+'/users/'+nickname+'/followers' if skillLevelPercent: skillStr=skill+';'+str(skillLevelPercent) else: skillStr=skill+';0' - newSkillJson = { + newSkillJson={ 'type': 'Skill', 'actor': httpPrefix+'://'+domainFull+'/users/'+nickname, 'object': '"'+skillStr+'"', @@ -127,8 +127,8 @@ def sendSkillViaServer(baseDir: str,session,nickname: str,password: str, handle=httpPrefix+'://'+domainFull+'/@'+nickname # lookup the inbox for the To handle - wfRequest = webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ - domain,projectVersion) + wfRequest=webfingerHandle(session,handle,httpPrefix,cachedWebfingers, \ + domain,projectVersion) if not wfRequest: if debug: print('DEBUG: announce webfinger failed for '+handle) @@ -137,7 +137,7 @@ def sendSkillViaServer(baseDir: str,session,nickname: str,password: str, postToBox='outbox' # get the actor inbox for the To handle - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix,nickname,domain,postToBox) @@ -152,10 +152,12 @@ def sendSkillViaServer(baseDir: str,session,nickname: str,password: str, authHeader=createBasicAuthHeader(Nickname,password) - headers = {'host': domain, \ - 'Content-type': 'application/json', \ - 'Authorization': authHeader} - postResult = \ + headers={ + 'host': domain, \ + 'Content-type': 'application/json', \ + 'Authorization': authHeader + } + postResult= \ postJson(session,newSkillJson,[],inboxUrl,headers,"inbox:write") #if not postResult: # if debug: diff --git a/ssb.py b/ssb.py index 9fbe874b9..f52339033 100644 --- a/ssb.py +++ b/ssb.py @@ -1,10 +1,10 @@ -__filename__ = "ssb.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="ssb.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json diff --git a/tests.py b/tests.py index 7b2d6ebcd..2bd3fb4ac 100644 --- a/tests.py +++ b/tests.py @@ -1,10 +1,10 @@ -__filename__ = "tests.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="tests.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import base64 import time @@ -77,9 +77,9 @@ from content import addHtmlTags from content import removeLongWords from theme import setCSSparam -testServerAliceRunning = False -testServerBobRunning = False -testServerEveRunning = False +testServerAliceRunning=False +testServerBobRunning=False +testServerEveRunning=False thrAlice=None thrBob=None thrEve=None @@ -103,7 +103,11 @@ def testHttpsigBase(withDigest): privateKeyPem,publicKeyPem,person,wfEndpoint= \ createPerson(path,nickname,domain,port,httpPrefix,False,password) assert privateKeyPem - messageBodyJson = {"a key": "a value", "another key": "A string","yet another key": "Another string"} + messageBodyJson={ + "a key": "a value", + "another key": "A string", + "yet another key": "Another string" + } messageBodyJsonStr=json.dumps(messageBodyJson) headersDomain=domain @@ -115,23 +119,33 @@ def testHttpsigBase(withDigest): dateStr=strftime("%a, %d %b %Y %H:%M:%S %Z", gmtime()) boxpath='/inbox' if not withDigest: - headers = {'host': headersDomain,'date': dateStr,'content-type': 'application/json'} - signatureHeader = \ + headers={ + 'host': headersDomain, + 'date': dateStr, + 'content-type': 'application/json' + } + signatureHeader= \ signPostHeaders(dateStr,privateKeyPem, nickname, \ domain, port, \ domain, port, \ boxpath, httpPrefix, None) else: - bodyDigest = messageContentDigest(messageBodyJsonStr) + bodyDigest=messageContentDigest(messageBodyJsonStr) contentLength=len(messageBodyJsonStr) - headers = {'host': headersDomain,'date': dateStr,'digest': f'SHA-256={bodyDigest}','content-type': contentType,'content-length': str(contentLength)} - signatureHeader = \ + headers={ + 'host': headersDomain, + 'date': dateStr, + 'digest': f'SHA-256={bodyDigest}', + 'content-type': contentType, + 'content-length': str(contentLength) + } + signatureHeader= \ signPostHeaders(dateStr,privateKeyPem, nickname, \ domain, port, \ domain, port, \ boxpath, httpPrefix, messageBodyJsonStr) - headers['signature'] = signatureHeader + headers['signature']=signatureHeader assert verifyPostHeaders(httpPrefix,publicKeyPem,headers, \ boxpath,False,None, \ messageBodyJsonStr,False) @@ -149,14 +163,24 @@ def testHttpsigBase(withDigest): messageBodyJsonStr,False) == False if not withDigest: # fake domain - headers = {'host': 'bogon.domain','date': dateStr,'content-type': 'application/json'} + headers={ + 'host': 'bogon.domain', + 'date': dateStr, + 'content-type': 'application/json' + } else: # correct domain but fake message - messageBodyJsonStr = '{"a key": "a value", "another key": "Fake GNUs", "yet another key": "More Fake GNUs"}' + messageBodyJsonStr='{"a key": "a value", "another key": "Fake GNUs", "yet another key": "More Fake GNUs"}' contentLength=len(messageBodyJsonStr) - bodyDigest = messageContentDigest(messageBodyJsonStr) - headers = {'host': domain,'date': dateStr,'digest': f'SHA-256={bodyDigest}','content-type': contentType,'content-length': str(contentLength)} - headers['signature'] = signatureHeader + bodyDigest=messageContentDigest(messageBodyJsonStr) + headers={ + 'host': domain, + 'date': dateStr, + 'digest': f'SHA-256={bodyDigest}', + 'content-type': contentType, + 'content-length': str(contentLength) + } + headers['signature']=signatureHeader assert verifyPostHeaders(httpPrefix,publicKeyPem,headers, \ boxpath,True,None, \ messageBodyJsonStr,False) == False @@ -184,7 +208,8 @@ def testThreadsFunction(param: str): def testThreads(): print('testThreads') - thr = threadWithTrace(target=testThreadsFunction,args=('test',),daemon=True) + thr= \ + threadWithTrace(target=testThreadsFunction,args=('test',),daemon=True) thr.start() assert thr.isAlive()==True time.sleep(1) @@ -235,7 +260,7 @@ def createServerAlice(path: str,domain: str,port: int,bobAddress: str,federation "In the gardens of memory, in the palace of dreams, that is where you and I shall meet", \ False, True, clientToServer,None,None,useBlurhash) global testServerAliceRunning - testServerAliceRunning = True + testServerAliceRunning=True maxMentions=10 maxEmoji=10 onionDomain=None @@ -292,7 +317,7 @@ def createServerBob(path: str,domain: str,port: int,aliceAddress: str,federation "Quantum physics is a bit of a passion of mine", \ False, True, clientToServer,None,None,useBlurhash) global testServerBobRunning - testServerBobRunning = True + testServerBobRunning=True maxMentions=10 maxEmoji=10 onionDomain=None @@ -329,7 +354,7 @@ def createServerEve(path: str,domain: str,port: int,federationList: [], \ deleteAllPosts(path,nickname,domain,'inbox') deleteAllPosts(path,nickname,domain,'outbox') global testServerEveRunning - testServerEveRunning = True + testServerEveRunning=True maxMentions=10 maxEmoji=10 onionDomain=None @@ -346,8 +371,8 @@ def testPostMessageBetweenServers(): global testServerAliceRunning global testServerBobRunning - testServerAliceRunning = False - testServerBobRunning = False + testServerAliceRunning=False + testServerBobRunning=False httpPrefix='http' useTor=False @@ -380,7 +405,7 @@ def testPostMessageBetweenServers(): time.sleep(1) thrAlice.kill() - thrAlice = \ + thrAlice= \ threadWithTrace(target=createServerAlice, \ args=(aliceDir,aliceDomain,alicePort,bobAddress, \ federationList,False,False, \ @@ -393,7 +418,7 @@ def testPostMessageBetweenServers(): time.sleep(1) thrBob.kill() - thrBob = \ + thrBob= \ threadWithTrace(target=createServerBob, \ args=(bobDir,bobDomain,bobPort,aliceAddress, \ federationList,False,False, \ @@ -413,11 +438,11 @@ def testPostMessageBetweenServers(): print('\n\n*******************************************************') print('Alice sends to Bob') os.chdir(aliceDir) - sessionAlice = createSession(useTor) + sessionAlice=createSession(useTor) inReplyTo=None inReplyToAtomUri=None subject=None - alicePostLog = [] + alicePostLog=[] followersOnly=False saveToFile=True clientToServer=False @@ -433,7 +458,7 @@ def testPostMessageBetweenServers(): outboxPath=aliceDir+'/accounts/alice@'+aliceDomain+'/outbox' assert len([name for name in os.listdir(outboxPath) if os.path.isfile(os.path.join(outboxPath, name))])==0 - sendResult = \ + sendResult= \ sendPost(__version__, \ sessionAlice,aliceDir,'alice',aliceDomain,alicePort, \ 'bob',bobDomain,bobPort,ccUrl,httpPrefix, \ @@ -486,8 +511,8 @@ def testPostMessageBetweenServers(): followPerson(aliceDir,'alice',aliceDomain,'bob', \ bobDomain+':'+str(bobPort),federationList,False) - sessionBob = createSession(useTor) - bobPostLog = [] + sessionBob=createSession(useTor) + bobPostLog=[] bobPersonCache={} bobCachedWebfingers={} statusNumber=None @@ -563,8 +588,8 @@ def testFollowBetweenServers(): global testServerAliceRunning global testServerBobRunning - testServerAliceRunning = False - testServerBobRunning = False + testServerAliceRunning=False + testServerBobRunning=False httpPrefix='http' useTor=False @@ -597,7 +622,7 @@ def testFollowBetweenServers(): time.sleep(1) thrAlice.kill() - thrAlice = \ + thrAlice= \ threadWithTrace(target=createServerAlice, \ args=(aliceDir,aliceDomain,alicePort,bobAddress, \ federationList,False,False, \ @@ -610,7 +635,7 @@ def testFollowBetweenServers(): time.sleep(1) thrBob.kill() - thrBob = \ + thrBob= \ threadWithTrace(target=createServerBob, \ args=(bobDir,bobDomain,bobPort,aliceAddress, \ federationList,False,False, \ @@ -638,11 +663,11 @@ def testFollowBetweenServers(): print('*********************************************************') print('Alice sends a follow request to Bob') os.chdir(aliceDir) - sessionAlice = createSession(useTor) + sessionAlice=createSession(useTor) inReplyTo=None inReplyToAtomUri=None subject=None - alicePostLog = [] + alicePostLog=[] followersOnly=False saveToFile=True clientToServer=False @@ -650,7 +675,7 @@ def testFollowBetweenServers(): alicePersonCache={} aliceCachedWebfingers={} alicePostLog=[] - sendResult = \ + sendResult= \ sendFollowRequest(sessionAlice,aliceDir, \ 'alice',aliceDomain,alicePort,httpPrefix, \ 'bob',bobDomain,bobPort,httpPrefix, \ @@ -671,13 +696,13 @@ def testFollowBetweenServers(): print('\n\n*********************************************************') print('Alice sends a message to Bob') - alicePostLog = [] + alicePostLog=[] alicePersonCache={} aliceCachedWebfingers={} alicePostLog=[] useBlurhash=False isArticle=False - sendResult = \ + sendResult= \ sendPost(__version__, \ sessionAlice,aliceDir,'alice',aliceDomain,alicePort, \ 'bob',bobDomain,bobPort,ccUrl, \ @@ -860,7 +885,7 @@ def testFollows(): followPerson(baseDir,nickname,domain,'batman','mesh.com',federationList,False) followPerson(baseDir,nickname,domain,'giraffe','trees.com',federationList,False) - f = open(baseDir+'/accounts/'+nickname+'@'+domain+'/following.txt', "r") + f=open(baseDir+'/accounts/'+nickname+'@'+domain+'/following.txt', "r") domainFound=False for followingDomain in f: testDomain=followingDomain.split('@')[1].replace('\n','') @@ -887,7 +912,7 @@ def testFollows(): followerOfPerson(baseDir,nickname,domain,'batman','mesh.com',federationList,False) followerOfPerson(baseDir,nickname,domain,'giraffe','trees.com',federationList,False) - f = open(baseDir+'/accounts/'+nickname+'@'+domain+'/followers.txt', "r") + f=open(baseDir+'/accounts/'+nickname+'@'+domain+'/followers.txt', "r") for followerDomain in f: testDomain=followerDomain.split('@')[1].replace('\n','') if testDomain not in federationList: @@ -949,7 +974,7 @@ def testDelegateRoles(): httpPrefix='http' project='artechoke' role='delegator' - newRoleJson = { + newRoleJson={ 'type': 'Delegate', 'actor': httpPrefix+'://'+domain+'/users/'+nickname, 'object': { @@ -970,7 +995,7 @@ def testDelegateRoles(): assert '"delegator"' in open(baseDir+'/accounts/'+nickname+'@'+domain+'.json').read() assert '"delegator"' in open(baseDir+'/accounts/'+nicknameDelegated+'@'+domain+'.json').read() - newRoleJson = { + newRoleJson={ 'type': 'Delegate', 'actor': httpPrefix+'://'+domain+'/users/'+nicknameDelegated, 'object': { @@ -1030,8 +1055,8 @@ def testClientToServer(): global testServerAliceRunning global testServerBobRunning - testServerAliceRunning = False - testServerBobRunning = False + testServerAliceRunning=False + testServerBobRunning=False httpPrefix='http' useTor=False @@ -1064,7 +1089,7 @@ def testClientToServer(): time.sleep(1) thrAlice.kill() - thrAlice = \ + thrAlice= \ threadWithTrace(target=createServerAlice, \ args=(aliceDir,aliceDomain,alicePort,bobAddress, \ federationList,False,False, \ @@ -1077,7 +1102,7 @@ def testClientToServer(): time.sleep(1) thrBob.kill() - thrBob = \ + thrBob= \ threadWithTrace(target=createServerBob, \ args=(bobDir,bobDomain,bobPort,aliceAddress, \ federationList,False,False, \ @@ -1103,7 +1128,7 @@ def testClientToServer(): print('\n\n*******************************************************') print('Alice sends to Bob via c2s') - sessionAlice = createSession(useTor) + sessionAlice=createSession(useTor) followersOnly=False attachedImageFilename=baseDir+'/img/logo.png' mediaType=getAttachmentMediaType(attachedImageFilename) @@ -1214,7 +1239,7 @@ def testClientToServer(): print('\n\nBob likes the post') - sessionBob = createSession(useTor) + sessionBob=createSession(useTor) password='bobpass' outboxPath=bobDir+'/accounts/bob@'+bobDomain+'/outbox' inboxPath=aliceDir+'/accounts/alice@'+aliceDomain+'/inbox' @@ -1262,7 +1287,7 @@ def testClientToServer(): inboxPath=bobDir+'/accounts/bob@'+bobDomain+'/inbox' outboxPath=aliceDir+'/accounts/alice@'+aliceDomain+'/outbox' - postsBefore = len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))]) + postsBefore=len([name for name in os.listdir(inboxPath) if os.path.isfile(os.path.join(inboxPath, name))]) print('\n\nAlice deletes her post: '+outboxPostId+' '+str(postsBefore)) password='alicepass' sendDeleteViaServer(aliceDir,sessionAlice,'alice',password, @@ -1418,7 +1443,7 @@ def testGetStatusNumber(): print('testGetStatusNumber') prevStatusNumber=None for i in range(1,20): - statusNumber,published = getStatusNumber() + statusNumber,published=getStatusNumber() if prevStatusNumber: assert len(statusNumber) == 18 assert int(statusNumber) > prevStatusNumber diff --git a/theme.py b/theme.py index ee4cc8f0c..29f466c2b 100644 --- a/theme.py +++ b/theme.py @@ -1,10 +1,10 @@ -__filename__ = "theme.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="theme.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os from utils import loadJson diff --git a/threads.py b/threads.py index 534cb0b70..34c5347cb 100644 --- a/threads.py +++ b/threads.py @@ -1,10 +1,10 @@ -__filename__ = "threads.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="threads.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import threading import os @@ -20,9 +20,9 @@ class threadWithTrace(threading.Thread): tries=0 while tries<3: try: - self._args, self._keywords = args, keywords - threading.Thread.__init__(self, *self._args, **self._keywords) - self.killed = False + self._args,self._keywords=args,keywords + threading.Thread.__init__(self,*self._args,**self._keywords) + self.killed=False break except Exception as e: print('ERROR: threads.py/__init__ failed - '+str(e)) @@ -33,8 +33,8 @@ class threadWithTrace(threading.Thread): tries=0 while tries<3: try: - self.__run_backup = self.run - self.run = self.__run + self.__run_backup=self.run + self.run=self.__run threading.Thread.start(self) break except Exception as e: @@ -47,7 +47,7 @@ class threadWithTrace(threading.Thread): def __run(self): sys.settrace(self.globaltrace) self.__run_backup() - self.run = self.__run_backup + self.run=self.__run_backup def globaltrace(self, frame, event, arg): if event == 'call': @@ -62,7 +62,7 @@ class threadWithTrace(threading.Thread): return self.localtrace def kill(self): - self.killed = True + self.killed=True def clone(self,fn): return threadWithTrace(target=fn, \ diff --git a/tox.py b/tox.py index 248fd1505..e481279c7 100644 --- a/tox.py +++ b/tox.py @@ -1,10 +1,10 @@ -__filename__ = "tox.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="tox.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import json diff --git a/utils.py b/utils.py index 2cdbea459..0bf329e1e 100644 --- a/utils.py +++ b/utils.py @@ -1,10 +1,10 @@ -__filename__ = "utils.py" -__author__ = "Bob Mottram" -__license__ = "AGPL3+" -__version__ = "1.1.0" -__maintainer__ = "Bob Mottram" -__email__ = "bob@freedombone.net" -__status__ = "Production" +__filename__="utils.py" +__author__="Bob Mottram" +__license__="AGPL3+" +__version__="1.1.0" +__maintainer__="Bob Mottram" +__email__="bob@freedombone.net" +__status__="Production" import os import time @@ -198,17 +198,21 @@ def getDomainFromActor(actor: str) -> (str,int): """ port=None if '/profile/' in actor: - domain = actor.split('/profile/')[0].replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') + domain= \ + actor.split('/profile/')[0].replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') else: if '/channel/' in actor: - domain = actor.split('/channel/')[0].replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') + domain= \ + actor.split('/channel/')[0].replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') else: if '/users/' not in actor: - domain = actor.replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') + domain= \ + actor.replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') if '/' in actor: domain=domain.split('/')[0] else: - domain = actor.split('/users/')[0].replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') + domain= \ + actor.split('/users/')[0].replace('https://','').replace('http://','').replace('i2p://','').replace('dat://','') if ':' in domain: portStr=domain.split(':')[1] if not portStr.isdigit(): @@ -252,7 +256,7 @@ def followPerson(baseDir: str,nickname: str, domain: str, \ # remove them from the unfollowed file newLines='' with open(unfollowedFilename, "r") as f: - lines = f.readlines() + lines=f.readlines() for line in lines: if handleToFollow not in line: newLines+=line @@ -271,7 +275,7 @@ def followPerson(baseDir: str,nickname: str, domain: str, \ # prepend to follow file try: with open(filename, 'r+') as followFile: - content = followFile.read() + content=followFile.read() followFile.seek(0, 0) followFile.write(handleToFollow+'\n'+content) if debug: @@ -347,7 +351,7 @@ def removeModerationPostFromIndex(baseDir: str,postUrl: str,debug: bool) -> None postId=postUrl.replace('/activity','') if postId in open(moderationIndexFile).read(): with open(moderationIndexFile, "r") as f: - lines = f.readlines() + lines=f.readlines() with open(moderationIndexFile, "w+") as f: for line in lines: if line.strip("\n") != postId: @@ -485,7 +489,7 @@ def noOfActiveAccountsMonthly(baseDir: str,months: int) -> bool: lastUsedFilename=baseDir+'/accounts/'+account+'/.lastUsed' if os.path.isfile(lastUsedFilename): with open(lastUsedFilename, 'r') as lastUsedFile: - lastUsed = lastUsedFile.read() + lastUsed=lastUsedFile.read() if lastUsed.isdigit(): timeDiff=(currTime-int(lastUsed)) if timeDiff'
infoForm+='
'+translate['Suspended accounts']+'' infoForm+='
'+translate['These are currently suspended'] @@ -395,7 +403,7 @@ def htmlModerationInfo(translate: {},baseDir: str,httpPrefix: str) -> str: blockingFilename=baseDir+'/accounts/blocking.txt' if os.path.isfile(blockingFilename): with open(blockingFilename, "r") as f: - blockedStr = f.read() + blockedStr=f.read() infoForm+='
'+translate['Suspended accounts']+'' infoForm+='
'+translate['These are currently suspended'] @@ -395,7 +403,7 @@ def htmlModerationInfo(translate: {},baseDir: str,httpPrefix: str) -> str: blockingFilename=baseDir+'/accounts/blocking.txt' if os.path.isfile(blockingFilename): with open(blockingFilename, "r") as f: - blockedStr = f.read() + blockedStr=f.read() infoForm+='
'
infoForm+= \
'
'+translate['Blocked accounts and hashtags']+'' @@ -437,14 +445,14 @@ def htmlHashtagSearch(nickname: str,domain: str,port: int, \ # read the index with open(hashtagIndexFile, "r") as f: - lines = f.readlines() + lines=f.readlines() # read the css cssFilename=baseDir+'/epicyon-profile.css' if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - hashtagSearchCSS = cssFile.read() + hashtagSearchCSS=cssFile.read() if httpPrefix!='https': hashtagSearchCSS= \ hashtagSearchCSS.replace('https://',httpPrefix+'://') @@ -546,7 +554,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ continue if f.startswith('inbox@'): continue - actorFilename = os.path.join(subdir, f) + actorFilename=os.path.join(subdir, f) actorJson=loadJson(actorFilename) if actorJson: if actorJson.get('id') and \ @@ -556,17 +564,19 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ actor=actorJson['id'] for skillName,skillLevel in actorJson['skills'].items(): skillName=skillName.lower() - if skillName in skillsearch or skillsearch in skillName: - skillLevelStr=str(skillLevel) - if skillLevel<100: - skillLevelStr='0'+skillLevelStr - if skillLevel<10: - skillLevelStr='0'+skillLevelStr - indexStr= \ - skillLevelStr+';'+actor+';'+actorJson['name']+ \ - ';'+actorJson['icon']['url'] - if indexStr not in results: - results.append(indexStr) + if not (skillName in skillsearch or \ + skillsearch in skillName): + continue + skillLevelStr=str(skillLevel) + if skillLevel<100: + skillLevelStr='0'+skillLevelStr + if skillLevel<10: + skillLevelStr='0'+skillLevelStr + indexStr= \ + skillLevelStr+';'+actor+';'+actorJson['name']+ \ + ';'+actorJson['icon']['url'] + if indexStr not in results: + results.append(indexStr) if not instanceOnly: # search actor cache for subdir, dirs, files in os.walk(baseDir+'/cache/actors/'): @@ -577,7 +587,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ continue if f.startswith('inbox@'): continue - actorFilename = os.path.join(subdir, f) + actorFilename=os.path.join(subdir, f) cachedActorJson=loadJson(actorFilename) if cachedActorJson: if cachedActorJson.get('actor'): @@ -589,17 +599,19 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ actor=actorJson['id'] for skillName,skillLevel in actorJson['skills'].items(): skillName=skillName.lower() - if skillName in skillsearch or skillsearch in skillName: - skillLevelStr=str(skillLevel) - if skillLevel<100: - skillLevelStr='0'+skillLevelStr - if skillLevel<10: - skillLevelStr='0'+skillLevelStr - indexStr= \ - skillLevelStr+';'+actor+';'+actorJson['name']+ \ - ';'+actorJson['icon']['url'] - if indexStr not in results: - results.append(indexStr) + if not (skillName in skillsearch or \ + skillsearch in skillName): + continue + skillLevelStr=str(skillLevel) + if skillLevel<100: + skillLevelStr='0'+skillLevelStr + if skillLevel<10: + skillLevelStr='0'+skillLevelStr + indexStr= \ + skillLevelStr+';'+actor+';'+actorJson['name']+ \ + ';'+actorJson['icon']['url'] + if indexStr not in results: + results.append(indexStr) results.sort(reverse=True) @@ -607,7 +619,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - skillSearchCSS = cssFile.read() + skillSearchCSS=cssFile.read() if httpPrefix!='https': skillSearchCSS=skillSearchCSS.replace('https://',httpPrefix+'://') skillSearchForm=htmlHeader(cssFilename,skillSearchCSS) @@ -622,17 +634,20 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ ctr=0 for skillMatch in results: skillMatchFields=skillMatch.split(';') - if len(skillMatchFields)==4: - actor=skillMatchFields[1] - actorName=skillMatchFields[2] - avatarUrl=skillMatchFields[3] - skillSearchForm+='' - ctr+=1 - if ctr>=postsPerPage: - break + if len(skillMatchFields)!=4: + continue + actor=skillMatchFields[1] + actorName=skillMatchFields[2] + avatarUrl=skillMatchFields[3] + skillSearchForm+= \ + '' + ctr+=1 + if ctr>=postsPerPage: + break skillSearchForm+='' skillSearchForm+=htmlFooter() return skillSearchForm @@ -640,7 +655,8 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ def scheduledPostsExist(baseDir: str,nickname: str,domain: str) -> bool: """Returns true if there are posts scheduled to be delivered """ - scheduleIndexFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/schedule.index' + scheduleIndexFilename= \ + baseDir+'/accounts/'+nickname+'@'+domain+'/schedule.index' if not os.path.isfile(scheduleIndexFilename): return False if '#users#' in open(scheduleIndexFilename).read(): @@ -653,7 +669,8 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ """ imageFormats='.png, .jpg, .jpeg, .gif, .webp' pathOriginal=path - path=path.replace('/inbox','').replace('/outbox','').replace('/shares','') + path= \ + path.replace('/inbox','').replace('/outbox','').replace('/shares','') nickname=getNicknameFromActor(path) if not nickname: return '' @@ -730,13 +747,15 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ switchStr=switchfile.read() blockedStr='' - blockedFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/blocking.txt' + blockedFilename= \ + baseDir+'/accounts/'+nickname+'@'+domain+'/blocking.txt' if os.path.isfile(blockedFilename): with open(blockedFilename, 'r') as blockedfile: blockedStr=blockedfile.read() allowedInstancesStr='' - allowedInstancesFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/allowedinstances.txt' + allowedInstancesFilename= \ + baseDir+'/accounts/'+nickname+'@'+domain+'/allowedinstances.txt' if os.path.isfile(allowedInstancesFilename): with open(allowedInstancesFilename, 'r') as allowedInstancesFile: allowedInstancesStr=allowedInstancesFile.read() @@ -766,7 +785,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - editProfileCSS = cssFile.read() + editProfileCSS=cssFile.read() if httpPrefix!='https': editProfileCSS=editProfileCSS.replace('https://',httpPrefix+'://') @@ -804,7 +823,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ moderatorsFile=baseDir+'/accounts/moderators.txt' if os.path.isfile(moderatorsFile): with open(moderatorsFile, "r") as f: - moderators = f.read() + moderators=f.read() moderatorsStr='
'+translate['Blocked accounts and hashtags']+'' @@ -437,14 +445,14 @@ def htmlHashtagSearch(nickname: str,domain: str,port: int, \ # read the index with open(hashtagIndexFile, "r") as f: - lines = f.readlines() + lines=f.readlines() # read the css cssFilename=baseDir+'/epicyon-profile.css' if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - hashtagSearchCSS = cssFile.read() + hashtagSearchCSS=cssFile.read() if httpPrefix!='https': hashtagSearchCSS= \ hashtagSearchCSS.replace('https://',httpPrefix+'://') @@ -546,7 +554,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ continue if f.startswith('inbox@'): continue - actorFilename = os.path.join(subdir, f) + actorFilename=os.path.join(subdir, f) actorJson=loadJson(actorFilename) if actorJson: if actorJson.get('id') and \ @@ -556,17 +564,19 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ actor=actorJson['id'] for skillName,skillLevel in actorJson['skills'].items(): skillName=skillName.lower() - if skillName in skillsearch or skillsearch in skillName: - skillLevelStr=str(skillLevel) - if skillLevel<100: - skillLevelStr='0'+skillLevelStr - if skillLevel<10: - skillLevelStr='0'+skillLevelStr - indexStr= \ - skillLevelStr+';'+actor+';'+actorJson['name']+ \ - ';'+actorJson['icon']['url'] - if indexStr not in results: - results.append(indexStr) + if not (skillName in skillsearch or \ + skillsearch in skillName): + continue + skillLevelStr=str(skillLevel) + if skillLevel<100: + skillLevelStr='0'+skillLevelStr + if skillLevel<10: + skillLevelStr='0'+skillLevelStr + indexStr= \ + skillLevelStr+';'+actor+';'+actorJson['name']+ \ + ';'+actorJson['icon']['url'] + if indexStr not in results: + results.append(indexStr) if not instanceOnly: # search actor cache for subdir, dirs, files in os.walk(baseDir+'/cache/actors/'): @@ -577,7 +587,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ continue if f.startswith('inbox@'): continue - actorFilename = os.path.join(subdir, f) + actorFilename=os.path.join(subdir, f) cachedActorJson=loadJson(actorFilename) if cachedActorJson: if cachedActorJson.get('actor'): @@ -589,17 +599,19 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ actor=actorJson['id'] for skillName,skillLevel in actorJson['skills'].items(): skillName=skillName.lower() - if skillName in skillsearch or skillsearch in skillName: - skillLevelStr=str(skillLevel) - if skillLevel<100: - skillLevelStr='0'+skillLevelStr - if skillLevel<10: - skillLevelStr='0'+skillLevelStr - indexStr= \ - skillLevelStr+';'+actor+';'+actorJson['name']+ \ - ';'+actorJson['icon']['url'] - if indexStr not in results: - results.append(indexStr) + if not (skillName in skillsearch or \ + skillsearch in skillName): + continue + skillLevelStr=str(skillLevel) + if skillLevel<100: + skillLevelStr='0'+skillLevelStr + if skillLevel<10: + skillLevelStr='0'+skillLevelStr + indexStr= \ + skillLevelStr+';'+actor+';'+actorJson['name']+ \ + ';'+actorJson['icon']['url'] + if indexStr not in results: + results.append(indexStr) results.sort(reverse=True) @@ -607,7 +619,7 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - skillSearchCSS = cssFile.read() + skillSearchCSS=cssFile.read() if httpPrefix!='https': skillSearchCSS=skillSearchCSS.replace('https://',httpPrefix+'://') skillSearchForm=htmlHeader(cssFilename,skillSearchCSS) @@ -622,17 +634,20 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ ctr=0 for skillMatch in results: skillMatchFields=skillMatch.split(';') - if len(skillMatchFields)==4: - actor=skillMatchFields[1] - actorName=skillMatchFields[2] - avatarUrl=skillMatchFields[3] - skillSearchForm+='' - ctr+=1 - if ctr>=postsPerPage: - break + if len(skillMatchFields)!=4: + continue + actor=skillMatchFields[1] + actorName=skillMatchFields[2] + avatarUrl=skillMatchFields[3] + skillSearchForm+= \ + '' + ctr+=1 + if ctr>=postsPerPage: + break skillSearchForm+='' skillSearchForm+=htmlFooter() return skillSearchForm @@ -640,7 +655,8 @@ def htmlSkillsSearch(translate: {},baseDir: str, \ def scheduledPostsExist(baseDir: str,nickname: str,domain: str) -> bool: """Returns true if there are posts scheduled to be delivered """ - scheduleIndexFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/schedule.index' + scheduleIndexFilename= \ + baseDir+'/accounts/'+nickname+'@'+domain+'/schedule.index' if not os.path.isfile(scheduleIndexFilename): return False if '#users#' in open(scheduleIndexFilename).read(): @@ -653,7 +669,8 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ """ imageFormats='.png, .jpg, .jpeg, .gif, .webp' pathOriginal=path - path=path.replace('/inbox','').replace('/outbox','').replace('/shares','') + path= \ + path.replace('/inbox','').replace('/outbox','').replace('/shares','') nickname=getNicknameFromActor(path) if not nickname: return '' @@ -730,13 +747,15 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ switchStr=switchfile.read() blockedStr='' - blockedFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/blocking.txt' + blockedFilename= \ + baseDir+'/accounts/'+nickname+'@'+domain+'/blocking.txt' if os.path.isfile(blockedFilename): with open(blockedFilename, 'r') as blockedfile: blockedStr=blockedfile.read() allowedInstancesStr='' - allowedInstancesFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/allowedinstances.txt' + allowedInstancesFilename= \ + baseDir+'/accounts/'+nickname+'@'+domain+'/allowedinstances.txt' if os.path.isfile(allowedInstancesFilename): with open(allowedInstancesFilename, 'r') as allowedInstancesFile: allowedInstancesStr=allowedInstancesFile.read() @@ -766,7 +785,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - editProfileCSS = cssFile.read() + editProfileCSS=cssFile.read() if httpPrefix!='https': editProfileCSS=editProfileCSS.replace('https://',httpPrefix+'://') @@ -804,7 +823,7 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ moderatorsFile=baseDir+'/accounts/moderators.txt' if os.path.isfile(moderatorsFile): with open(moderatorsFile, "r") as f: - moderators = f.read() + moderators=f.read() moderatorsStr='
'
moderatorsStr+=' '+translate['Moderators']+'
' moderatorsStr+=' '+translate['A list of moderator nicknames. One per line.'] @@ -928,7 +947,8 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ editProfileForm+=htmlFooter() return editProfileForm -def htmlGetLoginCredentials(loginParams: str,lastLoginTime: int) -> (str,str,bool): +def htmlGetLoginCredentials(loginParams: str, \ + lastLoginTime: int) -> (str,str,bool): """Receives login credentials via HTTPServer POST """ if not loginParams.startswith('username='): @@ -997,13 +1017,13 @@ def htmlLogin(translate: {},baseDir: str,autocomplete=True) -> str: if os.path.isfile(baseDir+'/accounts/login.txt'): # custom login message with open(baseDir+'/accounts/login.txt', 'r') as file: - loginText = '
' moderatorsStr+=' '+translate['A list of moderator nicknames. One per line.'] @@ -928,7 +947,8 @@ def htmlEditProfile(translate: {},baseDir: str,path: str, \ editProfileForm+=htmlFooter() return editProfileForm -def htmlGetLoginCredentials(loginParams: str,lastLoginTime: int) -> (str,str,bool): +def htmlGetLoginCredentials(loginParams: str, \ + lastLoginTime: int) -> (str,str,bool): """Receives login credentials via HTTPServer POST """ if not loginParams.startswith('username='): @@ -997,13 +1017,13 @@ def htmlLogin(translate: {},baseDir: str,autocomplete=True) -> str: if os.path.isfile(baseDir+'/accounts/login.txt'): # custom login message with open(baseDir+'/accounts/login.txt', 'r') as file: - loginText = '
'+file.read()+'
' + loginText=''+file.read()+'
' cssFilename=baseDir+'/epicyon-login.css' if os.path.isfile(baseDir+'/login.css'): cssFilename=baseDir+'/login.css' with open(cssFilename, 'r') as cssFile: - loginCSS = cssFile.read() + loginCSS=cssFile.read() # show the register button registerButtonStr='' @@ -1065,7 +1085,7 @@ def htmlLogin(translate: {},baseDir: str,autocomplete=True) -> str: def htmlTermsOfService(baseDir: str,httpPrefix: str,domainFull: str) -> str: """Show the terms of service screen """ - adminNickname = getConfigParam(baseDir,'admin') + adminNickname=getConfigParam(baseDir,'admin') if not os.path.isfile(baseDir+'/accounts/tos.txt'): copyfile(baseDir+'/default_tos.txt',baseDir+'/accounts/tos.txt') if os.path.isfile(baseDir+'/img/login-background.png'): @@ -1076,14 +1096,14 @@ def htmlTermsOfService(baseDir: str,httpPrefix: str,domainFull: str) -> str: TOSText='Terms of Service go here.' if os.path.isfile(baseDir+'/accounts/tos.txt'): with open(baseDir+'/accounts/tos.txt', 'r') as file: - TOSText = file.read() + TOSText=file.read() TOSForm='' cssFilename=baseDir+'/epicyon-profile.css' if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - termsCSS = cssFile.read() + termsCSS=cssFile.read() if httpPrefix!='https': termsCSS=termsCSS.replace('https://',httpPrefix+'://') @@ -1100,7 +1120,7 @@ def htmlTermsOfService(baseDir: str,httpPrefix: str,domainFull: str) -> str: def htmlAbout(baseDir: str,httpPrefix: str,domainFull: str) -> str: """Show the about screen """ - adminNickname = getConfigParam(baseDir,'admin') + adminNickname=getConfigParam(baseDir,'admin') if not os.path.isfile(baseDir+'/accounts/about.txt'): copyfile(baseDir+'/default_about.txt',baseDir+'/accounts/about.txt') if os.path.isfile(baseDir+'/img/login-background.png'): @@ -1111,14 +1131,14 @@ def htmlAbout(baseDir: str,httpPrefix: str,domainFull: str) -> str: aboutText='Information about this instance goes here.' if os.path.isfile(baseDir+'/accounts/about.txt'): with open(baseDir+'/accounts/about.txt', 'r') as file: - aboutText = file.read() + aboutText=file.read() aboutForm='' cssFilename=baseDir+'/epicyon-profile.css' if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - termsCSS = cssFile.read() + termsCSS=cssFile.read() if httpPrefix!='http': termsCSS=termsCSS.replace('https://',httpPrefix+'://') @@ -1231,13 +1251,13 @@ def htmlNewPost(mediaInstance: bool,translate: {}, \ if os.path.isfile(baseDir+'/accounts/newpost.txt'): with open(baseDir+'/accounts/newpost.txt', 'r') as file: - newPostText = ''+file.read()+'
' + newPostText=''+file.read()+'
' cssFilename=baseDir+'/epicyon-profile.css' if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - newPostCSS = cssFile.read() + newPostCSS=cssFile.read() if httpPrefix!='https': newPostCSS=newPostCSS.replace('https://',httpPrefix+'://') @@ -2017,7 +2037,7 @@ def htmlProfile(defaultTimeline: str, \ if os.path.isfile(baseDir+'/epicyon.css'): cssFilename=baseDir+'/epicyon.css' with open(cssFilename, 'r') as cssFile: - profileStyle = \ + profileStyle= \ cssFile.read().replace('image.png', \ profileJson['image']['url']) @@ -2085,7 +2105,7 @@ def individualFollowAsHtml(translate: {}, \ if not avatarUrl: avatarUrl=followUrl+'/avatar.png' if domain not in followUrl: - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix,nickname,domain,'outbox') if avatarUrl2: @@ -2131,8 +2151,8 @@ def cursorToEndOfMessageScript() -> str: This avoids the cursor being in the wrong position when replying """ script='function focusOnMessage() {\n' - script+=" var replyTextArea = document.getElementById('message');\n" - script+=' val = replyTextArea.value;\n' + script+=" var replyTextArea=document.getElementById('message');\n" + script+=' val=replyTextArea.value;\n' script+=' if ((val.length>0) && (val.charAt(val.length-1) != " ")) {\n' script+=' val += " ";\n' script+=' }\n' @@ -2140,8 +2160,8 @@ def cursorToEndOfMessageScript() -> str: script+=' replyTextArea.value="";\n' script+=' replyTextArea.value=val;\n' script+='}\n' - script+="var replyTextArea = document.getElementById('message')\n" - script+='replyTextArea.onFocus = function() {\n' + script+="var replyTextArea=document.getElementById('message')\n" + script+='replyTextArea.onFocus=function() {\n' script+=' focusOnMessage();' script+='}\n' return script @@ -2150,11 +2170,11 @@ def contentWarningScript() -> str: """Returns a script used for content warnings """ script='function showContentWarning(postID) {\n' - script+=' var x = document.getElementById(postID);\n' + script+=' var x=document.getElementById(postID);\n' script+=' if (x.style.display !== "block") {\n' - script+=' x.style.display = "block";\n' + script+=' x.style.display="block";\n' script+=' } else {\n' - script+=' x.style.display = "none";\n' + script+=' x.style.display="none";\n' script+=' }\n' script+='}\n' return script @@ -2164,8 +2184,8 @@ def contentWarningScriptOpen() -> str: The warning is open by default. This is used on blog replies. """ script='function showContentWarning(postID) {\n' - script+=' var x = document.getElementById(postID);\n' - script+=' x.style.display = "block";\n' + script+=' var x=document.getElementById(postID);\n' + script+=' x.style.display="block";\n' script+='}\n' return script @@ -2531,7 +2551,7 @@ def loadIndividualPostAsHtmlFromCache(baseDir: str,nickname: str,domain: str, \ while tries<3: try: with open(cachedPostFilename, 'r') as file: - postHtml = file.read() + postHtml=file.read() break except Exception as e: print(e) @@ -2847,7 +2867,7 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ avatarUrl=postActor+'/avatar.png' if fullDomain not in postActor: - inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName = \ + inboxUrl,pubKeyId,pubKey,fromPersonId,sharedInbox,capabilityAcquisition,avatarUrl2,displayName= \ getPersonBox(baseDir,session,wfRequest,personCache, \ projectVersion,httpPrefix,nickname,domain,'outbox') if avatarUrl2: @@ -3267,15 +3287,15 @@ def individualPostAsHtml(recentPostsCache: {},maxRecentPosts: int, \ publishedStr=postJsonObject['object']['published'] if '.' not in publishedStr: if '+' not in publishedStr: - datetimeObject = \ + datetimeObject= \ datetime.strptime(publishedStr,"%Y-%m-%dT%H:%M:%SZ") else: - datetimeObject = \ + datetimeObject= \ datetime.strptime(publishedStr.split('+')[0]+'Z', \ "%Y-%m-%dT%H:%M:%SZ") else: publishedStr=publishedStr.replace('T',' ').split('.')[0] - datetimeObject = parse(publishedStr) + datetimeObject=parse(publishedStr) publishedStr=datetimeObject.strftime("%a %b %d, %H:%M") publishedLink=messageId @@ -3459,7 +3479,7 @@ def htmlTimeline(defaultTimeline: str, \ bannerFile='banner.webp' with open(cssFilename, 'r') as cssFile: - profileStyle = \ + profileStyle= \ cssFile.read().replace('banner.png', \ '/users/'+nickname+'/'+bannerFile) if httpPrefix!='https': @@ -4069,7 +4089,7 @@ def htmlRemoveSharedItem(translate: {},baseDir: str,actor: str,shareName: str) - if os.path.isfile(baseDir+'/follow.css'): cssFilename=baseDir+'/follow.css' with open(cssFilename, 'r') as cssFile: - profileStyle = cssFile.read() + profileStyle=cssFile.read() sharesStr=htmlHeader(cssFilename,profileStyle) sharesStr+=''
sharesStr+='
'
@@ -4127,7 +4147,7 @@ def htmlDeletePost(recentPostsCache: {},maxRecentPosts: int, \
if os.path.isfile(baseDir+'/epicyon.css'):
cssFilename=baseDir+'/epicyon.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
if httpPrefix!='https':
profileStyle=profileStyle.replace('https://',httpPrefix+'://')
deletePostStr=htmlHeader(cssFilename,profileStyle)
@@ -4191,7 +4211,7 @@ def htmlCalendarDeleteConfirm(translate: {},baseDir: str, \
if os.path.isfile(baseDir+'/epicyon.css'):
cssFilename=baseDir+'/epicyon.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
if httpPrefix!='https':
profileStyle=profileStyle.replace('https://',httpPrefix+'://')
deletePostStr=htmlHeader(cssFilename,profileStyle)
@@ -4235,7 +4255,7 @@ def htmlFollowConfirm(translate: {},baseDir: str, \
if os.path.isfile(baseDir+'/follow.css'):
cssFilename=baseDir+'/follow.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
followStr=htmlHeader(cssFilename,profileStyle)
followStr+='
'
followStr+='
'
@@ -4277,7 +4297,7 @@ def htmlUnfollowConfirm(translate: {},baseDir: str, \
if os.path.isfile(baseDir+'/follow.css'):
cssFilename=baseDir+'/follow.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
followStr=htmlHeader(cssFilename,profileStyle)
followStr+='
'
followStr+='
'
@@ -4352,7 +4372,7 @@ def htmlPersonOptions(translate: {},baseDir: str, \
if os.path.isfile(baseDir+'/follow.css'):
cssFilename=baseDir+'/follow.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
# To snooze, or not to snooze? That is the question
snoozeButtonStr='Snooze'
@@ -4438,7 +4458,7 @@ def htmlPersonOptions(translate: {},baseDir: str, \
# copyfile(baseDir+'/img/block-background.png',baseDir+'/accounts/block-background.png')
#
# with open(baseDir+'/epicyon-follow.css', 'r') as cssFile:
-# profileStyle = cssFile.read()
+# profileStyle=cssFile.read()
# blockStr=htmlHeader(cssFilename,profileStyle)
# blockStr+='
'
# blockStr+='
'
@@ -4474,7 +4494,7 @@ def htmlUnblockConfirm(translate: {},baseDir: str, \
if os.path.isfile(baseDir+'/follow.css'):
cssFilename=baseDir+'/follow.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
blockStr=htmlHeader(cssFilename,profileStyle)
blockStr+='
'
blockStr+='
'
@@ -4522,7 +4542,7 @@ def htmlSearchEmojiTextEntry(translate: {}, \
if os.path.isfile(baseDir+'/follow.css'):
cssFilename=baseDir+'/follow.css'
with open(cssFilename, 'r') as cssFile:
- profileStyle = cssFile.read()
+ profileStyle=cssFile.read()
emojiStr=htmlHeader(cssFilename,profileStyle)
emojiStr+='
'
emojiStr+='
'
@@ -4567,7 +4587,7 @@ def htmlCalendarDay(translate: {}, \
if os.path.isfile(baseDir+'/calendar.css'):
cssFilename=baseDir+'/calendar.css'
with open(cssFilename, 'r') as cssFile:
- calendarStyle = cssFile.read()
+ calendarStyle=cssFile.read()
calendarStr=htmlHeader(cssFilename,calendarStyle)
calendarStr+='\n'
@@ -4740,7 +4760,7 @@ def htmlCalendar(translate: {}, \
if os.path.isfile(baseDir+'/calendar.css'):
cssFilename=baseDir+'/calendar.css'
with open(cssFilename, 'r') as cssFile:
- calendarStyle = cssFile.read()
+ calendarStyle=cssFile.read()
calendarStr=htmlHeader(cssFilename,calendarStyle)
calendarStr+='