diff --git a/follow.py b/follow.py index 8d70adb59..90279fcf1 100644 --- a/follow.py +++ b/follow.py @@ -749,7 +749,7 @@ def receiveFollowRequest(session, baseDir: str, httpPrefix: str, messageJson['actor']) groupAccount = \ - hasGroupType(baseDir, messageJson['object'], personCache) + hasGroupType(baseDir, messageJson['actor'], personCache) print('Storing follow request for approval') return _storeFollowRequest(baseDir, @@ -786,8 +786,8 @@ def receiveFollowRequest(session, baseDir: str, httpPrefix: str, if os.path.isfile(followersFilename): if approveHandle not in open(followersFilename).read(): groupAccount = \ - hasGroupType(baseDir, messageJson['actor'], - personCache) + hasGroupType(baseDir, + messageJson['actor'], personCache) if debug: print(approveHandle + ' / ' + messageJson['actor'] + ' is Group: ' + str(groupAccount)) diff --git a/inbox.py b/inbox.py index 4e45fde56..bb3e46cab 100644 --- a/inbox.py +++ b/inbox.py @@ -1922,7 +1922,6 @@ def _sendToGroupMembers(session, baseDir: str, handle: str, port: int, if not hasObjectDict(postJsonObject): return nickname = handle.split('@')[0].replace('!', '') -# groupname = _getGroupName(baseDir, handle) domain = handle.split('@')[1] domainFull = getFullDomain(domain, port) groupActor = httpPrefix + '://' + domainFull + '/users/' + nickname