From ec8b82ec9cc88cfc0fb8e2eae12251c578ea5ac9 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 1 Jul 2019 13:47:08 +0100 Subject: [PATCH] Include port numbers in messages --- epicyon.py | 2 +- posts.py | 15 ++++++++------- tests.py | 12 ++++++------ 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/epicyon.py b/epicyon.py index 70fa08567..160883649 100644 --- a/epicyon.py +++ b/epicyon.py @@ -78,7 +78,7 @@ privateKeyPem,publicKeyPem,person,wfEndpoint=createPerson(baseDir,username,domai #deleteAllPosts(username,domain) setPreferredUsername(baseDir,username,domain,'badger') setBio(baseDir,username,domain,'Some personal info') -#createPublicPost(baseDir,username, domain, https, "G'day world!", False, True, None, None, 'Not suitable for Vogons') +#createPublicPost(baseDir,username, domain, port,https, "G'day world!", False, True, None, None, 'Not suitable for Vogons') #archivePosts(username,domain,baseDir,4) #outboxJson=createOutbox(baseDir,username,domain,port,https,2,True,None) #pprint(outboxJson) diff --git a/posts.py b/posts.py index 93dae09ac..5499e16d5 100644 --- a/posts.py +++ b/posts.py @@ -67,7 +67,6 @@ def getUserUrl(wfRequest) -> str: def parseUserFeed(session,feedUrl: str,asHeader: {}) -> None: feedJson = getJson(session,feedUrl,asHeader,None) - pprint(feedJson) if 'orderedItems' in feedJson: for item in feedJson['orderedItems']: @@ -245,12 +244,16 @@ def getStatusNumber() -> (str,str): conversationDate=currTime.strftime("%Y-%m-%d") return statusNumber,published -def createPostBase(baseDir: str,username: str, domain: str, toUrl: str, ccUrl: str, https: bool, content: str, followersOnly: bool, saveToFile: bool, inReplyTo=None, inReplyToAtomUri=None, subject=None) -> {}: +def createPostBase(baseDir: str,username: str, domain: str, port: int,toUrl: str, ccUrl: str, https: bool, content: str, followersOnly: bool, saveToFile: bool, inReplyTo=None, inReplyToAtomUri=None, subject=None) -> {}: """Creates a message """ prefix='https' if not https: prefix='http' + + if port!=80 and port!=443: + domain=domain+':'+str(port) + statusNumber,published = getStatusNumber() conversationDate=published.split('T')[0] conversationId=statusNumber @@ -311,13 +314,13 @@ def createPostBase(baseDir: str,username: str, domain: str, toUrl: str, ccUrl: s commentjson.dump(newPost, fp, indent=4, sort_keys=False) return newPost -def createPublicPost(baseDir: str,username: str, domain: str, https: bool, content: str, followersOnly: bool, saveToFile: bool, inReplyTo=None, inReplyToAtomUri=None, subject=None) -> {}: +def createPublicPost(baseDir: str,username: str, domain: str, port: int,https: bool, content: str, followersOnly: bool, saveToFile: bool, inReplyTo=None, inReplyToAtomUri=None, subject=None) -> {}: """Public post to the outbox """ prefix='https' if not https: prefix='http' - return createPostBase(baseDir,username, domain, 'https://www.w3.org/ns/activitystreams#Public', prefix+'://'+domain+'/users/'+username+'/followers', https, content, followersOnly, saveToFile, inReplyTo, inReplyToAtomUri, subject) + return createPostBase(baseDir,username, domain, port,'https://www.w3.org/ns/activitystreams#Public', prefix+'://'+domain+'/users/'+username+'/followers', https, content, followersOnly, saveToFile, inReplyTo, inReplyToAtomUri, subject) def threadSendPost(session,postJsonObject: {},federationList: [],inboxUrl: str,baseDir: str,signatureHeaderJson: {},postLog: []) -> None: """Sends a post with exponential backoff @@ -370,9 +373,7 @@ def sendPost(session,baseDir: str,username: str, domain: str, port: int, toUsern if not toPersonId: return 4 - print('*************Creating post') - print('toPersonId: '+toPersonId) - postJsonObject=createPostBase(baseDir,username, domain, toPersonId, cc, https, content, followersOnly, saveToFile, inReplyTo, inReplyToAtomUri, subject) + postJsonObject=createPostBase(baseDir,username,domain,port,toPersonId,cc,https,content,followersOnly,saveToFile,inReplyTo,inReplyToAtomUri,subject) # get the senders private key privateKeyPem=getPersonKey(username,domain,baseDir,'private') diff --git a/tests.py b/tests.py index c95e10209..8a7f51ed2 100644 --- a/tests.py +++ b/tests.py @@ -112,9 +112,9 @@ def createServerAlice(path: str,port: int): deleteAllPosts(username,domain,path) followPerson(path,username,domain,'bob','127.0.0.1:61936',federationList) followerOfPerson(path,username,domain,'bob','127.0.0.1:61936',federationList) - createPublicPost(path,username, domain, https, "No wise fish would go anywhere without a porpoise", False, True) - createPublicPost(path,username, domain, https, "Curiouser and curiouser!", False, True) - createPublicPost(path,username, domain, https, "In the gardens of memory, in the palace of dreams, that is where you and I shall meet", False, True) + createPublicPost(path,username, domain, port,https, "No wise fish would go anywhere without a porpoise", False, True) + createPublicPost(path,username, domain, port,https, "Curiouser and curiouser!", False, True) + createPublicPost(path,username, domain, port,https, "In the gardens of memory, in the palace of dreams, that is where you and I shall meet", False, True) global testServerAliceRunning testServerAliceRunning = True print('Server running: Alice') @@ -135,9 +135,9 @@ def createServerBob(path: str,port: int): deleteAllPosts(username,domain,path) followPerson(path,username,domain,'alice','127.0.0.1:61935',federationList) followerOfPerson(path,username,domain,'alice','127.0.0.1:61935',federationList) - createPublicPost(path,username, domain, https, "It's your life, live it your way.", False, True) - createPublicPost(path,username, domain, https, "One of the things I've realised is that I am very simple", False, True) - createPublicPost(path,username, domain, https, "Quantum physics is a bit of a passion of mine", False, True) + createPublicPost(path,username, domain, port,https, "It's your life, live it your way.", False, True) + createPublicPost(path,username, domain, port,https, "One of the things I've realised is that I am very simple", False, True) + createPublicPost(path,username, domain, port,https, "Quantum physics is a bit of a passion of mine", False, True) global testServerBobRunning testServerBobRunning = True print('Server running: Bob')