projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
51e536c
)
ejabberdsql2prosody: Fixed: pending-in subscriptions could halt processing
author
Waqas Hussain
<waqas20@gmail.com>
Sun, 26 Jul 2009 10:28:04 +0000
(15:28 +0500)
committer
Waqas Hussain
<waqas20@gmail.com>
Sun, 26 Jul 2009 10:28:04 +0000
(15:28 +0500)
tools/ejabberdsql2prosody.lua
patch
|
blob
|
history
diff --git
a/tools/ejabberdsql2prosody.lua
b/tools/ejabberdsql2prosody.lua
index 772f9214cbfc7cc84c02f17bdfae4faefe669911..6fd73fdda09e071c48f04b45cb2aab967756aea1 100644
(file)
--- a/
tools/ejabberdsql2prosody.lua
+++ b/
tools/ejabberdsql2prosody.lua
@@
-195,7
+195,7
@@
function roster_pending(node, host, jid)
roster.pending = roster.pending or {};
roster.pending[jid] = true;
local ret, err = dm.store(node, host, "roster", roster);
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);
+ print("["..(err or "success").."] roster
-pending
: " ..node.."@"..host.." - "..jid);
end
function roster_group(node, host, jid, group)
local roster = dm.load(node, host, "roster") or {};
end
function roster_group(node, host, jid, group)
local roster = dm.load(node, host, "roster") or {};
@@
-203,7
+203,7
@@
function roster_group(node, host, jid, group)
if not item then print("Warning: No roster item "..jid.." for user "..user..", can't put in group "..group); return; end
item.groups[group] = true;
local ret, err = dm.store(node, host, "roster", roster);
if not item then print("Warning: No roster item "..jid.." for user "..user..", can't put in group "..group); return; end
item.groups[group] = true;
local ret, err = dm.store(node, host, "roster", roster);
- print("["..(err or "success").."] roster
: " ..node.."@"..host.." - "..jid
);
+ print("["..(err or "success").."] roster
-group: " ..node.."@"..host.." - "..jid.." - "..group
);
end
for i, row in ipairs(t["rosterusers"] or NULL) do
local node, contact = row.username, row.jid;
end
for i, row in ipairs(t["rosterusers"] or NULL) do
local node, contact = row.username, row.jid;
@@
-226,7
+226,6
@@
for i, row in ipairs(t["rosterusers"] or NULL) do
ask = "subscribe";
elseif ask == "I" then
roster_pending(node, host, contact);
ask = "subscribe";
elseif ask == "I" then
roster_pending(node, host, contact);
- return;
else error("Unknown ask type: "..ask); end
local item = {name = name, ask = ask, subscription = subscription, groups = {}};
roster(node, host, contact, item);
else error("Unknown ask type: "..ask); end
local item = {name = name, ask = ask, subscription = subscription, groups = {}};
roster(node, host, contact, item);