Merge pull request #2966 from jmacelroy/call-response

Adding cancel to mod_muc_call
This commit is contained in:
Aaron van Meerten 2018-05-14 12:31:58 -05:00 committed by GitHub
commit 1ba564f49c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 7 deletions

View File

@ -9,9 +9,21 @@ local function invite(stanza, url)
module:log("warn", "Implement this lib to trigger external events.") module:log("warn", "Implement this lib to trigger external events.")
end end
-- cancel will perform the trigger for external call cancellation.
-- This trigger is left unimplemented. The implementation is expected
-- to be specific to the deployment.
local function cancel(stanza, url, reason)
module:log(
"warn",
"A module has been configured that triggers external events."
)
module:log("warn", "Implement this lib to trigger external events.")
end
local ext_events = { local ext_events = {
invite = invite invite = invite,
cancel = cancel
} }
return ext_events return ext_events

View File

@ -17,6 +17,13 @@ end
-- Status strings that trigger call events. -- Status strings that trigger call events.
local invited_status = "Invited" local invited_status = "Invited"
local calling_status = "Calling"
local ringing_status = "Ringing"
local busy_status = "Busy"
local rejected_status = "Rejected"
local connected_status = "connected"
-- url_from_room_jid will determine the url for a conference -- url_from_room_jid will determine the url for a conference
-- provided a room jid. It is required that muc domain mapping -- provided a room jid. It is required that muc domain mapping
@ -46,7 +53,12 @@ end
-- ------------------------- -- -------------------------
-- Status | Event Type -- Status | Event Type
-- _________________________ -- _________________________
-- "Invited" | Invite -- "Calling" | INVITE
-- "Invited" | INVITE
-- "Ringing" | CANCEL
-- "Busy" | CANCEL
-- "Rejected" | CANCEL
-- "connected" | CANCEL
module:hook("muc-broadcast-presence", function (event) module:hook("muc-broadcast-presence", function (event)
-- Detect if the presence is for a poltergeist or not. -- Detect if the presence is for a poltergeist or not.
if not if not
@ -57,8 +69,28 @@ module:hook("muc-broadcast-presence", function (event)
return return
end end
if event.stanza:get_child_text("status") == invited_status then local invite = function()
local url = assert(url_from_room_jid(event.stanza.attr.from)) local url = assert(url_from_room_jid(event.stanza.attr.from))
ext_events.invite(event.stanza, url) ext_events.invite(event.stanza, url)
end end
local cancel = function()
local url = assert(url_from_room_jid(event.stanza.attr.from))
local status = event.stanza:get_child_text("status")
ext_events.cancel(event.stanza, url, string.lower(status))
end
local switch = function(status)
case = {
[invited_status] = function() invite() end,
[calling_status] = function() invite() end,
[ringing_status] = function() cancel() end,
[busy_status] = function() cancel() end,
[rejected_status] = function() cancel() end,
[connected_status] = function() cancel() end
}
if case[status] then case[status]() end
end
switch(event.stanza:get_child_text("status"))
end, -101); end, -101);