prosody
e6f735c62c5d
tools/ejabberd2prosody.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Diff

tools/ejabberd2prosody.lua @ 6008:e6f735c62c5d

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 03 Feb 2014 07:25:05 +0100
parent 6007:ff24bc2d41a6
child 6027:8c69cea8a1bf
line wrap: on
line diff
--- a/tools/ejabberd2prosody.lua	Tue Jan 21 03:26:04 2014 +0000
+++ b/tools/ejabberd2prosody.lua	Mon Feb 03 07:25:05 2014 +0100
@@ -163,7 +163,7 @@
 function muc_room(node, host, properties)
 	local store = { jid = node.."@"..host, _data = {}, _affiliations = {} };
 	for _,aff in ipairs(properties.affiliations) do
-		store._affiliations[_table_to_jid(aff[1])] = aff[2];
+		store._affiliations[_table_to_jid(aff[1])] = aff[2][1] or aff[2];
 	end
 	store._data.subject = properties.subject;
 	if properties.subject_author then