From 766f35554e16ee5462370be714ef29b71745d478 Mon Sep 17 00:00:00 2001 From: Gary Kim Date: Sat, 29 May 2021 17:47:36 -0400 Subject: Fix content body issue for redactions (matrix) (#1496) Signed-off-by: Gary Kim --- bridge/matrix/matrix.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go index 9516a4fa..b50c9d8b 100644 --- a/bridge/matrix/matrix.go +++ b/bridge/matrix/matrix.go @@ -368,13 +368,6 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) { Avatar: b.getAvatarURL(ev.Sender), } - // Text must be a string - if rmsg.Text, ok = ev.Content["body"].(string); !ok { - b.Log.Errorf("Content[body] is not a string: %T\n%#v", - ev.Content["body"], ev.Content) - return - } - // Remove homeserver suffix if configured if b.GetBool("NoHomeServerSuffix") { re := regexp.MustCompile("(.*?):.*") @@ -390,6 +383,13 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) { return } + // Text must be a string + if rmsg.Text, ok = ev.Content["body"].(string); !ok { + b.Log.Errorf("Content[body] is not a string: %T\n%#v", + ev.Content["body"], ev.Content) + return + } + // Do we have a /me action if ev.Content["msgtype"].(string) == "m.emote" { rmsg.Event = config.EventUserAction -- cgit v1.2.3