summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-01-19 11:37:05 +0000
committerErik Johnston <erik@matrix.org>2016-01-19 11:37:05 +0000
commit9a8949f0221b0487e42830c57873bddae40c056a (patch)
treebc6d459a0e5ea88432af7d253daf7e0e46c1f645 /synapse/api/errors.py
parentChange default pushrules back to notifying for all messages. (diff)
parentMerge pull request #502 from matrix-org/erikj/push_notif_perf (diff)
downloadsynapse-9a8949f0221b0487e42830c57873bddae40c056a.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into default_notify
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r--synapse/api/errors.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index be0c58a4ca..b106fbed6d 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -29,6 +29,7 @@ class Codes(object):
     USER_IN_USE = "M_USER_IN_USE"
     ROOM_IN_USE = "M_ROOM_IN_USE"
     BAD_PAGINATION = "M_BAD_PAGINATION"
+    BAD_STATE = "M_BAD_STATE"
     UNKNOWN = "M_UNKNOWN"
     NOT_FOUND = "M_NOT_FOUND"
     MISSING_TOKEN = "M_MISSING_TOKEN"
@@ -42,6 +43,7 @@ class Codes(object):
     EXCLUSIVE = "M_EXCLUSIVE"
     THREEPID_AUTH_FAILED = "M_THREEPID_AUTH_FAILED"
     THREEPID_IN_USE = "THREEPID_IN_USE"
+    INVALID_USERNAME = "M_INVALID_USERNAME"
 
 
 class CodeMessageException(RuntimeError):