Strip mention system down to core functionality

Author: joshuadavidthomas

src/django_github_app/mentions.py

@@ -10,8 +10,6 @@
 from django.utils import timezone
 from gidgethub import sansio
 
-from .permissions import Permission
-
 
 class EventAction(NamedTuple):
     event: str
@@ -121,7 +119,6 @@ def from_event(cls, event: sansio.Event) -> Comment:
 class MentionContext:
     comment: Comment
     triggered_by: Mention
-    user_permission: Permission
     scope: MentionScope | None
 
 
@@ -169,7 +166,10 @@ def check_pattern_match(
 def parse_mentions_for_username(
     event: sansio.Event, username_pattern: str | re.Pattern[str] | None = None
 ) -> list[Mention]:
-    body = event.data.get("comment", {}).get("body", "")
+    comment = event.data.get("comment", {})
+    if comment is None:
+        comment = {}
+    body = comment.get("body", "")
 
     if not body:
         return []

src/django_github_app/permissions.py

@@ -23,9 +23,6 @@
 from .mentions import check_pattern_match
 from .mentions import get_event_scope
 from .mentions import parse_mentions_for_username
-from .permissions import Permission
-from .permissions import aget_user_permission_from_event
-from .permissions import get_user_permission_from_event
 
 AsyncCallback = Callable[..., Awaitable[None]]
 SyncCallback = Callable[..., None]
@@ -80,11 +77,9 @@ def decorator(func: CB) -> CB:
 
     def mention(self, **kwargs: Any) -> Callable[[CB], CB]:
         def decorator(func: CB) -> CB:
-            # Support both old 'command' and new 'pattern' parameters
-            pattern = kwargs.pop("pattern", kwargs.pop("command", None))
+            pattern = kwargs.pop("pattern", None)
             username = kwargs.pop("username", None)
             scope = kwargs.pop("scope", None)
-            permission = kwargs.pop("permission", None)
 
             @wraps(func)
             async def async_wrapper(
@@ -98,14 +93,6 @@ async def async_wrapper(
                 if not mentions:
                     return
 
-                if permission is not None:
-                    user_permission = await aget_user_permission_from_event(event, gh)
-                    required_perm = Permission[permission.upper()]
-                    if user_permission < required_perm:
-                        return
-                else:
-                    user_permission = Permission.NONE
-
                 comment = Comment.from_event(event)
                 comment.mentions = mentions
 
@@ -119,7 +106,6 @@ async def async_wrapper(
                     kwargs["mention"] = MentionContext(
                         comment=comment,
                         triggered_by=mention,
-                        user_permission=user_permission,
                         scope=event_scope,
                     )
 
@@ -137,14 +123,6 @@ def sync_wrapper(
                 if not mentions:
                     return
 
-                if permission is not None:
-                    user_permission = get_user_permission_from_event(event, gh)
-                    required_perm = Permission[permission.upper()]
-                    if user_permission < required_perm:
-                        return
-                else:
-                    user_permission = Permission.NONE
-
                 comment = Comment.from_event(event)
                 comment.mentions = mentions
 
@@ -158,7 +136,6 @@ def sync_wrapper(
                     kwargs["mention"] = MentionContext(
                         comment=comment,
                         triggered_by=mention,
-                        user_permission=user_permission,
                         scope=event_scope,
                     )
 
@@ -171,7 +148,6 @@ def sync_wrapper(
                 wrapper = cast(SyncMentionHandler, sync_wrapper)
 
             wrapper._mention_pattern = pattern
-            wrapper._mention_permission = permission
             wrapper._mention_scope = scope
             wrapper._mention_username = username
 

src/django_github_app/routing.py

@@ -130,7 +130,7 @@ def repository_id():
 
 @pytest.fixture
 def get_mock_github_api():
-    def _get_mock_github_api(return_data):
+    def _get_mock_github_api(return_data, installation_id=12345):
         mock_api = AsyncMock(spec=AsyncGitHubAPI)
 
         async def mock_getitem(*args, **kwargs):
@@ -144,6 +144,7 @@ async def mock_getiter(*args, **kwargs):
         mock_api.getiter = mock_getiter
         mock_api.__aenter__.return_value = mock_api
         mock_api.__aexit__.return_value = None
+        mock_api.installation_id = installation_id
 
         return mock_api
 
@@ -152,7 +153,7 @@ async def mock_getiter(*args, **kwargs):
 
 @pytest.fixture
 def get_mock_github_api_sync():
-    def _get_mock_github_api_sync(return_data):
+    def _get_mock_github_api_sync(return_data, installation_id=12345):
         from django_github_app.github import SyncGitHubAPI
 
         mock_api = MagicMock(spec=SyncGitHubAPI)
@@ -169,6 +170,7 @@ def mock_post(*args, **kwargs):
         mock_api.getitem = mock_getitem
         mock_api.getiter = mock_getiter
         mock_api.post = mock_post
+        mock_api.installation_id = installation_id
 
         return mock_api