Mon, 22 Dec 2008 13:29:59 +0000
Merge from waqas
615 | 1 | -- Prosody IM v0.2 |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
2 | -- Copyright (C) 2008 Matthew Wild |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
3 | -- Copyright (C) 2008 Waqas Hussain |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
4 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
5 | -- This program is free software; you can redistribute it and/or |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
6 | -- modify it under the terms of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
7 | -- as published by the Free Software Foundation; either version 2 |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
8 | -- of the License, or (at your option) any later version. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
9 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
10 | -- This program is distributed in the hope that it will be useful, |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
11 | -- but WITHOUT ANY WARRANTY; without even the implied warranty of |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
12 | -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
13 | -- GNU General Public License for more details. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
14 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
15 | -- You should have received a copy of the GNU General Public License |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
16 | -- along with this program; if not, write to the Free Software |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
17 | -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
18 | -- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
19 | |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
467
diff
changeset
|
20 | |
30 | 21 | |
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
439
diff
changeset
|
22 | local plugin_dir = CFG_PLUGINDIR or "./plugins/"; |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
23 | |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
24 | local logger = require "util.logger"; |
540
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
25 | local log = logger.init("modulemanager"); |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
26 | local addDiscoInfoHandler = require "core.discomanager".addDiscoInfoHandler; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
540
diff
changeset
|
27 | local eventmanager = require "core.eventmanager"; |
573
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
28 | local config = require "core.configmanager"; |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
29 | local multitable_new = require "util.multitable".new; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
540
diff
changeset
|
30 | |
30 | 31 | |
32 | local loadfile, pcall = loadfile, pcall; | |
33 | local setmetatable, setfenv, getfenv = setmetatable, setfenv, getfenv; | |
34 | local pairs, ipairs = pairs, ipairs; | |
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
35 | local t_insert = table.insert; |
30 | 36 | local type = type; |
37 | ||
38 | local tostring, print = tostring, print; | |
39 | ||
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
439
diff
changeset
|
40 | -- We need this to let modules access the real global namespace |
30 | 41 | local _G = _G; |
42 | ||
43 | module "modulemanager" | |
44 | ||
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
45 | local api = {}; -- Module API container |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
46 | |
584
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
47 | local modulemap = { ["*"] = {} }; |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
48 | |
591 | 49 | local stanza_handlers = multitable_new(); |
30 | 50 | local handler_info = {}; |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
51 | |
30 | 52 | local modulehelpers = setmetatable({}, { __index = _G }); |
53 | ||
573
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
54 | -- Load modules when a host is activated |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
55 | function load_modules_for_host(host) |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
56 | local modules_enabled = config.get(host, "core", "modules_enabled"); |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
57 | if modules_enabled then |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
58 | for _, module in pairs(modules_enabled) do |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
59 | load(host, module); |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
60 | end |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
61 | end |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
62 | end |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
63 | eventmanager.add_event_hook("host-activated", load_modules_for_host); |
f6555ebf84ec
Move module loading to modulemanager
Matthew Wild <mwild1@gmail.com>
parents:
569
diff
changeset
|
64 | -- |
30 | 65 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
66 | function load(host, module_name, config) |
439
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
67 | if not (host and module_name) then |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
68 | return nil, "insufficient-parameters"; |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
69 | end |
30 | 70 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
71 | if not modulemap[host] then |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
72 | modulemap[host] = {}; |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
73 | elseif modulemap[host][module_name] then |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
74 | log("warn", "%s is already loaded for %s, so not loading again", module_name, host); |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
75 | return nil, "module-already-loaded"; |
584
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
76 | elseif modulemap["*"][module_name] then |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
77 | return nil, "global-module-already-loaded"; |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
78 | end |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
79 | |
584
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
80 | |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
81 | local mod, err = loadfile(plugin_dir.."mod_"..module_name..".lua"); |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
82 | if not mod then |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
83 | log("error", "Unable to load module '%s': %s", module_name or "nil", err or "nil"); |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
84 | return nil, err; |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
85 | end |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
86 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
87 | local _log = logger.init(host..":"..module_name); |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
88 | local api_instance = setmetatable({ name = module_name, host = host, config = config, _log = _log, log = function (self, ...) return _log(...); end }, { __index = api }); |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
89 | |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
90 | local pluginenv = setmetatable({ module = api_instance }, { __index = _G }); |
30 | 91 | |
92 | setfenv(mod, pluginenv); | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
93 | |
30 | 94 | local success, ret = pcall(mod); |
95 | if not success then | |
96 | log("error", "Error initialising module '%s': %s", name or "nil", ret or "nil"); | |
391
79bd7a3e906c
Typo prevented modulemanager.load() from returning the error if load failed.
Matthew Wild <mwild1@gmail.com>
parents:
385
diff
changeset
|
97 | return nil, ret; |
30 | 98 | end |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
99 | |
584
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
100 | -- Use modified host, if the module set one |
eb0cea29c8d7
Temporary hack for global modules
Matthew Wild <mwild1@gmail.com>
parents:
579
diff
changeset
|
101 | modulemap[api_instance.host][module_name] = mod; |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
102 | |
229
01bd24ea488d
We now fail if modules fail to load at startup.
Waqas Hussain <waqas20@gmail.com>
parents:
218
diff
changeset
|
103 | return true; |
30 | 104 | end |
105 | ||
439
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
106 | function is_loaded(host, name) |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
107 | return modulemap[host] and modulemap[host][name] and true; |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
108 | end |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
109 | |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
110 | function unload(host, name, ...) |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
111 | local mod = modulemap[host] and modulemap[host][name]; |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
112 | if not mod then return nil, "module-not-loaded"; end |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
113 | |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
114 | if type(mod.unload) == "function" then |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
115 | local ok, err = pcall(mod.unload, ...) |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
116 | if (not ok) and err then |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
117 | log("warn", "Non-fatal error unloading module '%s' from '%s': %s", name, host, err); |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
118 | end |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
119 | end |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
120 | |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
121 | end |
6608ad3a72f3
is_loaded() and incomplete unload() for modules
Matthew Wild <mwild1@gmail.com>
parents:
438
diff
changeset
|
122 | |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
123 | function handle_stanza(host, origin, stanza) |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
124 | local name, xmlns, origin_type = stanza.name, stanza.attr.xmlns, origin.type; |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
125 | if name == "iq" and xmlns == "jabber:client" then |
608
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
126 | if stanza.attr.type == "get" or stanza.attr.type == "set" then |
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
127 | xmlns = stanza.tags[1].attr.xmlns; |
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
128 | log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns); |
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
129 | else |
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
130 | log("debug", "Discarding %s from %s of type: %s", name, origin_type, stanza.attr.type); |
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
131 | return true; |
3758af511ce8
Don't try processing stanzas not of type get or set in module manager
Waqas Hussain <waqas20@gmail.com>
parents:
592
diff
changeset
|
132 | end |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
133 | end |
591 | 134 | local handlers = stanza_handlers:get(host, origin_type, name, xmlns); |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
135 | if handlers then |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
136 | log("debug", "Passing stanza to mod_%s", handler_info[handlers[1]].name); |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
137 | (handlers[1])(origin, stanza); |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
138 | return true; |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
139 | else |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
140 | log("debug", "Stanza unhandled by any modules, xmlns: %s", stanza.attr.xmlns); -- we didn't handle it |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
141 | end |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
142 | end |
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
143 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
144 | ----- API functions exposed to modules ----------- |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
145 | -- Must all be in api.* |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
146 | |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
147 | -- Returns the name of the current module |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
148 | function api:get_name() |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
149 | return self.name; |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
150 | end |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
151 | |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
152 | -- Returns the host that the current module is serving |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
153 | function api:get_host() |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
154 | return self.host; |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
155 | end |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
156 | |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
157 | local function _add_handler(module, origin_type, tag, xmlns, handler) |
591 | 158 | local handlers = stanza_handlers:get(module.host, origin_type, tag, xmlns); |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
159 | local msg = (tag == "iq") and "namespace" or "payload namespace"; |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
160 | if not handlers then |
591 | 161 | stanza_handlers:add(module.host, origin_type, tag, xmlns, handler); |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
162 | handler_info[handler] = module; |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
163 | module:log("debug", "I now handle tag '%s' [%s] with %s '%s'", tag, origin_type, msg, xmlns); |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
164 | else |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
165 | module:log("warn", "I wanted to handle tag '%s' [%s] with %s '%s' but mod_%s already handles that", tag, origin_type, msg, xmlns, handler_info[handlers[1]].module.name); |
578
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
166 | end |
5879264e28e2
Changed module manager to use multitable (initial commit)
Waqas Hussain <waqas20@gmail.com>
parents:
573
diff
changeset
|
167 | end |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
168 | |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
169 | function api:add_handler(origin_type, tag, xmlns, handler) |
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
170 | if not (origin_type and tag and xmlns and handler) then return false; end |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
171 | if type(origin_type) == "table" then |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
172 | for _, origin_type in ipairs(origin_type) do |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
173 | _add_handler(self, origin_type, tag, xmlns, handler); |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
174 | end |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
175 | else |
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
176 | _add_handler(self, origin_type, tag, xmlns, handler); |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
177 | end |
590
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
178 | end |
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
179 | function api:add_iq_handler(origin_type, xmlns, handler) |
54afe37cccbf
Combined and merged similar code
Waqas Hussain <waqas20@gmail.com>
parents:
589
diff
changeset
|
180 | self:add_handler(origin_type, "iq", xmlns, handler); |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
181 | end |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
182 | |
540
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
183 | function api:add_feature(xmlns) |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
184 | addDiscoInfoHandler(self.host, function(reply, to, from, node) |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
185 | if #node == 0 then |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
186 | reply:tag("feature", {var = xmlns}):up(); |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
187 | return true; |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
188 | end |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
189 | end); |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
190 | end |
ec03f6968fa8
Added function add_feature to modules API (for adding disco features)
Waqas Hussain <waqas20@gmail.com>
parents:
519
diff
changeset
|
191 | |
577
22f54a04471f
Fix add_event_hook in module API
Matthew Wild <mwild1@gmail.com>
parents:
573
diff
changeset
|
192 | function api:add_event_hook (...) return eventmanager.add_event_hook(...); end |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
193 | |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
194 | -------------------------------------------------------------------- |
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
400
diff
changeset
|
195 | |
39
89877d61ac51
Add support for arbitrary events and event hooks
Matthew Wild <mwild1@gmail.com>
parents:
38
diff
changeset
|
196 | return _M; |