aboutsummaryrefslogtreecommitdiff
path: root/userapi/consumers/roomserver.go
diff options
context:
space:
mode:
authorTill <2353100+S7evinK@users.noreply.github.com>2023-10-24 11:51:08 +0200
committerGitHub <noreply@github.com>2023-10-24 11:51:08 +0200
commit1b124fe9cba8b4699a1f65382e4ea1a5674d12fa (patch)
tree3664bfc6b505cc5f8394b760e8d0d06ccfcf0250 /userapi/consumers/roomserver.go
parentc1d6b9aa8ef29a76b61b1aaf60572d3493adf306 (diff)
Implement MSC3987, fix setting Element Android notifications (#3242)
Should fix https://github.com/matrix-org/dendrite/issues/3183, since Element Android already implements [MSC3987](https://github.com/vector-im/element-android/pull/8530) This is also part of https://github.com/matrix-org/dendrite/issues/3225
Diffstat (limited to 'userapi/consumers/roomserver.go')
-rw-r--r--userapi/consumers/roomserver.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/userapi/consumers/roomserver.go b/userapi/consumers/roomserver.go
index 6da41f8a..fca74129 100644
--- a/userapi/consumers/roomserver.go
+++ b/userapi/consumers/roomserver.go
@@ -538,8 +538,8 @@ func (s *OutputRoomEventConsumer) notifyLocal(ctx context.Context, event *rstype
if err != nil {
return fmt.Errorf("pushrules.ActionsToTweaks: %w", err)
}
- // TODO: support coalescing.
- if a != pushrules.NotifyAction && a != pushrules.CoalesceAction {
+
+ if a != pushrules.NotifyAction {
log.WithFields(log.Fields{
"event_id": event.EventID(),
"room_id": event.RoomID().String(),