mod_uptime: Fix bad uptime if module is loaded at startup

[prosody.git] / plugins / mod_pep.lua

diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 78098423c64fb67a25ade0b93c7aa42921f17c51..8cc4aedfb6004a5c85417802c8608273b8a2fc8a 100644 (file)
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local jid_bare = require "util.jid".bare;
 local jid_split = require "util.jid".split;
@@ -33,8 +41,10 @@ local function publish(session, node, item)
        -- store for the future
        local user_data = data[bare];
        if disable then
-               if user_data then user_data[node] = nil; end
-               if not next(user_data) then data[bare] = nil; end
+               if user_data then
+                       user_data[node] = nil;
+                       if not next(user_data) then data[bare] = nil; end
+               end
        else
                if not user_data then user_data = {}; data[bare] = user_data; end
                user_data[node] = stanza;
@@ -52,8 +62,9 @@ local function publish_all(user, recipient, session)
        local d = data[user];
        local notify = recipients[user] and recipients[user][recipient];
        if d and notify then
-               for node, message in pairs(notify) do
-                       if d[node] then
+               for node in pairs(notify) do
+                       local message = d[node];
+                       if message then
                                message.attr.to = recipient;
                                session.send(message);
                        end
@@ -99,7 +110,7 @@ module:hook("presence/bare", function(event)
                        recipients[user] = recipients[user] or {};
                        if hash_map[hash] then
                                recipients[user][recipient] = hash_map[hash];
-                               publish_all(user, recipient);
+                               publish_all(user, recipient, origin);
                        else
                                recipients[user][recipient] = hash;
                                origin.send(
@@ -190,7 +201,7 @@ module:hook("iq/bare/disco", function(event)
                        local notify = {};
                        for _, feature in pairs(disco.tags) do
                                if feature.name == "feature" and feature.attr.var then
-                                       local nfeature = feature.attr.var:match("^(.*)+notify$");
+                                       local nfeature = feature.attr.var:match("^(.*)%+notify$");
                                        if nfeature then notify[nfeature] = true; end
                                end
                        end