mod_console: Show status and priority of clients

[prosody.git] / plugins / mod_console.lua

diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index c0f491de41bff65d5391d5bb47785c54379d363a..b3963d6c9e89969a21876dd14af6e32f0ef99a23 100644 (file)
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -70,9 +70,6 @@ function console_listener.listener(conn, data)
                        if data:match("^>") then
                                data = data:gsub("^>", "");
                                useglobalenv = true;
-                       elseif data == "\004" then
-                               commands["bye"](session, data);
-                               return;
                        else
                                local command = data:lower();
                                command = data:match("^%w+") or data:match("%p");
@@ -208,8 +205,7 @@ end
 -- Anything in def_env will be accessible within the session as a global variable
 
 def_env.server = {};
-
-function def_env.server:insane_reload()
+function def_env.server:reload()
        prosody.unlock_globals();
        dofile "prosody"
        prosody = _G.prosody;
@@ -234,11 +230,6 @@ function def_env.server:uptime()
                minutes, (minutes ~= 1 and "s") or "", os.date("%c", prosody.start_time));
 end
 
-function def_env.server:shutdown(reason)
-       prosody.shutdown(reason);
-       return true, "Shutdown initiated";
-end
-
 def_env.module = {};
 
 local function get_hosts_set(hosts, module)
@@ -342,11 +333,6 @@ function def_env.config:get(host, section, key)
        return true, tostring(config_get(host, section, key));
 end
 
-function def_env.config:reload()
-       local ok, err = prosody.reload_config();
-       return ok, (ok and "Config reloaded (you may need to reload modules to take effect)") or tostring(err);
-end
-
 def_env.hosts = {};
 function def_env.hosts:list()
        for host, host_session in pairs(hosts) do
@@ -373,12 +359,7 @@ end
 
 function def_env.c2s:show(match_jid)
        local print, count = self.session.print, 0;
-       local curr_host;
        show_c2s(function (jid, session)
-               if curr_host ~= session.host then
-                       curr_host = session.host;
-                       print(curr_host);
-               end
                if (not match_jid) or jid:match(match_jid) then
                        count = count + 1;
                        local status, priority = "unavailable", tostring(session.priority or "-");
@@ -390,7 +371,7 @@ function def_env.c2s:show(match_jid)
                                        status = "available";
                                end
                        end
-                       print("   "..jid.." - "..status.."("..priority..")");
+                       print(jid.." - "..status.."("..priority..")");
                end             
        end);
        return true, "Total: "..count.." clients";