Merge 0.9->0.10

[prosody.git] / plugins / mod_privacy.lua

diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua
index a1b7acffd6f2c6ff880afd330475d6a9d04c3c5b..b749b7c72a73ef82038f93f9f159bb47e692bb89 100644 (file)
--- a/plugins/mod_privacy.lua
+++ b/plugins/mod_privacy.lua
@@ -1,31 +1,13 @@
 -- Prosody IM
--- Copyright (C) 2008-2010 Matthew Wild
--- Copyright (C) 2008-2010 Waqas Hussain
--- 
+-- Copyright (C) 2009-2010 Matthew Wild
+-- Copyright (C) 2009-2010 Waqas Hussain
+-- Copyright (C) 2009 Thilo Cestonaro
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 
-local st = require "util.stanza";
-local datamanager = require "util.datamanager";
-
-module:hook("iq/bare/jabber:iq:privacy:query", function(data)
-       local origin, stanza = data.origin, data.stanza;
-       
-       if not stanza.attr.to then -- only service requests to own bare JID
-               local query = stanza.tags[1]; -- the query element
-               local privacy_lists = datamanager.load(origin.username, origin.host, "privacy") or {};
-               if stanza.attr.type == "set" then
-                       -- TODO
-               elseif stanza.attr.type == "get" then
-                       if #query.tags == 0 then -- Client requests names of privacy lists from server
-                               -- TODO
-                       elseif #query.tags == 1 and query.tags[1].name == "list" then -- Client requests a privacy list from server
-                               -- TODO
-                       else
-                               origin.send(st.error_reply(stanza, "modify", "bad-request"));
-                       end
-               end
-       end
-end);
+-- COMPAT w/ pre 0.10
+module:log("error", "The mod_privacy plugin has been replaced by mod_blocklist. Please update your config. For more information see https://prosody.im/doc/modules/mod_privacy");
+module:depends("blocklist");