comparison plugins/mod_presence.lua @ 6285:ea60d0441df7

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 21 Jun 2014 15:05:52 +0200
parents 8dc01fa767e0
children 7a604381d6fc
comparison
equal deleted inserted replaced
6278:fcc3ef191293 6285:ea60d0441df7
135 core_post_stanza(origin, stanza, true); 135 core_post_stanza(origin, stanza, true);
136 end 136 end
137 origin.directed = nil; 137 origin.directed = nil;
138 end 138 end
139 else 139 else
140 if not origin.presence then
141 module:fire_event("presence/initial", { origin = origin, stanza = stanza } );
142 end
140 origin.presence = stanza; 143 origin.presence = stanza;
141 stanza:tag("delay", { xmlns = "urn:xmpp:delay", from = host, stamp = datetime.datetime() }):up(); 144 stanza:tag("delay", { xmlns = "urn:xmpp:delay", from = host, stamp = datetime.datetime() }):up();
142 if origin.priority ~= priority then 145 if origin.priority ~= priority then
143 origin.priority = priority; 146 origin.priority = priority;
144 recalc_resource_map(user); 147 recalc_resource_map(user);