aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-11 13:41:10 +0100
committerKim Alvefur <zash@zash.se>2016-03-11 13:41:10 +0100
commit36c4899e39311d14b66188a9b8af1a577ebc7f61 (patch)
tree3731b00879faf7182108cc277a9a2c61e5fdc0d0
parent96bfdd66ff021279115716c0640539e97739f51e (diff)
parente1769afc17d978417c95f944ac757ed45b319d92 (diff)
downloadprosody-36c4899e39311d14b66188a9b8af1a577ebc7f61.tar.gz
prosody-36c4899e39311d14b66188a9b8af1a577ebc7f61.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_presence.lua2
-rw-r--r--plugins/mod_watchregistrations.lua2
-rwxr-xr-xprosodyctl1
-rw-r--r--util/dependencies.lua4
4 files changed, 5 insertions, 4 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index ab57a158..76394baf 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -51,7 +51,7 @@ local function recalc_resource_map(user)
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
diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua
index b7be5daf..1e696f30 100644
--- a/plugins/mod_watchregistrations.lua
+++ b/plugins/mod_watchregistrations.lua
@@ -11,7 +11,7 @@ local host = module:get_host();
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";
diff --git a/prosodyctl b/prosodyctl
index 0d185327..a83ec612 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -869,6 +869,7 @@ function commands.check(arg)
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",
diff --git a/util/dependencies.lua b/util/dependencies.lua
index 9ab40765..b3f07257 100644
--- a/util/dependencies.lua
+++ b/util/dependencies.lua
@@ -101,7 +101,7 @@ local function check_dependencies()
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 function check_dependencies()
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";
});