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

Ensure that shared item federation tokens are sent

merge-requests/30/head
Bob Mottram 2021-08-02 20:01:31 +01:00
parent a8ae7c90fe
commit 3193963714
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
inbox.py
View File

@ -1892,14 +1892,24 @@ def _sendToGroupMembers(session, baseDir: str, handle: str, port: int,
sendThreads: [], postLog: [], cachedWebfingers: {}, sendThreads: [], postLog: [], cachedWebfingers: {},
personCache: {}, debug: bool, personCache: {}, debug: bool,
systemLanguage: str, systemLanguage: str,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str) -> None:
sharedItemFederationTokens: {},
sharedItemsFederatedDomains: []) -> None:
"""When a post arrives for a group send it out to the group members """When a post arrives for a group send it out to the group members
""" """
if debug: if debug:
print('\n\n=========================================================') print('\n\n=========================================================')
print(handle + ' sending to group members') print(handle + ' sending to group members')
sharedItemFederationTokens = {}
sharedItemsFederatedDomains = []
sharedItemsFederatedDomainsStr = \
getConfigParam(baseDir, 'sharedItemsFederatedDomains')
if sharedItemsFederatedDomainsStr:
siFederatedDomainsList = \
sharedItemsFederatedDomainsStr.split(',')
for sharedFederatedDomain in siFederatedDomainsList:
domainStr = sharedFederatedDomain.strip()
sharedItemsFederatedDomains.append(domainStr)
followersFile = baseDir + '/accounts/' + handle + '/followers.txt' followersFile = baseDir + '/accounts/' + handle + '/followers.txt'
if not os.path.isfile(followersFile): if not os.path.isfile(followersFile):
return return
@ -2421,6 +2431,18 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
questionJson['type'] = 'Update' questionJson['type'] = 'Update'
sharedItemsFederatedDomains = [] sharedItemsFederatedDomains = []
sharedItemFederationTokens = {} sharedItemFederationTokens = {}
sharedItemFederationTokens = {}
sharedItemsFederatedDomains = []
sharedItemsFederatedDomainsStr = \
getConfigParam(baseDir, 'sharedItemsFederatedDomains')
if sharedItemsFederatedDomainsStr:
siFederatedDomainsList = \
sharedItemsFederatedDomainsStr.split(',')
for sharedFederatedDomain in siFederatedDomainsList:
domainStr = sharedFederatedDomain.strip()
sharedItemsFederatedDomains.append(domainStr)
sendToFollowersThread(session, baseDir, sendToFollowersThread(session, baseDir,
nickname, domain, nickname, domain,
onionDomain, i2pDomain, port, onionDomain, i2pDomain, port,
@ -2566,25 +2588,12 @@ def _inboxAfterInitial(recentPostsCache: {}, maxRecentPosts: int,
# send the post out to group members # send the post out to group members
if isGroup: if isGroup:
sharedItemFederationTokens = {}
sharedItemsFederatedDomains = []
sharedItemsFederatedDomainsStr = \
getConfigParam(baseDir, 'sharedItemsFederatedDomains')
if sharedItemsFederatedDomainsStr:
siFederatedDomainsList = \
sharedItemsFederatedDomainsStr.split(',')
for sharedFederatedDomain in siFederatedDomainsList:
domainStr = sharedFederatedDomain.strip()
sharedItemsFederatedDomains.append(domainStr)
_sendToGroupMembers(session, baseDir, handle, port, _sendToGroupMembers(session, baseDir, handle, port,
postJsonObject, postJsonObject,
httpPrefix, federationList, sendThreads, httpPrefix, federationList, sendThreads,
postLog, cachedWebfingers, personCache, postLog, cachedWebfingers, personCache,
debug, systemLanguage, debug, systemLanguage,
onionDomain, i2pDomain, onionDomain, i2pDomain)
sharedItemFederationTokens,
sharedItemsFederatedDomains)
# if the post wasn't saved # if the post wasn't saved
if not os.path.isfile(destinationFilename): if not os.path.isfile(destinationFilename):