summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2016-02-12 15:11:49 +0000
committerreview.rocks <nobody@review.rocks>2016-02-12 15:11:49 +0000
commitcf81375b94c4763766440471e632fc4b103450ab (patch)
tree00826864651550411f164dcb510cd1f7d6e5b6de /synapse/api/errors.py
parentMerge pull request #574 from matrix-org/markjh/connection_closed (diff)
downloadsynapse-cf81375b94c4763766440471e632fc4b103450ab.tar.xz
Merge two of the room join codepaths
There's at least one more to merge in.

Side-effects:
 * Stop reporting None as displayname and avatar_url in some cases
 * Joining a room by alias populates guest-ness in join event
 * Remove unspec'd PUT version of /join/<room_id_or_alias> which has not
   been called on matrix.org according to logs
 * Stop recording access_token_id on /join/room_id - currently we don't
   record it on /join/room_alias; I can try to thread it through at some
   point.
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r--synapse/api/errors.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index b106fbed6d..0c7858f78d 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -84,6 +84,11 @@ class RegistrationError(SynapseError):
     pass
 
 
+class BadIdentifierError(SynapseError):
+    """An error indicating an identifier couldn't be parsed."""
+    pass
+
+
 class UnrecognizedRequestError(SynapseError):
     """An error indicating we don't understand the request you're trying to make"""
     def __init__(self, *args, **kwargs):