archive
/
matrix-spec
mirror of https://github.com/matrix-org/matrix-spec
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Swaggerify push notification API

Browse Source 
Edit units.py to support nested JSON request keys
pull/977/head
Kegan Dougal 9 years ago
parent a9618a981b
commit 31ae4b3859
5 changed files with 218 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
api/check_examples.py
Unescape Escape View File

@ -51,7 +51,7 @@ def check_parameter(filepath, request, parameter):
schema['id'] = fileurl schema['id'] = fileurl
jsonschema.validate(example, schema) jsonschema.validate(example, schema)
except Exception as e: except Exception as e:
raise ValueError("Error validating JSON schema for %r %r" % ( raise ValueError("Error validating JSON schema for %r" % (
request request
), e) ), e)

194
api/client-server/v1/push_notifier.yaml
Unescape Escape View File

@ -0,0 +1,194 @@
swagger: '2.0'
info:
title: "Matrix Push Notification API"
version: "1.0.0"
host: localhost:8008
schemes:
- https
- http
basePath: /_matrix/push/v1
consumes:
- application/json
produces:
- application/json
paths:
"/notify":
post:
summary: Notify a push gateway about an event.
description: |-
This endpoint is invoked by HTTP pushers to notify a push gateway about
an event.
*NB: Notifications are send to the URL configured when the pusher is
created. This means that the HTTP path may be different depending on the
push gateway.*
parameters:
- in: body
name: notification
description: Information about the push notification.
required: true
schema:
type: object
example: |-
{
"notification": {
"id": "$3957tyerfgewrf384",
"room_id": "!slw48wfj34rtnrf:example.com",
"type": "m.room.message",
"sender": "@exampleuser:matrix.org",
"sender_display_name": "Major Tom",
"room_name": "Mission Control",
"room_alias": "#exampleroom:matrix.org",
"prio": "high",
"content": {
"msgtype": "m.text",
"body": "I'm floating in a most peculiar way."
}
},
"counts": {
"unread" : 2,
"missed_calls": 1
},
"devices": [
{
"app_id": "org.matrix.matrixConsole.ios",
"pushkey": "V2h5IG9uIGVhcnRoIGRpZCB5b3UgZGVjb2RlIHRoaXM/",
"pushkey_ts": 12345678,
"data" : {},
"tweaks": {
"sound": "bing"
}
}
]
}
required: ["notification", "counts", "devices"]
properties:
notification:
type: object
description: Information about the push notification
required: ["id", "room_id", "type", "sender"]
properties:
id:
type: string
description: |-
An identifier for this notification that may be used to
detect duplicate notification requests. This is not
necessarily the ID of the event that triggered the
notification.
room_id:
type: string
description: The ID of the room in which this event occurred.
type:
type: string
description: The type of the event as in the event's ``type`` field.
sender:
type: string
description: The sender of the event as in the corresponding event field.
sender_display_name:
type: string
description: |-
The current display name of the sender in the room in which
the event occurred.
room_name:
type: string
description: The name of the room in which the event occurred.
room_alias:
type: string
description: An alias to display for the room in which the event occurred.
prio:
type: string
enum: ["high", "low"]
description: |-
The priority of the notification. If omitted, ``high`` is
assumed. This may be used by push gateways to deliver less
time-sensitive notifications in a way that will preserve
battery power on mobile devices.
content:
type: object
title: EventContent
properties:
body:
type: string
description: Message text
description: |-
The ``content`` field from the event, if present. If the
event had no content field, this field is omitted.
counts:
type: object
description: |-
This is a dictionary of the current number of unacknowledged
communications for the recipient user. Counts whose value is
zero are omitted.
properties:
unread:
type: integer
description: |-
The number of unread messages a user has across all of the
rooms they are a member of.
missed_calls:
type: integer
description: |-
The number of unacknowledged missed calls a user has
across all rooms of which they are a member.
devices:
type: array
title: Devices
description: |-
This is an array of devices that the notification should be sent to.
items:
type: object
properties:
app_id:
type: string
description: |-
The app_id given when the pusher was created.
pushkey:
type: string
description: The pushkey given when the pusher was created.
pushkey_ts:
type: integer
description: |-
The unix timestamp (in seconds) when the
pushkey was last updated.
data:
type: object
description: |-
A dictionary of additional pusher-specific data. For
'http' pushers, this is the data dictionary passed in at
pusher creation minus the ``url`` key.
tweaks:
type: object
description: |-
A dictionary of customisations made to the way this
notification is to be presented. These are added by push rules.
properties:
sound:
type: string
description: |-
Sets the sound file that should be played.
``default`` means that a default sound should be played.
responses:
200:
description: A list of rejected push keys.
examples:
application/json: |-
{
"rejected": [ "V2h5IG9uIGVhcnRoIGRpZCB5b3UgZGVjb2RlIHRoaXM/" ]
}
schema:
type: object # empty json object
properties:
rejected:
type: array
description: |-
A list of all pushkeys given in the notification request that
are not valid. These could have been rejected by an upstream
gateway because they have expired or have never been valid.
Homeservers must cease sending notification requests for these
pushkeys and remove the associated pushers. It may not
necessarily be the notification in the request that failed:
it could be that a previous notification to the same pushkey
failed.
items:
type: string
description: A pushkey

