diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
| commit | f73ea0bda26a51794abedb65cbf4d0a717dee26c (patch) | |
| tree | 64fd41675594a7c71a7f119fb68b5b476f9173fd /synapse/rest/client/v1/presence.py | |
| parent | Only fire user_joined_room on the distributor if the user has actually joined... (diff) | |
| parent | Merge pull request #392 from matrix-org/markjh/client_config (diff) | |
| download | synapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz | |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'synapse/rest/client/v1/presence.py')
| -rw-r--r-- | synapse/rest/client/v1/presence.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py index 6fe5d19a22..e0949fe4bb 100644 --- a/synapse/rest/client/v1/presence.py +++ b/synapse/rest/client/v1/presence.py @@ -19,7 +19,7 @@ from twisted.internet import defer from synapse.api.errors import SynapseError from synapse.types import UserID -from .base import ClientV1RestServlet, client_path_pattern +from .base import ClientV1RestServlet, client_path_patterns import simplejson as json import logging @@ -28,7 +28,7 @@ logger = logging.getLogger(__name__) class PresenceStatusRestServlet(ClientV1RestServlet): - PATTERN = client_path_pattern("/presence/(?P<user_id>[^/]*)/status") + PATTERNS = client_path_patterns("/presence/(?P<user_id>[^/]*)/status") @defer.inlineCallbacks def on_GET(self, request, user_id): @@ -73,7 +73,7 @@ class PresenceStatusRestServlet(ClientV1RestServlet): class PresenceListRestServlet(ClientV1RestServlet): - PATTERN = client_path_pattern("/presence/list/(?P<user_id>[^/]*)") + PATTERNS = client_path_patterns("/presence/list/(?P<user_id>[^/]*)") @defer.inlineCallbacks def on_GET(self, request, user_id): @@ -120,7 +120,7 @@ class PresenceListRestServlet(ClientV1RestServlet): if len(u) == 0: continue invited_user = UserID.from_string(u) - yield self.handlers.presence_handler.send_invite( + yield self.handlers.presence_handler.send_presence_invite( observer_user=user, observed_user=invited_user ) |