summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorValentin Anger <valentin.an.1999@gmail.com>2019-02-08 21:09:56 +0000
committerRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-02-08 21:09:56 +0000
commit2dc2b6e9f1b85163c8ebf4d9062253a54d531f1e (patch)
tree845b6487c2ec7796773d340b1500ab4b3697ae5c /synapse/rest
parentFix 'no unique or exclusion constraint' error (#4591) (diff)
downloadsynapse-2dc2b6e9f1b85163c8ebf4d9062253a54d531f1e.tar.xz
Allow "unavailable" presence status for /sync (#4592)
* Allow "unavailable" presence status for /sync

Closes #3772, closes #3779

Signed-off-by: Valentin Anger <valentin.an.1999@gmail.com>

* Add changelog for PR 4592
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/sync.py2
-rw-r--r--synapse/rest/client/versions.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py
index 0251146722..39d157a44b 100644
--- a/synapse/rest/client/v2_alpha/sync.py
+++ b/synapse/rest/client/v2_alpha/sync.py
@@ -75,7 +75,7 @@ class SyncRestServlet(RestServlet):
     """
 
     PATTERNS = client_v2_patterns("/sync$")
-    ALLOWED_PRESENCE = set(["online", "offline"])
+    ALLOWED_PRESENCE = set(["online", "offline", "unavailable"])
 
     def __init__(self, hs):
         super(SyncRestServlet, self).__init__()
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 29e62bfcdd..27e7cbf3cc 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -38,6 +38,7 @@ class VersionsRestServlet(RestServlet):
                 "r0.1.0",
                 "r0.2.0",
                 "r0.3.0",
+                "r0.4.0",
             ],
             # as per MSC1497:
             "unstable_features": {