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

Graceful handling of missing or empty event.unsigned object. #39

Merged
merged 1 commit into from
Feb 4, 2021
Merged

Graceful handling of missing or empty event.unsigned object. #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions mautrix/bridge/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from mautrix.types import (EventID, RoomID, UserID, Event, EventType, MessageEvent, MessageType,
MessageEventContent, StateEvent, Membership, MemberStateEventContent,
PresenceEvent, TypingEvent, ReceiptEvent, TextMessageEventContent,
EncryptedEvent, ReceiptType, SingleReceiptEventContent)
EncryptedEvent, ReceiptType, SingleReceiptEventContent, StateUnsigned)
from mautrix.errors import IntentError, MatrixError, MForbidden, DecryptionError, SessionNotFound
from mautrix.appservice import AppService
from mautrix.util.logging import TraceLogger
Expand Down Expand Up @@ -405,7 +405,8 @@ async def int_handle_event(self, evt: Event) -> None:

if evt.type == EventType.ROOM_MEMBER:
evt: StateEvent
prev_content = evt.unsigned.prev_content or MemberStateEventContent()
unsigned = evt.unsigned or StateUnsigned()
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.room_id, UserID(evt.state_key), evt.sender,
Expand Down