comparison mod_pep_vcard_avatar/mod_pep_vcard_avatar.lua @ 3221:b98c7c33550e

mod_pep_vcard_avatar: Log error when used with new mod_pep, add compat with mod_pep_simple
author Matthew Wild <mwild1@gmail.com>
date Thu, 09 Aug 2018 22:36:22 +0100
parents 4eff14ac6853
children
comparison
equal deleted inserted replaced
3220:0e78523f8c20 3221:b98c7c33550e
11 local st = require "util.stanza" 11 local st = require "util.stanza"
12 local jid = require "util.jid"; 12 local jid = require "util.jid";
13 local base64 = require"util.encodings".base64; 13 local base64 = require"util.encodings".base64;
14 local sha1 = require"util.hashes".sha1; 14 local sha1 = require"util.hashes".sha1;
15 15
16 local mod_pep = module:depends"pep"; 16 local mm = require "core.modulemanager";
17
18 -- COMPAT w/trunk
19 local pep_module_name = "pep";
20 if mm.get_modules_for_host then
21 if mm.get_modules_for_host(module.host):contains("pep_simple") then
22 pep_module_name = "pep_simple";
23 end
24 end
25
26 local mod_pep = module:depends(pep_module_name);
17 local pep_data = mod_pep.module.save().data; 27 local pep_data = mod_pep.module.save().data;
28
29 if not pep_data then
30 module:log("error", "This module is not compatible with your version of mod_pep");
31 if mm.get_modules_for_host then
32 module:log("error", "Please use mod_pep_simple instead of mod_pep to continue using this module");
33 end
34 return false;
35 end
18 36
19 module:hook("account-disco-info", function (event) 37 module:hook("account-disco-info", function (event)
20 event.reply:tag("feature", { var = "urn:xmpp:pep-vcard-conversion:0" }):up(); 38 event.reply:tag("feature", { var = "urn:xmpp:pep-vcard-conversion:0" }):up();
21 end); 39 end);
22 40