From ff05e971af40c22bbda8bcfcb8acd0d9d4d47918 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 8 Apr 2021 19:42:12 +0100 Subject: [PATCH] Allow removing an appservice room via just the room ID Room IDs are considered unique across a homeserver, but namely we needed to do this as homeserver admins don't have an appservice ID associated with them, so we couldn't delete via AS ID. --- synapse/storage/databases/main/room.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/synapse/storage/databases/main/room.py b/synapse/storage/databases/main/room.py index 9cbcd53026..460abf546f 100644 --- a/synapse/storage/databases/main/room.py +++ b/synapse/storage/databases/main/room.py @@ -1396,8 +1396,6 @@ class RoomStore(RoomBackgroundUpdateStore, RoomWorkerStore, SearchStore): txn, table="appservice_room_list", keyvalues={ - "appservice_id": appservice_id, - "network_id": network_id, "room_id": room_id, }, )