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

Don't fail if parent portal doesn't exist yet

Browse Source
This commit is contained in:
Tulir Asokan
2022-05-29 11:32:19 +03:00
parent 49b5f77a03
commit 0366578ab4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
portal.go
View File

@@ -1428,6 +1428,9 @@ func (portal *Portal) addToSpace(mxid id.RoomID) bool {
return false return false
} }
portal.removeFromSpace() portal.removeFromSpace()
if mxid == "" {
return true
}
_, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, mxid.String(), &event.SpaceParentEventContent{ _, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, mxid.String(), &event.SpaceParentEventContent{
Via: []string{portal.bridge.AS.HomeserverDomain}, Via: []string{portal.bridge.AS.HomeserverDomain},
@@ -1455,7 +1458,7 @@ func (portal *Portal) UpdateParent(parentID string) bool {
} }
portal.ParentID = parentID portal.ParentID = parentID
if portal.ParentID != "" { if portal.ParentID != "" {
portal.Parent = portal.bridge.GetExistingPortalByID(database.NewPortalKey(parentID, "")) portal.Parent = portal.bridge.GetPortalByID(database.NewPortalKey(parentID, ""), discordgo.ChannelTypeGuildCategory)
} else { } else {
portal.Parent = nil portal.Parent = nil
} }