Mercurial > prosody-hg
comparison plugins/muc/muc.lib.lua @ 10294:b61a7173f838
Merge 0.11-trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 29 Sep 2019 20:48:58 +0200 |
| parents | a53126b7fe22 f9301d93de72 |
| children | 7b602e13c3b6 |
comparison
equal
deleted
inserted
replaced
| 10292:8fb546e40756 | 10294:b61a7173f838 |
|---|---|
| 775 if not o_data then | 775 if not o_data then |
| 776 origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room")); | 776 origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room")); |
| 777 return true; | 777 return true; |
| 778 end | 778 end |
| 779 log("debug", "%s sent private message stanza to %s (%s)", from, to, o_data.jid); | 779 log("debug", "%s sent private message stanza to %s (%s)", from, to, o_data.jid); |
| 780 stanza = muc_util.filter_muc_x(st.clone(stanza)); | |
| 780 stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up(); | 781 stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up(); |
| 781 stanza.attr.from = current_nick; | 782 stanza.attr.from = current_nick; |
| 782 self:route_to_occupant(o_data, stanza) | 783 self:route_to_occupant(o_data, stanza) |
| 783 -- TODO: Remove x tag? | 784 -- TODO: Remove x tag? |
| 784 stanza.attr.from = from; | 785 stanza.attr.from = from; |
