prosody
e30b0cbed472
plugins/mod_pubsub/mod_pubsub.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/mod_pubsub/mod_pubsub.lua @ 7982:e30b0cbed472

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 16 Mar 2017 23:49:27 +0100
parent 7717:9c8eb0239eef
parent 7980:241f02bd66ce
child 7984:ae3c5abb3336
comparison
equal deleted inserted replaced
7974:547f000941cf 7982:e30b0cbed472
7 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event"; 7 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
8 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner"; 8 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
9 9
10 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false); 10 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
11 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false); 11 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
12 local pubsub_disco_name = module:get_option("name"); 12 local pubsub_disco_name = module:get_option_string("name" "Prosody PubSub Service");
13 if type(pubsub_disco_name) ~= "string" then pubsub_disco_name = "Prosody PubSub Service"; end
14 local expose_publisher = module:get_option_boolean("expose_publisher", false) 13 local expose_publisher = module:get_option_boolean("expose_publisher", false)
15 14
16 local service; 15 local service;
17 16
18 local lib_pubsub = module:require "pubsub"; 17 local lib_pubsub = module:require "pubsub";