bridgev2/portal: don't try to send disappearing notice before room is created

tulir · tulir · commit 31a68cbcea95 · 2024-10-01T17:27:29.000+03:00
diff --git a/bridgev2/portal.go b/bridgev2/portal.go
@@ -3219,6 +3219,9 @@ func (portal *Portal) UpdateDisappearingSetting(ctx context.Context, setting dat
 			zerolog.Ctx(ctx).Err(err).Msg("Failed to save portal to database after updating disappearing setting")
 		}
 	}
+	if portal.MXID == "" {
+		return true
+	}
 	content := DisappearingMessageNotice(setting.Timer, implicit)
 	if sender == nil {
 		sender = portal.Bridge.Bot

Original file line number	Diff line number	Diff line change
`@@ -3219,6 +3219,9 @@ func (portal *Portal) UpdateDisappearingSetting(ctx context.Context, setting dat`
`3219`	`3219`	`zerolog.Ctx(ctx).Err(err).Msg("Failed to save portal to database after updating disappearing setting")`
`3220`	`3220`	`}`
`3221`	`3221`	`}`
	`3222`	`+ if portal.MXID == "" {`
	`3223`	`+ return true`
	`3224`	`+ }`
`3222`	`3225`	`content := DisappearingMessageNotice(setting.Timer, implicit)`
`3223`	`3226`	`if sender == nil {`
`3224`	`3227`	`sender = portal.Bridge.Bot`