dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5597 from winsock/mwi_only_enabled 

Only send MWI notifications for enabled voicemail boxes.
This commit is contained in:
FusionPBX 2021-03-12 10:05:07 -07:00 committed by GitHub
parent ea800eefa8 78276cb258
commit b336537da7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi.lua
View File

@ -76,6 +76,7 @@
FROM v_voicemail_messages as m, v_voicemails as v, v_domains as d FROM v_voicemail_messages as m, v_voicemails as v, v_domains as d
WHERE v.voicemail_uuid = m.voicemail_uuid WHERE v.voicemail_uuid = m.voicemail_uuid
AND v.domain_uuid = d.domain_uuid AND v.domain_uuid = d.domain_uuid
AND v.voicemail_enabled = 'true'
GROUP BY v.voicemail_id, v.voicemail_uuid, v.domain_uuid, d.domain_name;]]; GROUP BY v.voicemail_id, v.voicemail_uuid, v.domain_uuid, d.domain_name;]];
if (debug["sql"]) then if (debug["sql"]) then
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n"); freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n");

40
app/scripts/resources/scripts/app/voicemail/resources/scripts/mwi_subscribe.lua
View File

@ -13,18 +13,18 @@ local vm_message_count do
local vm_to_uuid_sql = [[SELECT v.voicemail_uuid local vm_to_uuid_sql = [[SELECT v.voicemail_uuid
FROM v_voicemails as v inner join v_domains as d on v.domain_uuid = d.domain_uuid FROM v_voicemails as v inner join v_domains as d on v.domain_uuid = d.domain_uuid
WHERE v.voicemail_id = :voicemail_id and d.domain_name = :domain_name]] WHERE v.voicemail_enabled = 'true' and v.voicemail_id = :voicemail_id and d.domain_name = :domain_name]]
local vm_messages_sql = [[SELECT local vm_messages_sql = [[SELECT
( SELECT count(*) ( SELECT count(*)
FROM v_voicemail_messages FROM v_voicemail_messages
WHERE voicemail_uuid = %s WHERE voicemail_uuid = :voicemail_uuid
AND (message_status is null or message_status = '') AND (message_status is null or message_status = '')
) as new_messages, ) as new_messages,
( SELECT count(*) ( SELECT count(*)
FROM v_voicemail_messages FROM v_voicemail_messages
WHERE voicemail_uuid = %s WHERE voicemail_uuid = :voicemail_uuid
AND message_status = 'saved' AND message_status = 'saved'
) as saved_messages ) as saved_messages
]] ]]
@ -42,38 +42,32 @@ function vm_message_count(account, use_cache)
local dbh = Database.new('system') local dbh = Database.new('system')
if not dbh then return end if not dbh then return end
-- Get the UUID from the cache if enabled/supported
local uuid local uuid
if use_cache and cache.support() then if use_cache and cache.support() then
local uuid = cache.get('voicemail_uuid:' .. account) uuid = cache.get('voicemail_uuid:' .. account)
if not uuid then end
uuid = dbh:first_value(vm_to_uuid_sql, {
voicemail_id = id, domain_name = domain_name
})
if uuid and #uuid > 0 then -- If no UUID cached or if cache is not enabled/supported get the UUID from the database
cache.set('voicemail_uuid:' .. account, uuid, 3600) if not uuid then
end uuid = dbh:first_value(vm_to_uuid_sql, {
voicemail_id = id, domain_name = domain_name
})
if uuid and #uuid > 0 and use_cache and cache.support() then
cache.set('voicemail_uuid:' .. account, uuid, 3600)
end end
end end
-- Get the count of unread and read messages from the database if there is a valid voicemail account
local row local row
if uuid and #uuid > 0 then if uuid and #uuid > 0 then
local sql = string.format(vm_messages_sql, ":voicemail_uuid", ":voicemail_uuid") row = dbh:first_row(vm_messages_sql, {voicemail_uuid = uuid})
row = dbh:first_row(sql, {voicemail_uuid = uuid})
else
local uuid_sql = '(' .. vm_to_uuid_sql .. ')'
local sql = string.format(vm_messages_sql,
uuid_sql, uuid_sql
)
row = dbh:first_row(sql, {
voicemail_id = id, domain_name = domain_name
})
end end
dbh:release() dbh:release()
-- This condition can be hit if the voicemail box is either disabled or non-existent
if not row then return end if not row then return end
return row.new_messages, row.saved_messages return row.new_messages, row.saved_messages