Added a remove_deleted_messages function that runs on voicemail main menu login. With this method the deletion queue is handled per mailbox vs system wide as in the cron triggered script. It also allows to adjust the retention hours on a per domain basis.
This commit is contained in:
simplecoder732
GitHub
parent
8024141c25
commit
513cb8cb65
|
|
@ -253,6 +253,15 @@
|
|||
end
|
||||
end
|
||||
|
||||
deletion_queue_retention_hours = "24";
|
||||
if (settings['voicemail'] ~= nil) then
|
||||
if (settings['voicemail']['deletion_queue_retention_hours'] ~= nil) then
|
||||
if (settings['voicemail']['deletion_queue_retention_hours']['numeric'] ~= nil) then
|
||||
deletion_queue_retention_hours = settings['voicemail']['deletion_queue_retention_hours']['numeric'];
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if (settings['voicemail']) then
|
||||
|
|
@ -370,6 +379,7 @@
|
|||
require "app.voicemail.resources.functions.mwi_notify";
|
||||
require "app.voicemail.resources.functions.blf_notify";
|
||||
require "app.voicemail.resources.functions.tutorial";
|
||||
require "app.voicemail.resources.functions.remove_deleted_messages";
|
||||
|
||||
--send a message waiting event
|
||||
if (voicemail_action == "mwi") then
|
||||
|
|
|
|||
|
|
@ -38,6 +38,11 @@
|
|||
session:execute("sleep", "1000");
|
||||
end
|
||||
|
||||
--remove deleted messages in queue
|
||||
if (use_deletion_queue == "true") then
|
||||
remove_deleted_messages(voicemail_id);
|
||||
end
|
||||
|
||||
--new voicemail count
|
||||
if (session:ready()) then
|
||||
local sql = [[SELECT count(*) as new_messages FROM v_voicemail_messages
|
||||
|
|
|
|||
|
|
@ -0,0 +1,92 @@
|
|||
-- Part of FusionPBX
|
||||
-- Copyright (C) 2013-2025
|
||||
-- All rights reserved.
|
||||
--
|
||||
-- Redistribution and use in source and binary forms, with or without
|
||||
-- modification, are permitted provided that the following conditions are met:
|
||||
--
|
||||
-- 1. Redistributions of source code must retain the above copyright notice,
|
||||
-- this list of conditions and the following disclaimer.
|
||||
--
|
||||
-- 2. Redistributions in binary form must reproduce the above copyright
|
||||
-- notice, this list of conditions and the following disclaimer in the
|
||||
-- documentation and/or other materials provided with the distribution.
|
||||
--
|
||||
-- THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
-- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
-- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
-- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
-- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
-- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
-- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
-- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
-- POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
--delete all deleted messages for a single mailbox
|
||||
function remove_deleted_messages(voicemail_id)
|
||||
--get the voicemail_uuid
|
||||
local sql = [[SELECT * FROM v_voicemails
|
||||
WHERE domain_uuid = :domain_uuid
|
||||
AND voicemail_id = :voicemail_id]];
|
||||
local params = {domain_uuid = domain_uuid, voicemail_id = voicemail_id};
|
||||
dbh:query(sql, params, function(row)
|
||||
db_voicemail_uuid = row["voicemail_uuid"];
|
||||
end);
|
||||
if (debug["sql"]) then
|
||||
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
|
||||
end
|
||||
|
||||
--get messages
|
||||
local sql = [[SELECT * FROM v_voicemail_messages
|
||||
WHERE message_status = 'deleted'
|
||||
AND (update_date + interval ':retention_hours hours') < now()
|
||||
AND voicemail_uuid = :voicemail_uuid
|
||||
AND domain_uuid = :domain_uuid]];
|
||||
local params = {retention_hours = deletion_queue_retention_hours, voicemail_uuid = db_voicemail_uuid, domain_uuid = domain_uuid}
|
||||
messages_to_delete = {};
|
||||
dbh:query(sql, params, function(row)
|
||||
table.insert(messages_to_delete, row);
|
||||
end);
|
||||
if (debug["sql"]) then
|
||||
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
|
||||
end
|
||||
|
||||
--flush dtmf digits from the input buffer
|
||||
session:flushDigits();
|
||||
|
||||
total_messages = #messages_to_delete;
|
||||
message_number = 1;
|
||||
while message_number <= total_messages do
|
||||
local message_row = messages_to_delete[message_number];
|
||||
local uuid = message_row["voicemail_message_uuid"];
|
||||
|
||||
--delete the file
|
||||
os.remove(voicemail_dir.."/"..voicemail_id.."/intro_msg_"..uuid.."."..vm_message_ext);
|
||||
os.remove(voicemail_dir.."/"..voicemail_id.."/intro_"..uuid.."."..vm_message_ext);
|
||||
os.remove(voicemail_dir.."/"..voicemail_id.."/msg_"..uuid.."."..vm_message_ext);
|
||||
--delete from the database
|
||||
sql = [[DELETE FROM v_voicemail_messages
|
||||
WHERE domain_uuid = :domain_uuid
|
||||
AND voicemail_uuid = :voicemail_uuid
|
||||
AND voicemail_message_uuid = :uuid]];
|
||||
params = {domain_uuid = domain_uuid, voicemail_uuid = db_voicemail_uuid, uuid = uuid};
|
||||
if (debug["sql"]) then
|
||||
freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "; params:" .. json.encode(params) .. "\n");
|
||||
end
|
||||
dbh:query(sql, params);
|
||||
--log to console
|
||||
if (debug["info"]) then
|
||||
freeswitch.consoleLog("notice", "[voicemail][deleted] message: " .. uuid .. "\n");
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
--clear the variable
|
||||
db_voicemail_uuid = '';
|
||||
messages_to_delete = {};
|
||||
|
||||
--flush dtmf digits from the input buffer
|
||||
session:flushDigits();
|
||||
|
||||
end
|
||||
Loading…
Reference in New Issue