aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Wielicki <jonas@wielicki.name>2017-12-09 17:36:47 +0100
committerJonas Wielicki <jonas@wielicki.name>2017-12-09 17:36:47 +0100
commitd9168aba800891206045ac15a5b8ad7deddb4936 (patch)
tree6d7c3171b8a32e289227cbfdba3c9fde22029048
parent124a5ecabbd925b660b678d68e81d45a816dd4b0 (diff)
downloadprosody-d9168aba800891206045ac15a5b8ad7deddb4936.tar.gz
prosody-d9168aba800891206045ac15a5b8ad7deddb4936.zip
MUC: fix the @from on <delay/> in history replay (fixes #1054)
-rw-r--r--plugins/muc/muc.lib.lua4
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