From b4bdab8e52e3a236aa5869956e1f35740250f445 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Tue, 29 Jun 2021 16:13:09 +0100
Subject: [PATCH] Revert "Don't send catchup transactions for matrix hq"

This reverts commits 5575b5cb43125d334f510027f6a3482d0b15bd4c,
f271b32beaf5515eb798708f4a205f768260d8c2,
ffe17e47cef75fe3d2a5f4c3fbf9c65f6caee1a8
---
 synapse/federation/sender/per_destination_queue.py | 7 -------
 synapse/storage/databases/main/transactions.py     | 1 -
 2 files changed, 8 deletions(-)

diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py
index a44cc781c8..3a2efd56ee 100644
--- a/synapse/federation/sender/per_destination_queue.py
+++ b/synapse/federation/sender/per_destination_queue.py
@@ -287,13 +287,6 @@ class PerDestinationQueue:
                             len(pending_pdus),
                         )
 
-                        # Filter out HQ traffic for now
-                        pending_pdus = [
-                            pdu
-                            for pdu in pending_pdus
-                            if pdu.room_id != "!OGEhHVWSdvArJzumhm:matrix.org"
-                        ]
-
                     await self._transaction_manager.send_new_transaction(
                         self._destination, pending_pdus, pending_edus
                     )
diff --git a/synapse/storage/databases/main/transactions.py b/synapse/storage/databases/main/transactions.py
index b3250084c5..d211c423b2 100644
--- a/synapse/storage/databases/main/transactions.py
+++ b/synapse/storage/databases/main/transactions.py
@@ -411,7 +411,6 @@ class TransactionWorkerStore(CacheInvalidationWorkerStore):
                  JOIN events USING (stream_ordering)
                 WHERE destination = ?
                   AND stream_ordering > ?
-                  AND destination_rooms.room_id != '!OGEhHVWSdvArJzumhm:matrix.org'
                 ORDER BY stream_ordering
                 LIMIT 50
             """