mod_welcome: Use module:hook instead of module:add_event_hook

[prosody.git] / plugins / mod_presence.lua

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 7c34eefa835a2706d1a6991c3ea3ff1ed2177bcd..ba71b940de3c4a13d69e5ce6982fc1cf1f1da91b 100644 (file)
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -6,9 +6,7 @@
 -- COPYING file in the source package for more information.\r
 --\r
 \r
-\r
-\r
-local log = require "util.logger".init("mod_presence")\r
+local log = module._log;\r
 \r
 local require = require;\r
 local pairs, ipairs = pairs, ipairs;\r
@@ -134,7 +132,7 @@ function handle_normal_presence(origin, stanza, core_route_stanza)
                end\r
                stanza.attr.to = nil; -- reset it\r
        else\r
-               log("error", "presence recieved from client with no roster");\r
+               log("warn", "presence recieved from client with no roster");\r
        end\r
 end\r
 \r
@@ -148,16 +146,14 @@ function send_presence_of_available_resources(user, host, jid, recipient_session
                                local pres = session.presence;\r
                                if pres then\r
                                        pres.attr.to = jid;\r
-                                       pres.attr.from = session.full_jid;\r
                                        core_route_stanza(session, pres);\r
                                        pres.attr.to = nil;\r
-                                       pres.attr.from = nil;\r
                                        count = count + 1;\r
                                end\r
                        end\r
                end\r
        end\r
-       log("info", "broadcasted presence of "..count.." resources from "..user.."@"..host.." to "..jid);\r
+       log("debug", "broadcasted presence of "..count.." resources from "..user.."@"..host.." to "..jid);\r
        return count;\r
 end\r
 \r
@@ -271,10 +267,7 @@ local function presence_handler(data)
        return true;\r
 end\r
 \r
-local add_handler = require "core.eventmanager2".add_handler;\r
-local remove_handler = require "core.eventmanager2".remove_handler;\r
-\r
-add_handler(module:get_host().."/presence", presence_handler);\r
+prosody.events.add_handler(module:get_host().."/presence", presence_handler);\r
 module.unload = function()\r
-       remove_handler(module:get_host().."/presence", presence_handler);\r
+       prosody.events.remove_handler(module:get_host().."/presence", presence_handler);\r
 end\r