tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

apidocs: mtime_age > last_active_ago. Presence REST: Sanity check values in invite/drop arrays.

Browse source
This commit is contained in:
Kegan Dougal 2014-09-03 12:09:11 +01:00
parent b50ea730b1
commit dfea1730dc
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/client-server/swagger_matrix/api-docs-presence
View file

@ -128,10 +128,10 @@
"Presence": { "Presence": {
"id": "Presence", "id": "Presence",
"properties": { "properties": {
"mtime_age": { "last_active_ago": {
"type": "integer", "type": "integer",
"format": "int64", "format": "int64",
"description": "The last time this user's presence state changed, in milliseconds." "description": "The last time this user performed an action on their home server."
}, },
"user_id": { "user_id": {
"type": "string", "type": "string",

8
synapse/rest/presence.py
View file

@ -125,12 +125,20 @@ class PresenceListRestServlet(RestServlet):
if "invite" in content: if "invite" in content:
for u in content["invite"]: for u in content["invite"]:
if not isinstance(u, basestring):
raise SynapseError(400, "Bad invite value.")
if len(u) == 0:
continue
invited_user = self.hs.parse_userid(u) invited_user = self.hs.parse_userid(u)
deferreds.append(self.handlers.presence_handler.send_invite( deferreds.append(self.handlers.presence_handler.send_invite(
observer_user=user, observed_user=invited_user)) observer_user=user, observed_user=invited_user))
if "drop" in content: if "drop" in content:
for u in content["drop"]: for u in content["drop"]:
if not isinstance(u, basestring):
raise SynapseError(400, "Bad drop value.")
if len(u) == 0:
continue
dropped_user = self.hs.parse_userid(u) dropped_user = self.hs.parse_userid(u)
deferreds.append(self.handlers.presence_handler.drop( deferreds.append(self.handlers.presence_handler.drop(
observer_user=user, observed_user=dropped_user)) observer_user=user, observed_user=dropped_user))