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

Use send function to handle shared inbox for group posts

main
Bob Mottram 2021-08-02 19:55:53 +01:00
parent 7dc79080d0
commit a8ae7c90fe
1 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
inbox.py
View File

@ -1891,7 +1891,10 @@ def _sendToGroupMembers(session, baseDir: str, handle: str, port: int,
httpPrefix: str, federationList: [], httpPrefix: str, federationList: [],
sendThreads: [], postLog: [], cachedWebfingers: {}, sendThreads: [], postLog: [], cachedWebfingers: {},
personCache: {}, debug: bool, personCache: {}, debug: bool,
systemLanguage: str) -> None: systemLanguage: str,
onionDomain: str, i2pDomain: str,
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:
@ -1929,29 +1932,14 @@ def _sendToGroupMembers(session, baseDir: str, handle: str, port: int,
personCache, cachedWebfingers, personCache, cachedWebfingers,
debug, __version__) debug, __version__)
# TODO: include handling of shared inbox sendToFollowersThread(session, baseDir, nickname, domain,
onionDomain, i2pDomain, port,
with open(followersFile, 'r') as groupMembers: httpPrefix, federationList,
for memberHandle in groupMembers: sendThreads, postLog,
if memberHandle == handle: cachedWebfingers, personCache,
continue announceJson, debug, __version__,
memberNickname = memberHandle.split('@')[0] sharedItemsFederatedDomains,
if memberNickname.startswith('!'): sharedItemFederationTokens)
# don't have groups which are members of groups
continue
memberDomain = memberHandle.split('@')[1]
memberPort = port
if ':' in memberDomain:
memberPort = getPortFromDomain(memberDomain)
memberDomain = removeDomainPort(memberDomain)
groupAccount = False
sendSignedJson(announceJson, session, baseDir,
nickname, domain, port,
memberNickname, memberDomain, memberPort, cc,
httpPrefix, False, False, federationList,
sendThreads, postLog, cachedWebfingers,
personCache, debug, __version__, None,
groupAccount)
def _inboxUpdateCalendar(baseDir: str, handle: str, def _inboxUpdateCalendar(baseDir: str, handle: str,
@ -2578,11 +2566,25 @@ 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,
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):