aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_console.lua4
-rw-r--r--plugins/mod_welcome.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index b3963d6c..716c2525 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -496,7 +496,7 @@ function def_env.s2s:close(from, to)
if not session then
print("No outgoing connection from "..from.." to "..to)
else
- s2smanager.destroy_session(session);
+ (session.close or s2smanager.destroy_session)(session);
count = count + 1;
print("Closed outgoing session from "..from.." to "..to);
end
@@ -504,7 +504,7 @@ function def_env.s2s:close(from, to)
-- Is an incoming connection
for session in pairs(incoming_s2s) do
if session.to_host == to and session.from_host == from then
- s2smanager.destroy_session(session);
+ (session.close or s2smanager.destroy_session)(session);
count = count + 1;
end
end
diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua
index 5c0da8b8..e9444363 100644
--- a/plugins/mod_welcome.lua
+++ b/plugins/mod_welcome.lua
@@ -9,7 +9,7 @@
local config = require "core.configmanager";
local host = module:get_host();
-local welcome_text = config.get("*", "core", "welcome_message") or "Hello $user, welcome to the $host IM server!";
+local welcome_text = config.get("*", "core", "welcome_message") or "Hello $username, welcome to the $host IM server!";
local st = require "util.stanza";