diff options
Diffstat (limited to 'rest-api')
| -rw-r--r-- | rest-api/api-docs/bridges.json | 2 | ||||
| -rw-r--r-- | rest-api/api-docs/events.json | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/rest-api/api-docs/bridges.json b/rest-api/api-docs/bridges.json index fd0971a4d..e4a33f8c3 100644 --- a/rest-api/api-docs/bridges.json +++ b/rest-api/api-docs/bridges.json @@ -66,7 +66,7 @@ }, { "httpMethod": "DELETE", - "summary": "Shut down a bridge bridge.", + "summary": "Shut down a bridge.", "notes": "If any channels are in this bridge, they will be removed and resume whatever they were doing beforehand.", "nickname": "deleteBridge", "responseClass": "void", diff --git a/rest-api/api-docs/events.json b/rest-api/api-docs/events.json index 0e0a822cf..c5f38862f 100644 --- a/rest-api/api-docs/events.json +++ b/rest-api/api-docs/events.json @@ -56,6 +56,7 @@ "application_replaced": { "type": "ApplicationReplaced" }, "bridge_created": { "type": "BridgeCreated" }, "bridge_destroyed": { "type": "BridgeDestroyed" }, + "bridge_merged": { "type": "BridgeMerged" }, "channel_created": { "type": "ChannelCreated" }, "channel_destroyed": { "type": "ChannelDestroyed" }, "channel_snapshot": { "type": "ChannelSnapshot" }, @@ -127,6 +128,20 @@ } } }, + "BridgeMerged": { + "id": "BridgeMerged", + "description": "Notification that one bridge has merged into another.", + "properties": { + "bridge": { + "required": true, + "type": "Bridge" + }, + "bridge_from": { + "required": true, + "type": "Bridge" + } + } + }, "ChannelCreated": { "id": "ChannelCreated", "description": "Notification that a channel has been created.", |