aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-08-31 16:15:09 +0200
committerKim Alvefur <zash@zash.se>2019-08-31 16:15:09 +0200
commit66fdfe3c005e8e2fda23efa918e85d890bc632c4 (patch)
tree2e8baeab173feae34415c940987bc813ad40fb00
parent887ccb25c5a26f7d645e626b3ad915cf84793dde (diff)
parenta280be7c083c132775efe5c8751ced5cadece49f (diff)
downloadprosody-66fdfe3c005e8e2fda23efa918e85d890bc632c4.tar.gz
prosody-66fdfe3c005e8e2fda23efa918e85d890bc632c4.zip
Merge 0.11->trunk
-rw-r--r--plugins/muc/history.lib.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/history.lib.lua b/plugins/muc/history.lib.lua
index 445aacb9..0d69c97d 100644
--- a/plugins/muc/history.lib.lua
+++ b/plugins/muc/history.lib.lua
@@ -178,10 +178,10 @@ module:hook("muc-add-history", function(event)
local ts = gettime();
local stamp = datetime.datetime(ts);
stanza:tag("delay", { -- XEP-0203
- xmlns = "urn:xmpp:delay", from = module.host, stamp = stamp
+ xmlns = "urn:xmpp:delay", from = room.jid, stamp = stamp
}):up();
stanza:tag("x", { -- XEP-0091 (deprecated)
- xmlns = "jabber:x:delay", from = module.host, stamp = datetime.legacy()
+ xmlns = "jabber:x:delay", from = room.jid, stamp = datetime.legacy()
}):up();
local entry = { stanza = stanza, timestamp = ts };
table.insert(history, entry);