Allow adding & removing arbitrary members from gh teams

Author: ChrisLovering

arthur/apis/github/__init__.py

@@ -1,5 +1,5 @@
 from .common import GitHubError
 from .orgs import remove_org_member
-from .teams import add_staff_member
+from .teams import add_member_to_team
 
-__all__ = ("GitHubError", "add_staff_member", "remove_org_member")
+__all__ = ("GitHubError", "add_member_to_team", "remove_org_member")

arthur/apis/github/teams.py

@@ -4,10 +4,10 @@
 from arthur.config import CONFIG
 
 
-async def add_staff_member(username: str) -> None:
-    """Add a user to the default GitHub team."""
+async def add_member_to_team(username: str, github_team_slug: str) -> None:
+    """Add a user to a GitHub team."""
     async with aiohttp.ClientSession() as session:
-        endpoint = f"https://api.github.com/orgs/{CONFIG.github_org}/teams/{CONFIG.github_team}/memberships/{username}"
+        endpoint = f"https://api.github.com/orgs/{CONFIG.github_org}/teams/{github_team_slug}/memberships/{username}"
         async with session.put(endpoint, headers=HEADERS) as response:
             try:
                 response.raise_for_status()
@@ -25,3 +25,22 @@ async def add_staff_member(username: str) -> None:
 
                 msg = f"Unexpected error: {e.message}"
                 raise GitHubError(msg)
+
+
+async def remove_member_from_team(username: str, github_team_slug: str) -> None:
+    """Remove a user from a GitHub team."""
+    async with aiohttp.ClientSession() as session:
+        endpoint = f"https://api.github.com/orgs/{CONFIG.github_org}/teams/{github_team_slug}/memberships/{username}"
+        async with session.delete(endpoint, headers=HEADERS) as response:
+            try:
+                response.raise_for_status()
+            except aiohttp.ClientResponseError as e:
+                if e.status == HTTP_404:
+                    msg = f"Team or user not found: {e.message}"
+                    raise GitHubError(msg)
+                if e.status == HTTP_403:
+                    msg = f"Forbidden: {e.message}"
+                    raise GitHubError(msg)
+
+                msg = f"Unexpected error: {e.message}"
+                raise GitHubError(msg)

arthur/exts/github/management.py

@@ -4,7 +4,7 @@
 
 from discord.ext.commands import Cog, Context, group
 
-from arthur.apis.github import GitHubError, add_staff_member, remove_org_member
+from arthur.apis.github import GitHubError, add_member_to_team, remove_org_member
 from arthur.config import CONFIG
 
 if TYPE_CHECKING:
@@ -35,7 +35,7 @@ async def github(self, ctx: Context) -> None:
     async def add_team_member(self, ctx: Context, username: str) -> None:
         """Add a user to the default GitHub team."""
         try:
-            await add_staff_member(username)
+            await add_member_to_team(username, CONFIG.github_team)
             await ctx.send(f":white_check_mark: Successfully invited {username} to the staff team.")
         except GitHubError as e:
             await ctx.send(f":x: Failed to add {username} to the staff team: {e}")