mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-06 06:37:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-02-20 01:46:54 +01:00
commit 50992abb10
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_mam/mamprefsxml.lib.lua
View file

@ -10,7 +10,7 @@
--
local st = require"util.stanza";
local xmlns_mam = "urn:xmpp:mam:1";
local xmlns_mam = "urn:xmpp:mam:2";
local default_attrs = {
always = true, [true] = "always",

24
plugins/mod_mam/mod_mam.lua
View file

@ -9,7 +9,7 @@
-- XEP-0313: Message Archive Management for Prosody
--
local xmlns_mam = "urn:xmpp:mam:1";
local xmlns_mam = "urn:xmpp:mam:2";
local xmlns_delay = "urn:xmpp:delay";
local xmlns_forward = "urn:xmpp:forward:0";
local xmlns_st_id = "urn:xmpp:sid:0";
@ -89,7 +89,7 @@ local query_form = dataform {
-- Serve form
module:hook("iq-get/self/"..xmlns_mam..":query", function(event)
local origin, stanza = event.origin, event.stanza;
origin.send(st.reply(stanza):add_child(query_form:form()));
origin.send(st.reply(stanza):query(xmlns_mam):add_child(query_form:form()));
return true;
end);
@ -134,7 +134,6 @@ module:hook("iq-set/self/"..xmlns_mam..":query", function(event)
local before, after = qset and qset.before, qset and qset.after;
if type(before) ~= "string" then before = nil; end
-- Load all the data!
local data, err = archive:find(origin.username, {
start = qstart; ["end"] = qend; -- Time range
@ -292,8 +291,9 @@ local function message_handler(event, c2s)
log("debug", "Archiving stanza: %s", stanza:top_tag());
-- And stash it
local ok, id = archive:append(store_user, nil, stanza, time_now(), with);
local ok = archive:append(store_user, nil, stanza, time_now(), with);
if ok then
local id = ok;
stanza:tag("stanza-id", { xmlns = xmlns_st_id, by = store_user.."@"..host, id = id }):up();
if cleanup then cleanup[store_user] = true; end
module:fire_event("archive-message-added", { origin = origin, stanza = stanza, for_user = store_user, id = id });
@ -307,6 +307,18 @@ local function c2s_message_handler(event)
return message_handler(event, true);
end
local function strip_stanza_id(event)
local strip_by = jid_bare(event.origin.full_jid);
event.stanza:maptags(function(tag)
if not ( tag.attr.xmlns == xmlns_st_id and tag.attr.by == strip_by ) then
return tag;
end
end);
end
module:hook("pre-message/bare", strip_stanza_id, -1);
module:hook("pre-message/full", strip_stanza_id, -1);
local cleanup_after = module:get_option_string("archive_expires_after", "1w");
local cleanup_interval = module:get_option_number("archive_cleanup_interval", 4 * 60 * 60);
if cleanup_after ~= "never" then
@ -334,7 +346,7 @@ if cleanup_after ~= "never" then
-- Iterating over users is not supported by all authentication modules
-- Catch and ignore error if not supported
pcall(function ()
-- If this works, then we schedule cleanup for all known known
-- If this works, then we schedule cleanup for all known users on startup
for user in um.users(module.host) do
cleanup[user] = true;
end
@ -360,7 +372,7 @@ end
-- Stanzas sent by local clients
module:hook("pre-message/bare", c2s_message_handler, 0);
module:hook("pre-message/full", c2s_message_handler, 0);
-- Stanszas to local clients
-- Stanzas to local clients
module:hook("message/bare", message_handler, 0);
module:hook("message/full", message_handler, 0);

4
plugins/mod_storage_sql.lua
View file

@ -187,7 +187,7 @@ function archive_store:append(username, key, value, when, with)
when, with, value = value, when, with;
end
local user,store = username,self.store;
return engine:transaction(function()
local ok, key = engine:transaction(function()
if key then
engine:delete("DELETE FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?", host, user or "", store, key);
else
@ -197,6 +197,8 @@ function archive_store:append(username, key, value, when, with)
engine:insert("INSERT INTO `prosodyarchive` (`host`, `user`, `store`, `when`, `with`, `key`, `type`, `value`) VALUES (?,?,?,?,?,?,?,?)", host, user or "", store, when, with, key, t, value);
return key;
end);
if not ok then return ok, key; end
return key;
end
-- Helpers for building the WHERE clause