aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Shestakov <av6@dwimlabs.net>2016-08-12 13:44:47 +0800
committerAnton Shestakov <av6@dwimlabs.net>2016-08-12 13:44:47 +0800
commit727e4c4f90b6402cce27e475c1385d627eab4af6 (patch)
treee29a35ec9a95576d42f04689a32cd644609ccb42
parent09bd46d141424f39f91dd0edf0a5534ab23f9105 (diff)
downloadprosody-727e4c4f90b6402cce27e475c1385d627eab4af6.tar.gz
prosody-727e4c4f90b6402cce27e475c1385d627eab4af6.zip
ejabberdsql2prosody: rename variable 'host' to prevent shadowing upvalue [luacheck]
Functions roster(), roster_pending(), roster_group(), private_storage() and offline_msg() have argument named "host", which used to shadow upvalue of this variable before this change. Instead of renaming this argument, let's rename the variable to match what the script says in usage: Usage: ejabberdsql2prosody.lua filename.txt hostname
-rw-r--r--tools/ejabberdsql2prosody.lua30
1 files changed, 15 insertions, 15 deletions
diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua
index be42f256..f65ada6f 100644
--- a/tools/ejabberdsql2prosody.lua
+++ b/tools/ejabberdsql2prosody.lua
@@ -172,9 +172,9 @@ return readFile(filename);
------
end
-local arg, host = ...;
+local arg, hostname = ...;
local help = "/? -? ? /h -h /help -help --help";
-if not(arg and host) or help:find(arg, 1, true) then
+if not(arg and hostname) or help:find(arg, 1, true) then
print([[ejabberd SQL DB dump importer for Prosody
Usage: ejabberdsql2prosody.lua filename.txt hostname
@@ -217,8 +217,8 @@ end
for _, row in ipairs(t["users"] or NULL) do
local node, password = row.username, row.password;
- local ret, err = dm.store(node, host, "accounts", {password = password});
- print("["..(err or "success").."] accounts: "..node.."@"..host);
+ local ret, err = dm.store(node, hostname, "accounts", {password = password});
+ print("["..(err or "success").."] accounts: "..node.."@"..hostname);
end
function roster(node, host, jid, item)
@@ -274,33 +274,33 @@ for _, row in ipairs(t["rosterusers"] or NULL) do
elseif ask == "O" then
ask = "subscribe";
elseif ask == "I" then
- roster_pending(node, host, contact);
+ roster_pending(node, hostname, contact);
ask = nil;
elseif ask == "B" then
- roster_pending(node, host, contact);
+ roster_pending(node, hostname, contact);
ask = "subscribe";
else error("Unknown ask type: "..ask); end
local item = {name = name, ask = ask, subscription = subscription, groups = {}};
- roster(node, host, contact, item);
+ roster(node, hostname, contact, item);
end
for _, row in ipairs(t["rostergroups"] or NULL) do
- roster_group(row.username, host, row.jid, row.grp);
+ roster_group(row.username, hostname, row.jid, row.grp);
end
for _, row in ipairs(t["vcard"] or NULL) do
local stanza, err = parse_xml(row.vcard);
if stanza then
- local ret, err = dm.store(row.username, host, "vcard", st.preserialize(stanza));
- print("["..(err or "success").."] vCard: "..row.username.."@"..host);
+ local ret, err = dm.store(row.username, hostname, "vcard", st.preserialize(stanza));
+ print("["..(err or "success").."] vCard: "..row.username.."@"..hostname);
else
- print("[error] vCard XML parse failed: "..row.username.."@"..host);
+ print("[error] vCard XML parse failed: "..row.username.."@"..hostname);
end
end
for _, row in ipairs(t["private_storage"] or NULL) do
local stanza, err = parse_xml(row.data);
if stanza then
- private_storage(row.username, host, row.namespace, stanza);
+ private_storage(row.username, hostname, row.namespace, stanza);
else
- print("[error] Private XML parse failed: "..row.username.."@"..host);
+ print("[error] Private XML parse failed: "..row.username.."@"..hostname);
end
end
table.sort(t["spool"] or NULL, function(a,b) return a.seq < b.seq; end); -- sort by sequence number, just in case
@@ -317,8 +317,8 @@ for _, row in ipairs(t["spool"] or NULL) do
if last_child.name ~= "x" and last_child.attr.xmlns ~= "jabber:x:delay" then error("Last child of offline message is not a timestamp"); end
stanza[#stanza], stanza.tags[#stanza.tags] = nil, nil;
local t = date_parse(last_child.attr.stamp);
- offline_msg(row.username, host, t, stanza);
+ offline_msg(row.username, hostname, t, stanza);
else
- print("[error] Offline message XML parsing failed: "..row.username.."@"..host);
+ print("[error] Offline message XML parsing failed: "..row.username.."@"..hostname);
end
end