Added hour:minute format to time command

[minetest.git] / builtin / game / chatcommands.lua

diff --git a/builtin/game/chatcommands.lua b/builtin/game/chatcommands.lua
index 91b685fdf85a4e34ca7af595b14428e04b70c820..fbc91ef01f90b28e3fcbe092bf48cc34c074901d 100644 (file)
--- a/builtin/game/chatcommands.lua
+++ b/builtin/game/chatcommands.lua
@@ -229,21 +229,28 @@ core.register_chatcommand("setpassword", {
                if not toname then
                        return false, "Name field required"
                end
-               local actstr = "?"
+               local act_str_past = "?"
+               local act_str_pres = "?"
                if not raw_password then
                        core.set_player_password(toname, "")
-                       actstr = "cleared"
+                       act_str_past = "cleared"
+                       act_str_pres = "clears"
                else
                        core.set_player_password(toname,
                                        core.get_password_hash(toname,
                                                        raw_password))
-                       actstr = "set"
+                       act_str_past = "set"
+                       act_str_pres = "sets"
                end
                if toname ~= name then
                        core.chat_send_player(toname, "Your password was "
-                                       .. actstr .. " by " .. name)
+                                       .. act_str_past .. " by " .. name)
                end
-               return true, "Password of player \"" .. toname .. "\" " .. actstr
+
+               core.log("action", name .. " " .. act_str_pres
+               .. " password of " .. toname .. ".")
+
+               return true, "Password of player \"" .. toname .. "\" " .. act_str_past
        end,
 })
 
@@ -257,6 +264,9 @@ core.register_chatcommand("clearpassword", {
                        return false, "Name field required"
                end
                core.set_player_password(toname, '')
+
+               core.log("action", name .. " clears password of " .. toname .. ".")
+
                return true, "Password of player \"" .. toname .. "\" cleared"
        end,
 })
@@ -308,7 +318,7 @@ core.register_chatcommand("teleport", {
                        teleportee:setpos(p)
                        return true, "Teleporting to "..core.pos_to_string(p)
                end
-               
+
                local teleportee = nil
                local p = nil
                local target_name = nil
@@ -345,7 +355,7 @@ core.register_chatcommand("teleport", {
                        return true, "Teleporting " .. teleportee_name
                                        .. " to " .. core.pos_to_string(p)
                end
-               
+
                local teleportee = nil
                local p = nil
                local teleportee_name = nil
@@ -367,7 +377,7 @@ core.register_chatcommand("teleport", {
                                        .. " to " .. target_name
                                        .. " at " .. core.pos_to_string(p)
                end
-               
+
                return false, 'Invalid parameters ("' .. param
                                .. '") or player not found (see /help teleport)'
        end,
@@ -404,13 +414,14 @@ core.register_chatcommand("set", {
 })
 
 core.register_chatcommand("deleteblocks", {
-       params = "[here] [<pos1> <pos2>]",
+       params = "(here [radius]) | (<pos1> <pos2>)",
        description = "delete map blocks contained in area pos1 to pos2",
        privs = {server=true},
        func = function(name, param)
                local p1 = {}
                local p2 = {}
-               if param == "here" then
+               local args = param:split(" ")
+               if args[1] == "here" then
                        local player = core.get_player_by_name(name)
                        if player == nil then
                                core.log("error", "player is nil")
@@ -418,6 +429,12 @@ core.register_chatcommand("deleteblocks", {
                        end
                        p1 = player:getpos()
                        p2 = p1
+
+                       if #args >= 2 then
+                               local radius = tonumber(args[2]) or 0
+                               p1 = vector.add(p1, radius)
+                               p2 = vector.subtract(p2, radius)
+                       end
                else
                        local pos1, pos2 = unpack(param:split(") ("))
                        if pos1 == nil or pos2 == nil then
@@ -662,19 +679,41 @@ core.register_chatcommand("status", {
 })
 
 core.register_chatcommand("time", {
-       params = "<0...24000>",
+       params = "<0..23>:<0..59> | <0..24000>",
        description = "set time of day",
-       privs = {settime=true},
+       privs = {},
        func = function(name, param)
                if param == "" then
-                       return false, "Missing time."
-               end
-               local newtime = tonumber(param)
-               if newtime == nil then
-                       return false, "Invalid time."
-               end
-               core.set_timeofday((newtime % 24000) / 24000)
-               core.log("action", name .. " sets time " .. newtime)
+                       local current_time = math.floor(core.get_timeofday() * 1440)
+                       local minutes = current_time % 60
+                       local hour = (current_time - minutes) / 60
+                       return true, ("Current time is %d:%02d"):format(hour, minutes)
+               end
+               local player_privs = minetest.get_player_privs(name)
+               if not player_privs.settime then
+                       return false, "You don't have permission to run this command " ..
+                               "(missing privilege: settime)."
+               end
+               local hour, minute = param:match("^(%d+):(%d+)$")
+               if not hour then
+                       local new_time = tonumber(param)
+                       if not new_time then
+                               return false, "Invalid time."
+                       end
+                       -- Backward compatibility.
+                       core.set_timeofday((new_time % 24000) / 24000)
+                       core.log("action", name .. " sets time to " .. new_time)
+                       return true, "Time of day changed."
+               end
+               hour = tonumber(hour)
+               minute = tonumber(minute)
+               if hour < 0 or hour > 23 then
+                       return false, "Invalid hour (must be between 0 and 23 inclusive)."
+               elseif minute < 0 or minute > 59 then
+                       return false, "Invalid minute (must be between 0 and 59 inclusive)."
+               end
+               core.set_timeofday((hour * 60 + minute) / 1440)
+               core.log("action", name .. " sets time to " .. hour .. ":" .. minute)
                return true, "Time of day changed."
        end,
 })
@@ -732,7 +771,11 @@ core.register_chatcommand("kick", {
                if not core.kick_player(tokick, reason) then
                        return false, "Failed to kick player " .. tokick
                end
-               core.log("action", name .. " kicked " .. tokick)
+               local log_reason = ""
+               if reason then
+                       log_reason = " with reason \"" .. reason .. "\""
+               end
+               core.log("action", name .. " kicks " .. tokick .. log_reason)
                return true, "Kicked " .. tokick
        end,
 })
@@ -788,4 +831,3 @@ core.register_chatcommand("last-login", {
                return false, "Last login time is unknown"
        end,
 })
-