Soliloquy

# HG changeset patch # User Kim Alvefur # Date 1634659910 -7200 # Node ID b605cbd5f13b06632490398808db993a8b60b297 # Parent ae5ac9830add772516c7622ff005e1eaa37692e5 mod_pubsub,mod_pep: Implement 'send_last_published_item' option #1436 Default left as 'never' in mod_pubsub to preserve the previous behavior. Unclear if this is desirable, but can always be changed later. In mod_pep this allows turning off the automatic resending of most recent item. diff -r ae5ac9830add -r b605cbd5f13b plugins/mod_pep.lua --- a/plugins/mod_pep.lua Tue Oct 19 16:37:32 2021 +0200 +++ b/plugins/mod_pep.lua Tue Oct 19 18:11:50 2021 +0200 @@ -187,6 +187,7 @@ ["max_items"] = 1; ["persist_items"] = true; ["access_model"] = "presence"; + ["send_last_published_item"] = "on_sub_and_presence"; }; autocreate_on_publish = true; @@ -260,6 +261,8 @@ end local function resend_last_item(jid, node, service) + local ok, config = service:get_node_config(node, true); + if ok and config.send_last_published_item ~= "on_sub_and_presence" then return end local ok, id, item = service:get_last_item(node, jid); if not (ok and id) then return; end service.config.broadcaster("items", node, { [jid] = true }, item); diff -r ae5ac9830add -r b605cbd5f13b plugins/mod_pubsub/pubsub.lib.lua --- a/plugins/mod_pubsub/pubsub.lib.lua Tue Oct 19 16:37:32 2021 +0200 +++ b/plugins/mod_pubsub/pubsub.lib.lua Tue Oct 19 18:11:50 2021 +0200 @@ -120,6 +120,12 @@ }; }; { + type = "list-single"; + var = "pubsub#send_last_published_item"; + name = "send_last_published_item"; + options = { "never"; "on_sub"; "on_sub_and_presence" }; + }; + { type = "boolean"; value = true; label = "Whether to deliver event notifications"; @@ -253,6 +259,10 @@ supported_features:add("access-"..service.node_defaults.access_model); end + if service.node_defaults.send_last_published_item ~= "never" then + supported_features:add("last-published"); + end + if rawget(service.config, "itemstore") and rawget(service.config, "nodestore") then supported_features:add("persistent-items"); end @@ -530,6 +540,12 @@ reply = pubsub_error_reply(stanza, ret); end origin.send(reply); + local ok, config = service:get_node_config(node, true); + if ok and config.send_last_published_item ~= "never" then + local ok, id, item = service:get_last_item(node, jid); + if not (ok and id) then return; end + service.config.broadcaster("items", node, { [jid] = true }, item); + end end function handlers.set_unsubscribe(origin, stanza, unsubscribe, service) diff -r ae5ac9830add -r b605cbd5f13b spec/scansion/pubsub_config.scs --- a/spec/scansion/pubsub_config.scs Tue Oct 19 16:37:32 2021 +0200 +++ b/spec/scansion/pubsub_config.scs Tue Oct 19 18:11:50 2021 +0200 @@ -84,6 +84,18 @@ publishers + + + + + on_sub_and_presence + 1 @@ -160,6 +172,9 @@ publishers + + never + 1 diff -r ae5ac9830add -r b605cbd5f13b spec/scansion/pubsub_max_items.scs --- a/spec/scansion/pubsub_max_items.scs Tue Oct 19 16:37:32 2021 +0200 +++ b/spec/scansion/pubsub_max_items.scs Tue Oct 19 18:11:50 2021 +0200 @@ -79,6 +79,18 @@ publishers + + + + + never + 1 diff -r ae5ac9830add -r b605cbd5f13b spec/scansion/pubsub_multi_items.scs --- a/spec/scansion/pubsub_multi_items.scs Tue Oct 19 16:37:32 2021 +0200 +++ b/spec/scansion/pubsub_multi_items.scs Tue Oct 19 18:11:50 2021 +0200 @@ -79,6 +79,18 @@ publishers + + + + + never + 1 diff -r ae5ac9830add -r b605cbd5f13b spec/scansion/pubsub_preconditions.scs --- a/spec/scansion/pubsub_preconditions.scs Tue Oct 19 16:37:32 2021 +0200 +++ b/spec/scansion/pubsub_preconditions.scs Tue Oct 19 18:11:50 2021 +0200 @@ -83,6 +83,18 @@ publishers + + + + + on_sub_and_presence + 1 @@ -159,6 +171,9 @@ publishers + + never + 1 diff -r ae5ac9830add -r b605cbd5f13b spec/scansion/pubsub_resend_on_sub.scs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/spec/scansion/pubsub_resend_on_sub.scs Tue Oct 19 18:11:50 2021 +0200 @@ -0,0 +1,152 @@ +# Pubsub: Send last item on subscribe #1436 + +[Client] Romeo + jid: admin@localhost + password: password + +// admin@localhost is assumed to have node creation privileges + +[Client] Juliet + jid: juliet@localhost + password: password + +--------- + +Romeo connects + +Romeo sends: + + + + + + +Romeo receives: + + +Romeo sends: + + + + + + http://jabber.org/protocol/pubsub#node_config + + + never + + + + + + +Romeo receives: + + +Romeo sends: + + + + + + Soliloquy +

Lorem ipsum dolor sit amet

+ + + + + + +Romeo receives: + + +Juliet connects + +Juliet sends: + + + + + + +Juliet receives: + + +Juliet sends: + + + + + + +Juliet receives: + + +Romeo sends: + + + + + + http://jabber.org/protocol/pubsub#node_config + + + on_sub + + + + + + +Romeo receives: + + +Juliet sends: + + + + + + +Juliet receives: + + +Juliet receives: + + + + + + Soliloquy +

Lorem ipsum dolor sit amet

+ + + + + + +Juliet sends: + + + + + + +Juliet receives: + + +Juliet disconnects + +Romeo sends: + + + + + + +Romeo receives: + + +Romeo disconnects + +// vim: syntax=xml: diff -r ae5ac9830add -r b605cbd5f13b util/pubsub.lua --- a/util/pubsub.lua Tue Oct 19 16:37:32 2021 +0200 +++ b/util/pubsub.lua Tue Oct 19 18:11:50 2021 +0200 @@ -136,6 +136,7 @@ ["max_items"] = 20; ["access_model"] = "open"; ["publish_model"] = "publishers"; + ["send_last_published_item"] = "never"; }; local default_node_config_mt = { __index = default_node_config };