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

Group account status

main
Bob Mottram 2021-08-12 18:13:18 +01:00
parent a6149853ca
commit 59fc02c0a7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
follow.py
View File

@ -749,7 +749,7 @@ def receiveFollowRequest(session, baseDir: str, httpPrefix: str,
messageJson['actor']) messageJson['actor'])
groupAccount = \ groupAccount = \
hasGroupType(baseDir, messageJson['object'], personCache) hasGroupType(baseDir, messageJson['actor'], personCache)
print('Storing follow request for approval') print('Storing follow request for approval')
return _storeFollowRequest(baseDir, return _storeFollowRequest(baseDir,
@ -786,8 +786,8 @@ def receiveFollowRequest(session, baseDir: str, httpPrefix: str,
if os.path.isfile(followersFilename): if os.path.isfile(followersFilename):
if approveHandle not in open(followersFilename).read(): if approveHandle not in open(followersFilename).read():
groupAccount = \ groupAccount = \
hasGroupType(baseDir, messageJson['actor'], hasGroupType(baseDir,
personCache) messageJson['actor'], personCache)
if debug: if debug:
print(approveHandle + ' / ' + messageJson['actor'] + print(approveHandle + ' / ' + messageJson['actor'] +
' is Group: ' + str(groupAccount)) ' is Group: ' + str(groupAccount))

1
inbox.py
View File

@ -1922,7 +1922,6 @@ def _sendToGroupMembers(session, baseDir: str, handle: str, port: int,
if not hasObjectDict(postJsonObject): if not hasObjectDict(postJsonObject):
return return
nickname = handle.split('@')[0].replace('!', '') nickname = handle.split('@')[0].replace('!', '')
# groupname = _getGroupName(baseDir, handle)
domain = handle.split('@')[1] domain = handle.split('@')[1]
domainFull = getFullDomain(domain, port) domainFull = getFullDomain(domain, port)
groupActor = httpPrefix + '://' + domainFull + '/users/' + nickname groupActor = httpPrefix + '://' + domainFull + '/users/' + nickname