Remove version number from copyright headers

[prosody.git] / tools / ejabberd2prosody.lua

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index 2f837497c38114b1a7946534e5a8b9d5ea9bb9fc..14a4d1d770594108eee5656933007ec9ff3109e2 100755 (executable)
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -1,21 +1,10 @@
 #!/usr/bin/env lua
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
@@ -57,15 +46,22 @@ function password(node, host, password)
        local ret, err = dm.store(node, host, "accounts", {password = password});\r
        print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);\r
 end\r
-function roster(node, host, jid, item)\r
-       local roster = dm.load(node, host, "roster") or {};\r
-       roster[jid] = item;\r
-       local ret, err = dm.store(node, host, "roster", roster);\r
-       print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid);\r
-end\r
+function roster(node, host, jid, item)
+       local roster = dm.load(node, host, "roster") or {};
+       roster[jid] = item;
+       local ret, err = dm.store(node, host, "roster", roster);
+       print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid);
+end
+function roster_pending(node, host, jid)
+       local roster = dm.load(node, host, "roster") or {};
+       roster.pending = roster.pending or {};
+       roster.pending[jid] = true;
+       local ret, err = dm.store(node, host, "roster", roster);
+       print("["..(err or "success").."] roster: " ..node.."@"..host.." - "..jid);
+end
 function private_storage(node, host, xmlns, stanza)\r
        local private = dm.load(node, host, "private") or {};\r
-       private[xmlns] = st.preserialize(stanza);\r
+       private[stanza.name..":"..xmlns] = st.preserialize(stanza);\r
        local ret, err = dm.store(node, host, "private", private);\r
        print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns);\r
 end\r
@@ -90,7 +86,10 @@ local filters = {
                local name = tuple[5]; local subscription = tuple[6];\r
                local ask = tuple[7]; local groups = tuple[8];\r
                if type(name) ~= type("") then name = nil; end\r
-               if ask == "none" then ask = nil; elseif ask == "out" then ask = "subscribe" else error(ask) end\r
+               if ask == "none" then ask = nil; elseif ask == "out" then ask = "subscribe" elseif ask == "in" then
+                       roster_pending(node, host, contact);
+                       return;
+               else error(ask) end\r
                if subscription ~= "both" and subscription ~= "from" and subscription ~= "to" and subscription ~= "none" then error(subscription) end\r
                local item = {name = name, ask = ask, subscription = subscription, groups = {}};\r
                for _, g in ipairs(groups) do item.groups[g] = true; end\r