From a7095b1bd45d54c57ac3b57104dd5933f9b91e19 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 22 Mar 2023 16:58:53 +0200 Subject: [PATCH] Stop falling back if hungryserv yeet fails --- portal.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/portal.go b/portal.go index d97e251..0f6ac84 100644 --- a/portal.go +++ b/portal.go @@ -1346,10 +1346,10 @@ func (portal *Portal) cleanup(puppetsOnly bool) { intent := portal.MainIntent() if portal.bridge.SpecVersions.UnstableFeatures["com.beeper.room_yeeting"] { err := intent.BeeperDeleteRoom(portal.MXID) - if err == nil || errors.Is(err, mautrix.MNotFound) { - return + if err != nil && !errors.Is(err, mautrix.MNotFound) { + portal.log.Errorfln("Failed to delete %s using hungryserv yeet endpoint: %v", portal.MXID, err) } - portal.log.Warnfln("Failed to delete %s using hungryserv yeet endpoint, falling back to normal behavior: %v", portal.MXID, err) + return } if portal.IsPrivateChat() {