indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Use the full domain within tokens

main
Bob Mottram 2021-08-05 17:46:02 +01:00
parent 5f10fc9a61
commit a444304eb5
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
posts.py
View File

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