7
specification/modules/push.rst
Unescape Escape View File

@ -395,12 +395,13 @@ sender and content rules)::
Server behaviour Server behaviour
---------------- ----------------
HTTP Notification Protocol
~~~~~~~~~~~~~~~~~~~~~~~~~~
This describes the format used by "HTTP" pushers to send notifications of This describes the format used by "HTTP" pushers to send notifications of
events. events.
{{push_notifier_http_api}}
Notifications are sent as HTTP POST requests to the URL configured when the Notifications are sent as HTTP POST requests to the URL configured when the
pusher is created, but Matrix strongly recommends that the path should be:: pusher is created, but Matrix strongly recommends that the path should be::

10
templating/matrix_templates/templates/http-api.tmpl
Unescape Escape View File

@ -13,17 +13,17 @@
Request format: Request format:
====================== ================= =========================================== =================================== ================= ===========================================
Parameter Value Description Parameter Value Description
====================== ================= =========================================== =================================== ================= ===========================================
{% for loc in endpoint.req_param_by_loc -%} {% for loc in endpoint.req_param_by_loc -%}
*{{loc}} parameters* *{{loc}} parameters*
------------------------------------------------------------------------------------ -------------------------------------------------------------------------------------------------
{% for param in endpoint.req_param_by_loc[loc] -%} {% for param in endpoint.req_param_by_loc[loc] -%}
{{param.key}}{{param.type|indent(23-param.key|length)}}{{param.desc|indent(18-param.type|length)|wrap(43)|indent_block(41)}} {{param.key}}{{param.type|indent(36-param.key|length)}}{{param.desc|indent(18-param.type|length)|wrap(43)|indent_block(54)}}
{% endfor -%} {% endfor -%}
{% endfor -%} {% endfor -%}
====================== ================= =========================================== =================================== ================= ===========================================
{% if endpoint.res_tables|length > 0 -%} {% if endpoint.res_tables|length > 0 -%}
Response format: Response format:

13
templating/matrix_templates/units.py
Unescape Escape View File

@ -228,6 +228,19 @@ class MatrixUnits(Units):
"type": json_body[key]["type"], "type": json_body[key]["type"],
"desc": pdesc "desc": pdesc
}) })
if json_body[key]["type"] in ["object"]:
req_tables = get_json_schema_object_fields(
json_body[key]
)
for table in req_tables:
for row in table["rows"]:
endpoint["req_params"].append({
"key": key + "." + row["key"],
"loc": "JSON body",
"type": row["type"],
"desc": row["req_str"] + row["desc"]
})
# endfor[param] # endfor[param]
for row in endpoint["req_params"]: for row in endpoint["req_params"]:
self.log("Request parameter: %s" % row) self.log("Request parameter: %s" % row)

Write Preview
Loading…
Cancel
Save