Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for knocks #103

Merged
merged 2 commits into from
Jun 17, 2022
Merged

Add support for knocks #103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7db926b
add support for knocks
maltee1 May 27, 2022
e09d3cd
comments by tulir
maltee1 Jun 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion mautrix/bridge/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,26 @@ async def handle_unban(
async def handle_join(self, room_id: RoomID, user_id: UserID, event_id: EventID) -> None:
pass

async def handle_knock(
self, room_id: RoomID, user_id: UserID, reason: str, event_id: EventID
) -> None:
pass

async def handle_retract_knock(
self, room_id: RoomID, user_id: UserID, reason: str, event_id: EventID
) -> None:
pass

async def handle_reject_knock(
self, room_id: RoomID, user_id: UserID, sender: UserID, reason: str, event_id: EventID
) -> None:
pass

async def handle_accept_knock(
self, room_id: RoomID, user_id: UserID, sender: UserID, reason: str, event_id: EventID
) -> None:
pass

async def handle_member_info_change(
self,
room_id: RoomID,
Expand Down Expand Up @@ -817,7 +837,16 @@ async def int_handle_event(self, evt: Event, send_bridge_checkpoint: bool = True
prev_content = unsigned.prev_content or MemberStateEventContent()
prev_membership = prev_content.membership if prev_content else Membership.JOIN
if evt.content.membership == Membership.INVITE:
await self.int_handle_invite(evt)
if prev_membership == Membership.KNOCK:
await self.handle_accept_knock(
evt.room_id,
UserID(evt.state_key),
evt.sender,
evt.content.reason,
evt.event_id,
)
else:
await self.int_handle_invite(evt)
elif evt.content.membership == Membership.LEAVE:
if prev_membership == Membership.BAN:
await self.handle_unban(
Expand All @@ -840,6 +869,20 @@ async def int_handle_event(self, evt: Event, send_bridge_checkpoint: bool = True
evt.content.reason,
evt.event_id,
)
elif prev_membership == Membership.KNOCK:
if evt.sender == evt.state_key:
await self.handle_retract_knock(
evt.room_id, UserID(evt.state_key), evt.content.reason, evt.event_id
)
else:
await self.handle_reject_knock(
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:
Expand All @@ -865,6 +908,13 @@ async def int_handle_event(self, evt: Event, send_bridge_checkpoint: bool = True
await self.handle_member_info_change(
evt.room_id, UserID(evt.state_key), evt.content, prev_content, evt.event_id
)
elif evt.content.membership == Membership.KNOCK:
await self.handle_knock(
evt.room_id,
UserID(evt.state_key),
evt.content.reason,
evt.event_id,
)
elif evt.type in (EventType.ROOM_MESSAGE, EventType.STICKER):
evt: MessageEvent
if evt.type != EventType.ROOM_MESSAGE:
Expand Down