projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dc0dc8f
)
mod_privacy: Upgrade old privacy lists to new storage format, so they don't get lost
author
Matthew Wild
<mwild1@gmail.com>
Fri, 12 Feb 2010 12:07:46 +0000
(12:07 +0000)
committer
Matthew Wild
<mwild1@gmail.com>
Fri, 12 Feb 2010 12:07:46 +0000
(12:07 +0000)
plugins/mod_privacy.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_privacy.lua
b/plugins/mod_privacy.lua
index d6ff9761e2625e46bfefe7760517f9c4584c3509..1cb931e05db9da34bbf60ecfd8db6c5d7f928a94 100644
(file)
--- a/
plugins/mod_privacy.lua
+++ b/
plugins/mod_privacy.lua
@@
-303,7
+303,16
@@
module:hook("iq/bare/jabber:iq:privacy:query", function(data)
if stanza.attr.to == nil then -- only service requests to own bare JID
local query = stanza.tags[1]; -- the query element
local valid = false;
if stanza.attr.to == nil then -- only service requests to own bare JID
local query = stanza.tags[1]; -- the query element
local valid = false;
- local privacy_lists = datamanager.load(origin.username, origin.host, "privacy") or {};
+ local privacy_lists = datamanager.load(origin.username, origin.host, "privacy") or { lists = {} };
+
+ if privacy_lists.lists[1] then -- Code to migrate from old privacy lists format, remove in 0.8
+ module:log("info", "Upgrading format of stored privacy lists for %s@%s", origin.username, origin.host);
+ local lists = privacy_lists.lists;
+ for idx, list in ipairs(lists) do
+ lists[list.name] = list;
+ lists[idx] = nil;
+ end
+ end
if stanza.attr.type == "set" then
if #query.tags == 1 then -- the <query/> element MUST NOT include more than one child element
if stanza.attr.type == "set" then
if #query.tags == 1 then -- the <query/> element MUST NOT include more than one child element