Software / code / prosody
Changeset
7269:cde4ef90cf3d
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 11 Mar 2016 13:41:10 +0100 |
| parents | 7263:015a711a8ccf (current diff) 7268:29861845e0e0 (diff) |
| children | 7270:df22e314946c |
| files | plugins/muc/mod_muc.lua prosodyctl |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_presence.lua Thu Mar 10 17:55:40 2016 +0000 +++ b/plugins/mod_presence.lua Fri Mar 11 13:41:10 2016 +0100 @@ -51,7 +51,7 @@ end end -local ignore_presence_priority = module:get_option("ignore_presence_priority"); +local ignore_presence_priority = module:get_option_boolean("ignore_presence_priority", false); function handle_normal_presence(origin, stanza) if ignore_presence_priority then
--- a/plugins/mod_watchregistrations.lua Thu Mar 10 17:55:40 2016 +0000 +++ b/plugins/mod_watchregistrations.lua Fri Mar 11 13:41:10 2016 +0100 @@ -11,7 +11,7 @@ local jid_prep = require "util.jid".prep; local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep; -local registration_notification = module:get_option("registration_notification", "User $username just registered on $host from $ip"); +local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip"); local st = require "util.stanza";
--- a/prosodyctl Thu Mar 10 17:55:40 2016 +0000 +++ b/prosodyctl Fri Mar 11 13:41:10 2016 +0100 @@ -869,6 +869,7 @@ print("Checking config..."); local deprecated = set.new({ "bosh_ports", "disallow_s2s", "no_daemonize", "anonymous_login", "require_encryption", + "vcard_compatibility", }); local known_global_options = set.new({ "pidfile", "log", "plugin_paths", "prosody_user", "prosody_group", "daemonize",
--- a/util/dependencies.lua Thu Mar 10 17:55:40 2016 +0000 +++ b/util/dependencies.lua Fri Mar 11 13:41:10 2016 +0100 @@ -101,7 +101,7 @@ local encodings, err = softreq "util.encodings" if not encodings then - if err:match("not found") then + if err:match("module '[^']*' not found") then missingdep("util.encodings", { ["Windows"] = "Make sure you have encodings.dll from the Prosody distribution in util/"; ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/encodings.so"; }); @@ -118,7 +118,7 @@ local hashes, err = softreq "util.hashes" if not hashes then - if err:match("not found") then + if err:match("module '[^']*' not found") then missingdep("util.hashes", { ["Windows"] = "Make sure you have hashes.dll from the Prosody distribution in util/"; ["GNU/Linux"] = "Run './configure' and 'make' in the Prosody source directory to build util/hashes.so"; });
