From a444304eb500985660e23dccfe48db99c5921483 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 5 Aug 2021 17:46:02 +0100
Subject: [PATCH] Use the full domain within tokens

---
 posts.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/posts.py b/posts.py
index 8dd02609c..4efb56513 100644
--- a/posts.py
+++ b/posts.py
@@ -2677,14 +2677,17 @@ def sendToNamedAddresses(session, baseDir: str,
         # another onion domain then switch the clearnet
         # domain for the onion one
         fromDomain = domain
+        fromDomainFull = getFullDomain(domain, port)
         fromHttpPrefix = httpPrefix
         if onionDomain:
             if toDomain.endswith('.onion'):
                 fromDomain = onionDomain
+                fromDomainFull = onionDomain
                 fromHttpPrefix = 'http'
         elif i2pDomain:
             if toDomain.endswith('.i2p'):
                 fromDomain = i2pDomain
+                fromDomainFull = i2pDomain
                 fromHttpPrefix = 'http'
         cc = []
 
@@ -2693,8 +2696,8 @@ def sendToNamedAddresses(session, baseDir: str,
         # so that it can request a catalog
         sharedItemsToken = None
         if toDomain in sharedItemsFederatedDomains:
-            if sharedItemFederationTokens.get(fromDomain):
-                sharedItemsToken = sharedItemFederationTokens[fromDomain]
+            if sharedItemFederationTokens.get(fromDomainFull):
+                sharedItemsToken = sharedItemFederationTokens[fromDomainFull]
 
         groupAccount = hasGroupType(baseDir, address, personCache)
 
@@ -2800,8 +2803,9 @@ def sendToFollowers(session, baseDir: str,
         # so that it can request a catalog
         sharedItemsToken = None
         if followerDomain in sharedItemsFederatedDomains:
-            if sharedItemFederationTokens.get(domain):
-                sharedItemsToken = sharedItemFederationTokens[domain]
+            domainFull = getFullDomain(domain, port)
+            if sharedItemFederationTokens.get(domainFull):
+                sharedItemsToken = sharedItemFederationTokens[domainFull]
 
         # check that the follower's domain is active
         followerDomainUrl = httpPrefix + '://' + followerDomain