prosody
ff24bc2d41a6
tools/ejabberd2prosody.lua

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

Software / code / prosody

Comparison

tools/ejabberd2prosody.lua @ 6007:ff24bc2d41a6

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Mon, 03 Feb 2014 07:23:33 +0100
parent 6000:0f6399c86c10
parent 6006:95ce7bfbfa6f
child 6027:8c69cea8a1bf
comparison
equal deleted inserted replaced
6005:98b768a41c9d 6007:ff24bc2d41a6
161 end 161 end
162 end 162 end
163 function muc_room(node, host, properties) 163 function muc_room(node, host, properties)
164 local store = { jid = node.."@"..host, _data = {}, _affiliations = {} }; 164 local store = { jid = node.."@"..host, _data = {}, _affiliations = {} };
165 for _,aff in ipairs(properties.affiliations) do 165 for _,aff in ipairs(properties.affiliations) do
166 store._affiliations[_table_to_jid(aff[1])] = aff[2]; 166 store._affiliations[_table_to_jid(aff[1])] = aff[2][1] or aff[2];
167 end 167 end
168 store._data.subject = properties.subject; 168 store._data.subject = properties.subject;
169 if properties.subject_author then 169 if properties.subject_author then
170 store._data.subject_from = store.jid .. "/" .. properties.subject_author; 170 store._data.subject_from = store.jid .. "/" .. properties.subject_author;
171 end 171 end