Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More state management for portals

Browse Source
This commit is contained in:
Gary Kramlich
2022-01-31 05:36:08 -06:00
parent c1bb55d3cf
commit 6607e773a6
3 changed files with 136 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bridge/matrix.go
View File

@@ -199,11 +199,11 @@ func (mh *matrixHandler) handleMembership(evt *event.Event) {
return
}
puppet := mh.bridge.GetPuppetByMXID(id.UserID(evt.GetStateKey()))
// Load or create a new portal.
portal := mh.bridge.GetPortalByMXID(evt.RoomID)
if portal == nil {
puppet := mh.bridge.GetPuppetByMXID(id.UserID(evt.GetStateKey()))
if content.Membership == event.MembershipInvite && puppet != nil {
mh.handlePuppetInvite(evt, user, puppet)
}
@@ -213,7 +213,20 @@ func (mh *matrixHandler) handleMembership(evt *event.Event) {
isSelf := id.UserID(evt.GetStateKey()) == evt.Sender
if content.Membership == event.MembershipInvite && !isSelf {
portal.HandleMatrixInvite(user, evt)
if content.Membership == event.MembershipLeave {
if evt.Unsigned.PrevContent != nil {
_ = evt.Unsigned.PrevContent.ParseRaw(evt.Type)
prevContent, ok := evt.Unsigned.PrevContent.Parsed.(*event.MemberEventContent)
if ok && prevContent.Membership != "join" {
return
}
}
if isSelf {
portal.handleMatrixLeave(user)
} else if puppet != nil {
portal.handleMatrixKick(user, puppet)
}
} else if content.Membership == event.MembershipInvite && !isSelf {
portal.handleMatrixInvite(user, evt)
}
}