diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 3c38218a2..92e210cad 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -323,7 +323,11 @@ function handlers.get_items(origin, stanza, items, service)
origin.send(pubsub_error_reply(stanza, "nodeid-required"));
return true;
end
- local ok, results = service:get_items(node, stanza.attr.from, requested_items);
+ local resultspec; -- TODO rsm.get()
+ if items.attr.max_items then
+ resultspec = { max = tonumber(items.attr.max_items) };
+ end
+ local ok, results = service:get_items(node, stanza.attr.from, requested_items, resultspec);
if not ok then
origin.send(pubsub_error_reply(stanza, results));
return true;
diff --git a/spec/scansion/pubsub_max_items.scs b/spec/scansion/pubsub_max_items.scs
new file mode 100644
index 000000000..7f0b531df
--- /dev/null
+++ b/spec/scansion/pubsub_max_items.scs
@@ -0,0 +1,196 @@
+# Pubsub: Requesting the Most Recent Items (#1608)
+
+[Client] Alice
+ jid: admin@localhost
+ password: password
+
+---------
+
+Alice connects
+
+Alice sends:
+
+
+Alice receives:
+
+
+Alice sends:
+
+
+
+
+
+
+Alice receives:
+
+
+Alice sends:
+
+
+
+
+
+
+Alice receives:
+
+
+
+
+
+ http://jabber.org/protocol/pubsub#node_config
+
+
+
+
+
+
+ 20
+
+
+ 1
+
+
+
+
+
+
+
+ open
+
+
+
+
+
+ publishers
+
+
+ 1
+
+
+ 1
+
+
+
+
+ headline
+
+
+ 1
+
+
+ 1
+
+
+
+
+
+
+Alice sends:
+
+
+
+ -
+ foo
+
+
+
+
+
+Alice receives:
+
+
+
+ -
+ bar
+
+
+
+
+
+Alice receives:
+
+
+
+ -
+ bar
+
+
+
+
+
+Alice sends:
+
+
+
+
+
+
+Alice receives:
+
+
+
+ -
+ foo
+
+ -
+ bar
+
+
+
+
+
+Alice sends:
+
+
+
+
+
+
+Alice receives:
+
+