Fix membership event handling

Author: tulir

mautrix/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.4.0rc4"
+__version__ = "0.4.0rc5"
 __author__ = "Tulir Asokan <[email protected]>"
 __all__ = ["api", "appservice", "bridge", "client", "errors", "util", "types"]

mautrix/bridge/matrix.py

@@ -107,14 +107,14 @@ async def handle_kick(self, room_id: RoomID, user_id: UserID, kicked_by: UserID,
                           event_id: EventID) -> None:
         pass
 
-    async def handle_raw_leave(self, room_id: RoomID, user_id: UserID, sender: UserID, reason: str,
-                               event_id: EventID) -> None:
-        pass
-
     async def handle_ban(self, room_id: RoomID, user_id: UserID, banned_by: UserID, reason: str,
                          event_id: EventID) -> None:
         pass
 
+    async def handle_unban(self, room_id: RoomID, user_id: UserID, unbanned_by: UserID,
+                           reason: str, event_id: EventID) -> None:
+        pass
+
     async def handle_join(self, room_id: RoomID, user_id: UserID, event_id: EventID) -> None:
         pass
 
@@ -128,10 +128,18 @@ async def handle_puppet_invite(self, room_id: RoomID, puppet: 'BasePuppet',
                                    invited_by: 'BaseUser', event_id: EventID) -> None:
         pass
 
-    async def handle_invite(self, room_id: RoomID, user_id: UserID, invited_by: 'BaseUser',
+    async def handle_invite(self, room_id: RoomID, user_id: UserID, invited_by: UserID,
                             event_id: EventID) -> None:
         pass
 
+    async def handle_reject(self, room_id: RoomID, user_id: UserID, reason: str, event_id: EventID
+                            ) -> None:
+        pass
+
+    async def handle_disinvite(self, room_id: RoomID, user_id: UserID, disinvited_by: UserID,
+                               reason: str, event_id: EventID) -> None:
+        pass
+
     async def handle_event(self, evt: Event) -> None:
         """Called by :meth:`int_handle_event` for message events other than m.room.message."""
 
@@ -280,13 +288,21 @@ async def int_handle_event(self, evt: Event) -> None:
                 await self.int_handle_invite(evt.room_id, UserID(evt.state_key), evt.sender,
                                              evt.event_id)
             elif evt.content.membership == Membership.LEAVE:
-                await self.handle_raw_leave(evt.room_id, UserID(evt.state_key), evt.sender,
+                if prev_membership == Membership.BAN:
+                    await self.handle_unban(evt.room_id, UserID(evt.state_key), evt.sender,
                                             evt.content.reason, evt.event_id)
-                if evt.sender != evt.state_key:
+                elif prev_membership == Membership.INVITE:
+                    if evt.sender == evt.state_key:
+                        await self.handle_reject(evt.room_id, UserID(evt.state_key),
+                                                 evt.content.reason, evt.event_id)
+                    else:
+                        await self.handle_disinvite(evt.room_id, UserID(evt.state_key), evt.sender,
+                                                    evt.content.reason, evt.event_id)
+                elif evt.sender == evt.state_key:
+                    await self.handle_leave(evt.room_id, UserID(evt.state_key), evt.event_id)
+                else:
                     await self.handle_kick(evt.room_id, UserID(evt.state_key), evt.sender,
                                            evt.content.reason, evt.event_id)
-                else:
-                    await self.handle_leave(evt.room_id, UserID(evt.state_key), evt.event_id)
             elif evt.content.membership == Membership.BAN:
                 await self.handle_ban(evt.room_id, UserID(evt.state_key), evt.sender,
                                       evt.content.reason, evt.event_id)

mautrix/client/client.py

@@ -44,6 +44,7 @@ class InternalEventType(Enum):
     JOIN = auto()
     PROFILE_CHANGE = auto()
     INVITE = auto()
+    REJECT_INVITE = auto()
     DISINVITE = auto()
     LEAVE = auto()
     KICK = auto()

mautrix/client/dispatcher.py

@@ -48,12 +48,15 @@ async def handle(self, evt: StateEvent) -> None:
         elif evt.content.membership == Membership.INVITE:
             self._dispatch(InternalEventType.INVITE, evt)
         elif evt.content.membership == Membership.LEAVE:
-            if evt.state_key == evt.sender:
-                self._dispatch(InternalEventType.LEAVE, evt)
-            elif evt.prev_content.membership == Membership.BAN:
+            if evt.prev_content.membership == Membership.BAN:
                 self._dispatch(InternalEventType.UNBAN, evt)
             elif evt.prev_content.membership == Membership.INVITE:
-                self._dispatch(InternalEventType.DISINVITE, evt)
+                if evt.state_key == evt.sender:
+                    self._dispatch(InternalEventType.REJECT_INVITE, evt)
+                else:
+                    self._dispatch(InternalEventType.DISINVITE, evt)
+            elif evt.state_key == evt.sender:
+                self._dispatch(InternalEventType.LEAVE, evt)
             else:
                 self._dispatch(InternalEventType.KICK, evt)
         elif evt.content.membership == Membership.BAN: