Merge pull request #5203 from matrix-org/erikj/aggregate_by_sender

Only count aggregations from distinct senders
matrix-org · May 21, 2019 · f4c80d7 · f4c80d7
2 parents 9526aa9 + 9259cd4
commit f4c80d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/5203.feature b/changelog.d/5203.feature
@@ -0,0 +1 @@
+Add experimental support for relations (aka reactions and edits).
diff --git a/synapse/storage/relations.py b/synapse/storage/relations.py
@@ -280,7 +280,7 @@ def get_aggregation_groups_for_event(
             having_clause = ""
 
         sql = """
-            SELECT type, aggregation_key, COUNT(*), MAX(stream_ordering)
+            SELECT type, aggregation_key, COUNT(DISTINCT sender), MAX(stream_ordering)
             FROM event_relations
             INNER JOIN events USING (event_id)
             WHERE {where_clause}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add experimental support for relations (aka reactions and edits).