Software `/` code `/` prosody-modules

Annotate

mod_cloud_notify/mod_cloud_notify.lua @ 3015:338b7c808ecc

mod_pubsub_post: Add support for posting Atom feeds, publishing each entry

author	Kim Alvefur <zash@zash.se>
date	Sun, 20 May 2018 00:04:41 +0200
parent	3010:7ee59f417c16
child	3055:6abee021d9db

rev	line source
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	1 -- XEP-0357: Push (aka: My mobile OS vendor won't let me have persistent TCP connections)
2247 d09014d8c901 mod_cloud_notify: Update copyright year Kim Alvefur <zash@zash.se> parents: 2246 diff changeset	2 -- Copyright (C) 2015-2016 Kim Alvefur
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	3 -- Copyright (C) 2017 Thilo Molitor
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	4 --
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	5 -- This file is MIT/X11 licensed.
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	6
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	7 local t_insert = table.insert;
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	8 local s_match = string.match;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	9 local s_sub = string.sub;
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	10 local st = require"util.stanza";
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	11 local jid = require"util.jid";
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	12 local dataform = require"util.dataforms".new;
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	13 local filters = require"util.filters";
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	14 local hashes = require"util.hashes";
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	15
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	16 local xmlns_push = "urn:xmpp:push:0";
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	17
1909 c7389fe74de7 mod_cloud_notify: Make inclusion of message sender and body optional via config option Kim Alvefur <zash@zash.se> parents: 1908 diff changeset	18 -- configuration
2246 a3e3dc9131e7 mod_cloud_notify: Use typed config API Kim Alvefur <zash@zash.se> parents: 2201 diff changeset	19 local include_body = module:get_option_boolean("push_notification_with_body", false);
a3e3dc9131e7 mod_cloud_notify: Use typed config API Kim Alvefur <zash@zash.se> parents: 2201 diff changeset	20 local include_sender = module:get_option_boolean("push_notification_with_sender", false);
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	21 local max_push_errors = module:get_option_number("push_max_errors", 50);
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	22 local dummy_body = module:get_option_string("push_notification_important_body", "");
1909 c7389fe74de7 mod_cloud_notify: Make inclusion of message sender and body optional via config option Kim Alvefur <zash@zash.se> parents: 1908 diff changeset	23
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	24 local host_sessions = prosody.hosts[module.host].sessions;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	25 local push_errors = {};
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	26 local id2node = {};
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	27
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	28 -- For keeping state across reloads while caching reads
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	29 local push_store = (function()
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	30 local store = module:open_store();
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	31 local push_services = {};
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	32 local api = {};
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	33 function api:get(user)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	34 if not push_services[user] then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	35 local err;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	36 push_services[user], err = store:get(user);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	37 if not push_services[user] and err then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	38 module:log("warn", "Error reading push notification storage for user '%s': %s", user, tostring(err));
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	39 push_services[user] = {};
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	40 return push_services[user], false;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	41 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	42 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	43 if not push_services[user] then push_services[user] = {} end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	44 return push_services[user], true;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	45 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	46 function api:set(user, data)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	47 push_services[user] = data;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	48 local ok, err = store:set(user, push_services[user]);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	49 if not ok then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	50 module:log("error", "Error writing push notification storage for user '%s': %s", user, tostring(err));
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	51 return false;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	52 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	53 return true;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	54 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	55 function api:set_identifier(user, push_identifier, data)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	56 local services = self:get(user);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	57 services[push_identifier] = data;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	58 return self:set(user, services);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	59 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	60 return api;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	61 end)();
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	62
2642 0f1421af7f6a mod_cloud_notify: Move declarations of handle_push_success/error to fix referencing undefined variables (introduced in 6ab46ff685d0) Matthew Wild <mwild1@gmail.com> parents: 2625 diff changeset	63 -- Forward declarations, as both functions need to reference each other
0f1421af7f6a mod_cloud_notify: Move declarations of handle_push_success/error to fix referencing undefined variables (introduced in 6ab46ff685d0) Matthew Wild <mwild1@gmail.com> parents: 2625 diff changeset	64 local handle_push_success, handle_push_error;
0f1421af7f6a mod_cloud_notify: Move declarations of handle_push_success/error to fix referencing undefined variables (introduced in 6ab46ff685d0) Matthew Wild <mwild1@gmail.com> parents: 2625 diff changeset	65
0f1421af7f6a mod_cloud_notify: Move declarations of handle_push_success/error to fix referencing undefined variables (introduced in 6ab46ff685d0) Matthew Wild <mwild1@gmail.com> parents: 2625 diff changeset	66 function handle_push_error(event)
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	67 local stanza = event.stanza;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	68 local error_type, condition = stanza:get_error();
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	69 local node = id2node[stanza.attr.id];
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	70 if node == nil then return false; end -- unknown stanza? Ignore for now!
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	71 local from = stanza.attr.from;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	72 local user_push_services = push_store:get(node);
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	73
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	74 for push_identifier, _ in pairs(user_push_services) do
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	75 local stanza_id = hashes.sha256(push_identifier, true);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	76 if stanza_id == stanza.attr.id then
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	77 if user_push_services[push_identifier] and user_push_services[push_identifier].jid == from and error_type ~= "wait" then
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	78 push_errors[push_identifier] = push_errors[push_identifier] + 1;
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	79 module:log("info", "Got error of type '%s' (%s) for identifier '%s': "
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	80 .."error count for this identifier is now at %s", error_type, condition, push_identifier,
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	81 tostring(push_errors[push_identifier]));
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	82 if push_errors[push_identifier] >= max_push_errors then
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	83 module:log("warn", "Disabling push notifications for identifier '%s'", push_identifier);
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	84 -- remove push settings from sessions
2749 9756211fcbe3 mod_cloud_notify: Fix small bug. tmolitor <thilo@eightysoft.de> parents: 2736 diff changeset	85 if host_sessions[node] then
9756211fcbe3 mod_cloud_notify: Fix small bug. tmolitor <thilo@eightysoft.de> parents: 2736 diff changeset	86 for _, session in pairs(host_sessions[node].sessions) do
9756211fcbe3 mod_cloud_notify: Fix small bug. tmolitor <thilo@eightysoft.de> parents: 2736 diff changeset	87 if session.push_identifier == push_identifier then
9756211fcbe3 mod_cloud_notify: Fix small bug. tmolitor <thilo@eightysoft.de> parents: 2736 diff changeset	88 session.push_identifier = nil;
9756211fcbe3 mod_cloud_notify: Fix small bug. tmolitor <thilo@eightysoft.de> parents: 2736 diff changeset	89 session.push_settings = nil;
9756211fcbe3 mod_cloud_notify: Fix small bug. tmolitor <thilo@eightysoft.de> parents: 2736 diff changeset	90 end
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	91 end
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	92 end
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	93 -- save changed global config
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	94 push_store:set_identifier(node, push_identifier, nil);
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	95 push_errors[push_identifier] = nil;
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	96 -- unhook iq handlers for this identifier (if possible)
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	97 if module.unhook then
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	98 module:unhook("iq-error/host/"..stanza_id, handle_push_error);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	99 module:unhook("iq-result/host/"..stanza_id, handle_push_success);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	100 id2node[stanza_id] = nil;
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	101 end
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	102 end
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	103 elseif user_push_services[push_identifier] and user_push_services[push_identifier].jid == from and error_type == "wait" then
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	104 module:log("debug", "Got error of type '%s' (%s) for identifier '%s': "
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	105 .."NOT increasing error count for this identifier", error_type, condition, push_identifier);
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	106 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	107 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	108 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	109 return true;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	110 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	111
2642 0f1421af7f6a mod_cloud_notify: Move declarations of handle_push_success/error to fix referencing undefined variables (introduced in 6ab46ff685d0) Matthew Wild <mwild1@gmail.com> parents: 2625 diff changeset	112 function handle_push_success(event)
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	113 local stanza = event.stanza;
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	114 local node = id2node[stanza.attr.id];
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	115 if node == nil then return false; end -- unknown stanza? Ignore for now!
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	116 local from = stanza.attr.from;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	117 local user_push_services = push_store:get(node);
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	118
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	119 for push_identifier, _ in pairs(user_push_services) do
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	120 if hashes.sha256(push_identifier, true) == stanza.attr.id then
2670 6e01878103c0 mod_smacks: Ignore user when writing or reading session_cache on prosody 0.9 tmolitor <thilo@eightysoft.de> parents: 2669 diff changeset	121 if user_push_services[push_identifier] and user_push_services[push_identifier].jid == from and push_errors[push_identifier] > 0 then
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	122 push_errors[push_identifier] = 0;
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	123 module:log("debug", "Push succeeded, error count for identifier '%s' is now at %s again", push_identifier, tostring(push_errors[push_identifier]));
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	124 end
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	125 end
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	126 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	127 return true;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	128 end
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	129
1908 eba279ddc050 mod_cloud_notify: Add some comments describing code blocks Kim Alvefur <zash@zash.se> parents: 1907 diff changeset	130 -- http://xmpp.org/extensions/xep-0357.html#disco
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	131 local function account_dico_info(event)
2200 e9e38ae8037f mod_cloud_notify: Advertise feature on bare jid disco (thanks iNPUTmice) Kim Alvefur <zash@zash.se> parents: 2198 diff changeset	132 (event.reply or event.stanza):tag("feature", {var=xmlns_push}):up();
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	133 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	134 module:hook("account-disco-info", account_dico_info);
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	135
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	136 -- http://xmpp.org/extensions/xep-0357.html#enabling
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	137 local function push_enable(event)
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	138 local origin, stanza = event.origin, event.stanza;
2254 122cb5f4930f mod_cloud_notify: Cache <enable> in local Kim Alvefur <zash@zash.se> parents: 2253 diff changeset	139 local enable = stanza.tags[1];
2252 a96f2d0f8750 mod_cloud_notify: Add some logging when a client attempts to enable push notifications Kim Alvefur <zash@zash.se> parents: 2247 diff changeset	140 origin.log("debug", "Attempting to enable push notifications");
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	141 -- MUST contain a 'jid' attribute of the XMPP Push Service being enabled
2254 122cb5f4930f mod_cloud_notify: Cache <enable> in local Kim Alvefur <zash@zash.se> parents: 2253 diff changeset	142 local push_jid = enable.attr.jid;
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	143 -- SHOULD contain a 'node' attribute
2254 122cb5f4930f mod_cloud_notify: Cache <enable> in local Kim Alvefur <zash@zash.se> parents: 2253 diff changeset	144 local push_node = enable.attr.node;
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	145 -- CAN contain a 'include_payload' attribute
fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	146 local include_payload = enable.attr.include_payload;
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	147 if not push_jid then
2257 f84b51f9aa82 mod_cloud_notify: Log message when 'jid' is missing from enable request Kim Alvefur <zash@zash.se> parents: 2255 diff changeset	148 origin.log("debug", "Push notification enable request missing the 'jid' field");
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	149 origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing jid"));
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	150 return true;
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	151 end
2255 cdfc917a8cc7 mod_cloud_notify: Retrieve data form by name and namespace so unknown elements are ignored Kim Alvefur <zash@zash.se> parents: 2254 diff changeset	152 local publish_options = enable:get_child("x", "jabber:x:data");
2258 3abc51faf945 mod_cloud_notify: Log message if no dataform is found Kim Alvefur <zash@zash.se> parents: 2257 diff changeset	153 if not publish_options then
3abc51faf945 mod_cloud_notify: Log message if no dataform is found Kim Alvefur <zash@zash.se> parents: 2257 diff changeset	154 -- Could be intentional
3abc51faf945 mod_cloud_notify: Log message if no dataform is found Kim Alvefur <zash@zash.se> parents: 2257 diff changeset	155 origin.log("debug", "No publish options in request");
3abc51faf945 mod_cloud_notify: Log message if no dataform is found Kim Alvefur <zash@zash.se> parents: 2257 diff changeset	156 end
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	157 local push_identifier = push_jid .. "<" .. (push_node or "");
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	158 local push_service = {
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	159 jid = push_jid;
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	160 node = push_node;
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	161 include_payload = include_payload;
2253 97ebd28a8a75 mod_cloud_notify: Apply pre-serialization to publish-options Kim Alvefur <zash@zash.se> parents: 2252 diff changeset	162 options = publish_options and st.preserialize(publish_options);
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	163 };
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	164 local ok = push_store:set_identifier(origin.username, push_identifier, push_service);
2201 eb5555a3a535 mod_cloud_notify: Enable persistent storage of user notification settings Kim Alvefur <zash@zash.se> parents: 2200 diff changeset	165 if not ok then
eb5555a3a535 mod_cloud_notify: Enable persistent storage of user notification settings Kim Alvefur <zash@zash.se> parents: 2200 diff changeset	166 origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
eb5555a3a535 mod_cloud_notify: Enable persistent storage of user notification settings Kim Alvefur <zash@zash.se> parents: 2200 diff changeset	167 else
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	168 origin.push_identifier = push_identifier;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	169 origin.push_settings = push_service;
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	170 origin.log("info", "Push notifications enabled for %s (%s)", tostring(stanza.attr.from), tostring(origin.push_identifier));
2201 eb5555a3a535 mod_cloud_notify: Enable persistent storage of user notification settings Kim Alvefur <zash@zash.se> parents: 2200 diff changeset	171 origin.send(st.reply(stanza));
eb5555a3a535 mod_cloud_notify: Enable persistent storage of user notification settings Kim Alvefur <zash@zash.se> parents: 2200 diff changeset	172 end
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	173 return true;
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	174 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	175 module:hook("iq-set/self/"..xmlns_push..":enable", push_enable);
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	176
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	177 -- http://xmpp.org/extensions/xep-0357.html#disabling
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	178 local function push_disable(event)
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	179 local origin, stanza = event.origin, event.stanza;
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	180 local push_jid = stanza.tags[1].attr.jid; -- MUST include a 'jid' attribute
7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	181 local push_node = stanza.tags[1].attr.node; -- A 'node' attribute MAY be included
7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	182 if not push_jid then
7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	183 origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing jid"));
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	184 return true;
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	185 end
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	186 local user_push_services = push_store:get(origin.username);
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	187 for key, push_info in pairs(user_push_services) do
7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	188 if push_info.jid == push_jid and (not push_node or push_info.node == push_node) then
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	189 origin.log("info", "Push notifications disabled (%s)", tostring(key));
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	190 if origin.push_identifier == key then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	191 origin.push_identifier = nil;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	192 origin.push_settings = nil;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	193 end
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	194 user_push_services[key] = nil;
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	195 push_errors[key] = nil;
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	196 if module.unhook then
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	197 module:unhook("iq-error/host/"..key, handle_push_error);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	198 module:unhook("iq-result/host/"..key, handle_push_success);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	199 id2node[key] = nil;
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	200 end
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	201 end
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	202 end
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	203 local ok = push_store:set(origin.username, user_push_services);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	204 if not ok then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	205 origin.send(st.error_reply(stanza, "wait", "internal-server-error"));
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	206 else
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	207 origin.send(st.reply(stanza));
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	208 end
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	209 return true;
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	210 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	211 module:hook("iq-set/self/"..xmlns_push..":disable", push_disable);
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	212
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	213 -- Patched version of util.stanza:find() that supports giving stanza names
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	214 -- without their namespace, allowing for every namespace.
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	215 local function find(self, path)
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	216 local pos = 1;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	217 local len = #path + 1;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	218
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	219 repeat
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	220 local xmlns, name, text;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	221 local char = s_sub(path, pos, pos);
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	222 if char == "@" then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	223 return self.attr[s_sub(path, pos + 1)];
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	224 elseif char == "{" then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	225 xmlns, pos = s_match(path, "^([^}]+)}()", pos + 1);
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	226 end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	227 name, text, pos = s_match(path, "^([^@/#]*)([/#]?)()", pos);
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	228 name = name ~= "" and name or nil;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	229 if pos == len then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	230 if text == "#" then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	231 local child = xmlns ~= nil and self:get_child(name, xmlns) or self:child_with_name(name);
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	232 return child and child:get_text() or nil;
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	233 end
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	234 return xmlns ~= nil and self:get_child(name, xmlns) or self:child_with_name(name);
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	235 end
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	236 self = xmlns ~= nil and self:get_child(name, xmlns) or self:child_with_name(name);
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	237 until not self
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	238 return nil;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	239 end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	240
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	241 -- is this push a high priority one (this is needed for ios apps not using voip pushes)
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	242 local function is_important(stanza)
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	243 local st_name = stanza and stanza.name or nil;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	244 if not st_name then return false; end -- nonzas are never important here
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	245 if st_name == "presence" then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	246 return false; -- same for presences
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	247 elseif st_name == "message" then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	248 -- unpack carbon copies
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	249 local stanza_direction = "in";
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	250 local carbon;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	251 local st_type;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	252 -- support carbon copied message stanzas having an arbitrary message-namespace or no message-namespace at all
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	253 if not carbon then carbon = find(stanza, "{urn:xmpp:carbons:2}/forwarded/message"); end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	254 if not carbon then carbon = find(stanza, "{urn:xmpp:carbons:1}/forwarded/message"); end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	255 stanza_direction = carbon and stanza:child_with_name("sent") and "out" or "in";
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	256 if carbon then stanza = carbon; end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	257 st_type = stanza.attr.type;
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	258
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	259 -- headline message are always not important
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	260 if st_type == "headline" then return false; end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	261
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	262 -- carbon copied outgoing messages are not important
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	263 if carbon and stanza_direction == "out" then return false; end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	264
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	265 -- We can't check for body contents in encrypted messages, so let's treat them as important
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	266 -- Some clients don't even set a body or an empty body for encrypted messages
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	267
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	268 -- check omemo https://xmpp.org/extensions/inbox/omemo.html
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	269 if stanza:get_child("encrypted", "eu.siacs.conversations.axolotl") or stanza:get_child("encrypted", "urn:xmpp:omemo:0") then return true; end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	270
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	271 -- check xep27 pgp https://xmpp.org/extensions/xep-0027.html
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	272 if stanza:get_child("x", "jabber:x:encrypted") then return true; end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	273
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	274 -- check xep373 pgp (OX) https://xmpp.org/extensions/xep-0373.html
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	275 if stanza:get_child("openpgp", "urn:xmpp:openpgp:0") then return true; end
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	276
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	277 local body = stanza:get_child_text("body");
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	278 if st_type == "groupchat" and stanza:get_child_text("subject") then return false; end -- groupchat subjects are not important here
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	279 return body ~= nil and body ~= ""; -- empty bodies are not important
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	280 end
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	281 return false; -- this stanza wasn't one of the above cases --> it is not important, too
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	282 end
fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	283
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	284 local push_form = dataform {
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	285 { name = "FORM_TYPE"; type = "hidden"; value = "urn:xmpp:push:summary"; };
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	286 { name = "message-count"; type = "text-single"; };
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	287 { name = "pending-subscription-count"; type = "text-single"; };
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	288 { name = "last-message-sender"; type = "jid-single"; };
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	289 { name = "last-message-body"; type = "text-single"; };
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	290 };
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	291
1907 7fe7bd7b33b6 mod_cloud_notify: Allow the 'node' to be left out when disabling, clients MAY include it (and therefore leave it out) Kim Alvefur <zash@zash.se> parents: 1784 diff changeset	292 -- http://xmpp.org/extensions/xep-0357.html#publishing
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	293 local function handle_notify_request(stanza, node, user_push_services)
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	294 local pushes = 0;
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	295 if not user_push_services or not #user_push_services then return pushes end
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	296
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	297 for push_identifier, push_info in pairs(user_push_services) do
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	298 local send_push = true; -- only send push to this node when not already done for this stanza or if no stanza is given at all
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	299 if stanza then
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	300 if not stanza._push_notify then stanza._push_notify = {}; end
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	301 if stanza._push_notify[push_identifier] then
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	302 module:log("debug", "Already sent push notification for %s@%s to %s (%s)", node, module.host, push_info.jid, tostring(push_info.node));
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	303 send_push = false;
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	304 end
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	305 stanza._push_notify[push_identifier] = true;
8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	306 end
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	307
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	308 if send_push then
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	309 -- construct push stanza
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	310 local stanza_id = hashes.sha256(push_identifier, true);
2751 6b710a8bdf03 mod_cloud_notify: Implement version 0.3 of XEP-0357 tmolitor <thilo@eightysoft.de> parents: 2749 diff changeset	311 local push_publish = st.iq({ to = push_info.jid, from = module.host, type = "set", id = stanza_id })
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	312 :tag("pubsub", { xmlns = "http://jabber.org/protocol/pubsub" })
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	313 :tag("publish", { node = push_info.node })
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	314 :tag("item")
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	315 :tag("notification", { xmlns = xmlns_push });
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	316 local form_data = {
3010 7ee59f417c16 mod_cloud_notify: remove useless counter (hardcode it to 1) tmolitor <thilo@eightysoft.de> parents: 2976 diff changeset	317 -- hardcode to 1 because other numbers are just meaningless (the XEP does not specify what exactly to count)
7ee59f417c16 mod_cloud_notify: remove useless counter (hardcode it to 1) tmolitor <thilo@eightysoft.de> parents: 2976 diff changeset	318 ["message-count"] = "1";
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	319 };
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	320 if stanza and include_sender then
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	321 form_data["last-message-sender"] = stanza.attr.from;
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	322 end
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	323 if stanza and include_body then
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	324 form_data["last-message-body"] = stanza:get_child_text("body");
2976 df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	325 elseif stanza and dummy_body ~= "" and is_important(stanza) then
df86ce6bb0b4 Implement dummy body message to indicate high priority push tmolitor <thilo@eightysoft.de> parents: 2792 diff changeset	326 form_data["last-message-body"] = dummy_body;
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	327 end
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	328 push_publish:add_child(push_form:form(form_data));
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	329 push_publish:up(); -- / notification
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	330 push_publish:up(); -- / publish
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	331 push_publish:up(); -- / pubsub
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	332 if push_info.options then
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	333 push_publish:tag("publish-options"):add_child(st.deserialize(push_info.options));
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	334 end
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	335 -- send out push
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	336 module:log("debug", "Sending push notification for %s@%s to %s (%s)", node, module.host, push_info.jid, tostring(push_info.node));
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	337 -- module:log("debug", "PUSH STANZA: %s", tostring(push_publish));
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	338 -- handle push errors for this node
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	339 if push_errors[push_identifier] == nil then
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	340 push_errors[push_identifier] = 0;
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	341 module:hook("iq-error/host/"..stanza_id, handle_push_error);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	342 module:hook("iq-result/host/"..stanza_id, handle_push_success);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	343 id2node[stanza_id] = node;
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	344 end
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	345 module:send(push_publish);
d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	346 pushes = pushes + 1;
1909 c7389fe74de7 mod_cloud_notify: Make inclusion of message sender and body optional via config option Kim Alvefur <zash@zash.se> parents: 1908 diff changeset	347 end
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	348 end
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	349 return pushes;
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	350 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	351
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	352 -- small helper function to extract relevant push settings
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	353 local function get_push_settings(stanza, session)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	354 local to = stanza.attr.to;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	355 local node = to and jid.split(to) or session.username;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	356 local user_push_services = push_store:get(node);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	357 return node, user_push_services;
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	358 end
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	359
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	360 -- publish on offline message
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	361 module:hook("message/offline/handle", function(event)
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	362 local node, user_push_services = get_push_settings(event.stanza, event.origin);
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	363 module:log("debug", "Invoking cloud handle_notify_request() for offline stanza");
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	364 handle_notify_request(event.stanza, node, user_push_services);
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	365 end, 1);
b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	366
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	367 -- publish on unacked smacks message
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	368 local function process_smacks_stanza(stanza, session)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	369 if session.push_identifier then
2714 75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	370 session.log("debug", "Invoking cloud handle_notify_request() for smacks queued stanza");
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	371 local user_push_services = {[session.push_identifier] = session.push_settings};
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	372 local node = get_push_settings(stanza, session);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	373 handle_notify_request(stanza, node, user_push_services);
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	374 end
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	375 return stanza;
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	376 end
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	377
2714 75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	378 local function process_smacks_queue(queue, session)
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	379 if not session.push_identifier then return; end
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	380 local user_push_services = {[session.push_identifier] = session.push_settings};
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	381 for i=1, #queue do
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	382 local stanza = queue[i];
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	383 local node = get_push_settings(stanza, session);
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	384 session.log("debug", "Invoking cloud handle_notify_request() for smacks queued stanza: %d", i);
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	385 if handle_notify_request(stanza, node, user_push_services) ~= 0 then
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	386 session.log("debug", "Cloud handle_notify_request() > 0, not notifying for other queued stanzas");
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	387 return; -- only notify for one stanza in the queue, not for all in a row
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	388 end
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	389 end
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	390 end
75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	391
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	392 -- smacks hibernation is started
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	393 local function hibernate_session(event)
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	394 local session = event.origin;
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	395 local queue = event.queue;
2395 2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	396 -- process unacked stanzas
2714 75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	397 process_smacks_queue(queue, session);
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	398 -- process future unacked (hibernated) stanzas
2736 fff185e7ab73 mod_cloud_notify: Implement the "stripped stanzas" proposal. tmolitor <thilo@eightysoft.de> parents: 2714 diff changeset	399 filters.add_filter(session, "stanzas/out", process_smacks_stanza, -990);
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	400 end
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	401
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	402 -- smacks hibernation is ended
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	403 local function restore_session(event)
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	404 local session = event.resumed;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	405 if session then -- older smacks module versions send only the "intermediate" session in event.session and no session.resumed one
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	406 filters.remove_filter(session, "stanzas/out", process_smacks_stanza);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	407 end
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	408 end
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	409
2395 2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	410 -- smacks ack is delayed
2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	411 local function ack_delayed(event)
2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	412 local session = event.origin;
2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	413 local queue = event.queue;
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	414 -- process unacked stanzas (handle_notify_request() will only send push requests for new stanzas)
2714 75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	415 process_smacks_queue(queue, session);
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	416 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	417
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	418 -- archive message added
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	419 local function archive_message_added(event)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	420 -- event is: { origin = origin, stanza = stanza, for_user = store_user, id = id }
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	421 -- only notify for new mam messages when at least one device is only
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	422 if not event.for_user or not host_sessions[event.for_user] then return; end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	423 local stanza = event.stanza;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	424 local user_session = host_sessions[event.for_user].sessions;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	425 local to = stanza.attr.to;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	426 to = to and jid.split(to) or event.origin.username;
2643 777d07e0cd73 mod_cloud_notify: Whitespace fixes Matthew Wild <mwild1@gmail.com> parents: 2642 diff changeset	427
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	428 -- only notify if the stanza destination is the mam user we store it for
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	429 if event.for_user == to then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	430 local user_push_services = push_store:get(to);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	431 if not #user_push_services then return end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	432
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	433 -- only notify nodes with no active sessions (smacks is counted as active and handled separate)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	434 local notify_push_sevices = {};
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	435 for identifier, push_info in pairs(user_push_services) do
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	436 local identifier_found = nil;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	437 for _, session in pairs(user_session) do
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	438 -- module:log("debug", "searching for '%s': identifier '%s' for session %s", tostring(identifier), tostring(session.push_identifier), tostring(session.full_jid));
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	439 if session.push_identifier == identifier then
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	440 identifier_found = session;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	441 break;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	442 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	443 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	444 if identifier_found then
2714 75b137cf869a mod_cloud_notify: Don't notify for all smacks queued stanzas in a row tmolitor <thilo@eightysoft.de> parents: 2712 diff changeset	445 identifier_found.log("debug", "Not cloud notifying '%s' of new MAM stanza (session still alive)", identifier);
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	446 else
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	447 notify_push_sevices[identifier] = push_info;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	448 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	449 end
2643 777d07e0cd73 mod_cloud_notify: Whitespace fixes Matthew Wild <mwild1@gmail.com> parents: 2642 diff changeset	450
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	451 handle_notify_request(event.stanza, to, notify_push_sevices);
2395 2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	452 end
2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	453 end
2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	454
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	455 module:hook("smacks-hibernation-start", hibernate_session);
218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	456 module:hook("smacks-hibernation-end", restore_session);
2395 2e641ab995b3 mod_cloud_notify: added code to respond to the new event "smacks-ack-delayed" issued by mod_smacks when acks are delayed for a certain amount of time. This allows to send out notification requests before the read timeout or connection close event really happens, thus allowing conversations to be smoother. tmolitor <thilo@eightysoft.de> parents: 2263 diff changeset	457 module:hook("smacks-ack-delayed", ack_delayed);
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	458 module:hook("archive-message-added", archive_message_added);
2141 218a3d3f7f97 mod_cloud_notify: added ability to notify even if the session is hibernated by mod_smacks tmolitor <thilo@eightysoft.de> parents: 2051 diff changeset	459
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	460 local function send_ping(event)
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	461 local user = event.user;
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	462 local user_push_services = push_store:get(user);
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	463 local push_services = event.push_services or user_push_services;
2712 d89ab70808f6 mod_cloud_notify: fix bug when multiple resources are used tmolitor <thilo@eightysoft.de> parents: 2670 diff changeset	464 handle_notify_request(nil, user, push_services);
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	465 end
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	466 -- can be used by other modules to ping one or more (or all) push endpoints
6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	467 module:hook("cloud-notify-ping", send_ping);
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	468
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	469 module:log("info", "Module loaded");
2609 6ab46ff685d0 mod_cloud_notify: Respect Daniel's business rules and remove endpoints on error tmolitor <thilo@eightysoft.de> parents: 2395 diff changeset	470 function module.unload()
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	471 if module.unhook then
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	472 module:unhook("account-disco-info", account_dico_info);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	473 module:unhook("iq-set/self/"..xmlns_push..":enable", push_enable);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	474 module:unhook("iq-set/self/"..xmlns_push..":disable", push_disable);
2643 777d07e0cd73 mod_cloud_notify: Whitespace fixes Matthew Wild <mwild1@gmail.com> parents: 2642 diff changeset	475
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	476 module:unhook("smacks-hibernation-start", hibernate_session);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	477 module:unhook("smacks-hibernation-end", restore_session);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	478 module:unhook("smacks-ack-delayed", ack_delayed);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	479 module:unhook("archive-message-added", archive_message_added);
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	480 module:unhook("cloud-notify-ping", send_ping);
2643 777d07e0cd73 mod_cloud_notify: Whitespace fixes Matthew Wild <mwild1@gmail.com> parents: 2642 diff changeset	481
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	482 for push_identifier, _ in pairs(push_errors) do
e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	483 local stanza_id = hashes.sha256(push_identifier, true);
2791 008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	484 module:unhook("iq-error/host/"..stanza_id, handle_push_error);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	485 module:unhook("iq-result/host/"..stanza_id, handle_push_success);
008cf272b7ea mod_cloud_notify: Fix regression in error handling tmolitor <thilo@eightysoft.de> parents: 2751 diff changeset	486 id2node[stanza_id] = nil;
2669 e6d243ed88ca mod_cloud_notify: Fix module:unhook calls not available in prosody 0.9, fixes #874 tmolitor <thilo@eightysoft.de> parents: 2643 diff changeset	487 end
1783 b31fe2d22310 mod_cloud_notify: XEP-0357: Push - the server bits ("app server" not included) Kim Alvefur <zash@zash.se> parents: diff changeset	488 end
2643 777d07e0cd73 mod_cloud_notify: Whitespace fixes Matthew Wild <mwild1@gmail.com> parents: 2642 diff changeset	489
2625 8c6562f16496 mod_cloud_notify: Fixed error in push deduplication tmolitor <thilo@eightysoft.de> parents: 2609 diff changeset	490 module:log("info", "Module unloaded");
2643 777d07e0cd73 mod_cloud_notify: Whitespace fixes Matthew Wild <mwild1@gmail.com> parents: 2642 diff changeset	491 end

prosody-modules

338b7c808ecc

mod_cloud_notify/mod_cloud_notify.lua

Software / code / prosody-modules

Annotate

mod_cloud_notify/mod_cloud_notify.lua @ 3015:338b7c808ecc

Software `/` code `/` prosody-modules