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 c6811928a1e4169baa70ea22f7bdddf305054970..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;
@@ -102,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(
@@ -193,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