handleslack: ignore messages with unknown type and hidden flag

mautrix · Jul 22, 2024 · c7db926 · c7db926
1 parent b7f07ff
commit c7db926
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/connector/handleslack.go b/pkg/connector/handleslack.go
@@ -123,7 +123,8 @@ func (s *SlackClient) wrapEvent(ctx context.Context, rawEvt any) (bridgev2.Remot
 				Str("message_ts", evt.Timestamp).
 				Str("message_id", string(meta.ID)).
 				Str("message_sender", sender).
-				Str("subtype", evt.SubType)
+				Str("subtype", evt.SubType).
+				Bool("hidden", evt.Hidden)
 		}
 		wrapped = &SlackMessage{
 			SlackEventMeta: &meta,
@@ -458,7 +459,14 @@ func (s *SlackMessage) GetType() bridgev2.RemoteEventType {
 	case slack.MsgSubTypeMessageReplied, slack.MsgSubTypeGroupJoin, slack.MsgSubTypeGroupLeave,
 		slack.MsgSubTypeChannelJoin, slack.MsgSubTypeChannelLeave:
 		return bridgev2.RemoteEventUnknown
+	case "", slack.MsgSubTypeMeMessage, slack.MsgSubTypeBotMessage, slack.MsgSubTypeThreadBroadcast, "huddle_thread":
+		// Known types
+		return bridgev2.RemoteEventMessage
 	default:
+		// For unknown types with the hidden flag, don't bridge
+		if s.Data.Hidden {
+			return bridgev2.RemoteEventUnknown
+		}
 		return bridgev2.RemoteEventMessage
 	}
 }