From 0366578ab44c13965c4643c6604c92673e24c576 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sun, 29 May 2022 11:32:19 +0300 Subject: [PATCH] Don't fail if parent portal doesn't exist yet --- portal.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/portal.go b/portal.go index 3fa8258..6de6287 100644 --- a/portal.go +++ b/portal.go @@ -1428,6 +1428,9 @@ func (portal *Portal) addToSpace(mxid id.RoomID) bool { return false } portal.removeFromSpace() + if mxid == "" { + return true + } _, err := portal.MainIntent().SendStateEvent(portal.MXID, event.StateSpaceParent, mxid.String(), &event.SpaceParentEventContent{ Via: []string{portal.bridge.AS.HomeserverDomain}, @@ -1455,7 +1458,7 @@ func (portal *Portal) UpdateParent(parentID string) bool { } portal.ParentID = parentID if portal.ParentID != "" { - portal.Parent = portal.bridge.GetExistingPortalByID(database.NewPortalKey(parentID, "")) + portal.Parent = portal.bridge.GetPortalByID(database.NewPortalKey(parentID, ""), discordgo.ChannelTypeGuildCategory) } else { portal.Parent = nil }