diff options
author | Jonas Wielicki <jonas@wielicki.name> | 2017-12-09 17:36:47 +0100 |
---|---|---|
committer | Jonas Wielicki <jonas@wielicki.name> | 2017-12-09 17:36:47 +0100 |
commit | 2e7e1a301c23d055090c7926e06b58a0049da563 (patch) | |
tree | 6d7c3171b8a32e289227cbfdba3c9fde22029048 /plugins/muc/muc.lib.lua | |
parent | f535c57dd1b8d484da74686a75a83a763ba21be6 (diff) | |
download | prosody-2e7e1a301c23d055090c7926e06b58a0049da563.tar.gz prosody-2e7e1a301c23d055090c7926e06b58a0049da563.zip |
MUC: fix the @from on <delay/> in history replay (fixes #1054)
Diffstat (limited to 'plugins/muc/muc.lib.lua')
-rw-r--r-- | plugins/muc/muc.lib.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 4b299bde..0dfdd1aa 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -135,8 +135,8 @@ function room_mt:broadcast_message(stanza, historic) stanza = st.clone(stanza); stanza.attr.to = ""; local stamp = datetime.datetime(); - stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = stamp}):up(); -- XEP-0203 - stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated) + stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = self.jid, stamp = stamp}):up(); -- XEP-0203 + stanza:tag("x", {xmlns = "jabber:x:delay", from = self.jid, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated) local entry = { stanza = stanza, stamp = stamp }; t_insert(history, entry); while #history > (self._data.history_length or default_history_length) do t_remove(history, 1) end |