summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-01-06 17:28:55 +0000
committerDavid Baker <dave@matrix.org>2016-01-06 17:28:55 +0000
commit442fcc02f70fd0ae0034fc15c79b9e521c3d0143 (patch)
tree9d20a280a761ac50f227ebb8e4b8c74d354bb8df /synapse/api
parentAdding is_guest here won't work because it just constructs a dict of uid -> p... (diff)
parentMerge pull request #469 from matrix-org/markjh/joined_guest_access (diff)
downloadsynapse-442fcc02f70fd0ae0034fc15c79b9e521c3d0143.tar.xz
Merge remote-tracking branch 'origin/develop' into store_event_actions
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/errors.py16
-rw-r--r--synapse/api/filtering.py12
2 files changed, 0 insertions, 28 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index 8bc7b9e6db..d4037b3d55 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -120,22 +120,6 @@ class AuthError(SynapseError):
         super(AuthError, self).__init__(*args, **kwargs)
 
 
-class GuestAccessError(AuthError):
-    """An error raised when a there is a problem with a guest user accessing
-    a room"""
-
-    def __init__(self, rooms, *args, **kwargs):
-        self.rooms = rooms
-        super(GuestAccessError, self).__init__(*args, **kwargs)
-
-    def error_dict(self):
-        return cs_error(
-            self.msg,
-            self.errcode,
-            rooms=self.rooms,
-        )
-
-
 class EventSizeError(SynapseError):
     """An error raised when an event is too big."""
 
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 5287aaa757..4390d01e38 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -149,9 +149,6 @@ class FilterCollection(object):
             "include_leave", False
         )
 
-    def list_rooms(self):
-        return self.room_filter.list_rooms()
-
     def timeline_limit(self):
         return self.room_timeline_filter.limit()
 
@@ -184,15 +181,6 @@ class Filter(object):
     def __init__(self, filter_json):
         self.filter_json = filter_json
 
-    def list_rooms(self):
-        """The list of room_id strings this filter restricts the output to
-        or None if the this filter doesn't list the room ids.
-        """
-        if "rooms" in self.filter_json:
-            return list(set(self.filter_json["rooms"]))
-        else:
-            return None
-
     def check(self, event):
         """Checks whether the filter matches the given event.