From 11efa4996186656dee186ba519d1f6893873ab5f Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 9 Jul 2022 17:10:47 +0300 Subject: [PATCH] Fix some bugs --- portal.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/portal.go b/portal.go index 341e3cd..b12f5b1 100644 --- a/portal.go +++ b/portal.go @@ -416,6 +416,13 @@ func (portal *Portal) CreateMatrixRoom(user *User, channel *discordgo.Channel) e portal.Update() portal.log.Infoln("Matrix room created:", portal.MXID) + if portal.Encrypted && portal.IsPrivateChat() { + err = portal.bridge.Bot.EnsureJoined(portal.MXID, appservice.EnsureJoinedParams{BotOverride: portal.MainIntent().Client}) + if err != nil { + portal.log.Errorfln("Failed to ensure bridge bot is joined to private chat portal: %v", err) + } + } + portal.updateSpace(user) portal.ensureUserInvited(user) user.syncChatDoublePuppetDetails(portal, true) @@ -1177,13 +1184,16 @@ func (portal *Portal) HandleMatrixLeave(brSender bridge.User) { sender := brSender.(*User) if portal.IsPrivateChat() && sender.DiscordID == portal.Key.Receiver { portal.log.Debugln("User left private chat portal, cleaning up and deleting...") - portal.Delete() portal.cleanup(false) + portal.RemoveMXID() } else { portal.cleanupIfEmpty() } } +func (portal *Portal) HandleMatrixKick(brSender bridge.User, brTarget bridge.Ghost) {} +func (portal *Portal) HandleMatrixInvite(brSender bridge.User, brTarget bridge.Ghost) {} + func (portal *Portal) leave(sender *User) { if portal.MXID == "" { return