From 97644a718986fc2c8b7377f10a30f9b260cde255 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 14 Jul 2018 19:34:10 +0200 Subject: mod_pubsub: Move include_body option into subscription options --- plugins/mod_pubsub/pubsub.lib.lua | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'plugins/mod_pubsub/pubsub.lib.lua') diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua index ebb8727d..5cabdf00 100644 --- a/plugins/mod_pubsub/pubsub.lib.lua +++ b/plugins/mod_pubsub/pubsub.lib.lua @@ -46,7 +46,6 @@ local function config_to_xep0060(node_config) ["pubsub#max_items"] = tostring(node_config["max_items"]); ["pubsub#persist_items"] = node_config["persist_items"]; ["pubsub#notification_type"] = node_config["notification_type"]; - ["pubsub#include_body"] = node_config["include_body"]; } end @@ -57,7 +56,6 @@ local function config_from_xep0060(config) ["max_items"] = tonumber(config["pubsub#max_items"]); ["persist_items"] = config["pubsub#persist_items"]; ["notification_type"] = config["pubsub#notification_type"]; - ["include_body"] = config["pubsub#include_body"]; } end @@ -87,11 +85,6 @@ local node_config_form = dataform { name = "pubsub#persist_items"; label = "Persist items to storage"; }; - { - type = "boolean"; - name = "pubsub#include_body"; - label = "Receive message body in addition to payload?"; - }; { type = "list-single"; name = "pubsub#notification_type"; @@ -108,8 +101,12 @@ local options_form = dataform { type = "hidden"; name = "FORM_TYPE"; value = "http://jabber.org/protocol/pubsub#subscribe_options"; - } - -- No options yet. File a feature request ;) + }; + { + type = "boolean"; + name = "pubsub#include_body"; + label = "Receive message body in addition to payload?"; + }; }; local node_metadata_form = dataform { -- cgit v1.2.3