From 195c024aaabea110de558cffa9951b650136e076 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 16 Nov 2021 13:22:58 +0100 Subject: [PATCH] TT#150950 sipwise_pushd: support new mobile_push_enable values Previously the values where 0, 1 but now we have several more The logic is don't send push only if preference is 'never' Change-Id: I7a1d263da23d79d18d4dd89bc5bf1f4567e52996 (cherry picked from commit 1511c9a9c673454926c7fbff5b93f6243cc63889) (cherry picked from commit bcedefadf8f099c4e00887709a9e3a399802f65b) --- plugins/mod_sipwise_pushd.lua | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/mod_sipwise_pushd.lua b/plugins/mod_sipwise_pushd.lua index 57cbf84..4908ba2 100644 --- a/plugins/mod_sipwise_pushd.lua +++ b/plugins/mod_sipwise_pushd.lua @@ -101,19 +101,21 @@ end local function push_enable(username, domain) reconect_check(); - for row in engine:select(push_dom_query, domain) do - if row[2] == "1" then - module:log("debug", "domain mobile_push_enable pref set"); - return true; + for row in engine:select(push_usr_query, username, domain) do + module:log("debug", "usr pref %s", ut.table.tostring(row)) + if row[2] == "never" then + module:log("debug", "usr mobile_push_enable pref set to 'never'"); + return false; end end - for row in engine:select(push_usr_query, username, domain) do - if row[2] == "1" then - module:log("debug", "usr mobile_push_enable pref set"); - return true; + for row in engine:select(push_dom_query, domain) do + module:log("debug", "dom pref %s", ut.table.tostring(row)) + if row[2] == "never" then + module:log("debug", "domain mobile_push_enable pref set to 'never'"); + return false; end end - return false; + return true; end local function is_local_domain(dom)