From 59fc02c0a71005c5e314c64286c84ef8e7691929 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 12 Aug 2021 18:13:18 +0100
Subject: [PATCH] Group account status

---
 follow.py | 6 +++---
 inbox.py  | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

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