mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2016-03-11 13:41:10 +01:00
commit 36c4899e39
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_presence.lua
View file

@ -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

2
plugins/mod_watchregistrations.lua
View file

@ -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";

1
prosodyctl
View file

@ -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",

4
util/dependencies.lua
View file

@ -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";
});