diff options
author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2019-02-26 14:39:39 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-26 14:39:39 +0000 |
commit | 4dc945ba300a24cdfcaeb5369e1844e9396b7dec (patch) | |
tree | 6767e6e142d75e5500092a829d488583fcedef51 /synapse/federation/transport | |
parent | Merge pull request #4745 from matrix-org/revert-4736-anoa/public_rooms_federate (diff) | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into anoa/public_room... (diff) | |
download | synapse-4dc945ba300a24cdfcaeb5369e1844e9396b7dec.tar.xz |
Merge pull request #4746 from matrix-org/anoa/public_rooms_federate_develop
Prevent showing non-fed rooms in fed /publicRooms v2
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r-- | synapse/federation/transport/server.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index a2396ab466..5ba94be2ec 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -736,7 +736,8 @@ class PublicRoomList(BaseFederationServlet): data = yield self.handler.get_local_public_room_list( limit, since_token, - network_tuple=network_tuple + network_tuple=network_tuple, + from_federation=True, ) defer.returnValue((200, data)) |