aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-29 20:17:21 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-29 20:17:21 +0100
commitac2c84b749ab005099d27195c587edd1be640649 (patch)
treea990c181c9fd47e3e92d21bdc138ccaa778bf740 /plugins
parent9e70620d2631fff90974f2c40f435b15d8e386b1 (diff)
parent5a862cb1afc932a2a72b4f569024dd5aaddcc6b8 (diff)
downloadprosody-ac2c84b749ab005099d27195c587edd1be640649.tar.gz
prosody-ac2c84b749ab005099d27195c587edd1be640649.zip
Merge 0.7->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_compression.lua2
-rw-r--r--plugins/mod_privacy.lua2
-rw-r--r--plugins/mod_register.lua1
3 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_compression.lua b/plugins/mod_compression.lua
index 9edee44a..d890931f 100644
--- a/plugins/mod_compression.lua
+++ b/plugins/mod_compression.lua
@@ -56,7 +56,7 @@ module:hook_stanza(xmlns_stream, "features",
local algorithm = a[1]
if algorithm == "zlib" then
session.sends2s(st.stanza("compress", {xmlns=xmlns_compression_protocol}):tag("method"):text("zlib"))
- session.log("info", "Enabled compression using zlib.")
+ session.log("debug", "Enabled compression using zlib.")
return true;
end
end
diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua
index 8dbc2bc4..10f44950 100644
--- a/plugins/mod_privacy.lua
+++ b/plugins/mod_privacy.lua
@@ -301,7 +301,7 @@ function checkIfNeedToBeBlocked(e, session)
local origin, stanza = e.origin, e.stanza;
local privacy_lists = datamanager.load(session.username, session.host, "privacy") or {};
local bare_jid = session.username.."@"..session.host;
- local to = stanza.attr.to;
+ local to = stanza.attr.to or bare_jid;
local from = stanza.attr.from;
local is_to_user = bare_jid == jid_bare(to);
diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 7e150ac7..a35b4c5c 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -59,6 +59,7 @@ module:add_iq_handler("c2s", "jabber:iq:register", function (session, stanza)
end
end
datamanager.store(username, host, "roster", nil);
+ datamanager.store(username, host, "privacy", nil);
datamanager.store(username, host, "accounts", nil); -- delete accounts datastore at the end
module:log("info", "User removed their account: %s@%s", username, host);
module:fire_event("user-deregistered", { username = username, host = host, source = "mod_register", session = session });