Merge branch 'nalc-1.2'

LICENSE

@@ -1,24 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2014-2023, Diego Martínez
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

gui.lua

@@ -61,8 +61,7 @@ local function make_fs(name)
 		"size[16,12]",
 		"label[0,-.1;Filter]",
 		"field[1.5,0;12.8,1;filter;;"..ESC(filter).."]",
-		"field_close_on_enter[filter;false]",
-		"button[14,-.3;2,1;search_submit;Search]",
+		"button[14,-.3;2,1;search;Search]",
 	}
 	local fsn = #fs
 	fsn=fsn+1 fs[fsn] = format("textlist[0,.8;4,9.3;player;%s;%d;0]",
@@ -123,7 +122,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		end
 		return
 	end
-	if fields.search_submit or fields.filter then
+	if fields.search then
 		local filter = fields.filter or ""
 		state.filter = filter
 		state.list = make_list(filter)

init.lua

@@ -25,7 +25,6 @@ end
 
 local ACTION = make_logger("action")
 local WARNING = make_logger("warning")
-local ERROR = make_logger("error")
 
 local unit_to_secs = {
 	s = 1, m = 60, h = 3600,
@@ -41,14 +40,6 @@ local function parse_time(t) --> secs
 	return secs
 end
 
-local function concat_keys(t, sep)
-	local keys = {}
-	for k, _ in pairs(t) do
-		keys[#keys + 1] = k
-	end
-	return table.concat(keys, sep)
-end
-
 function xban.find_entry(player, create) --> entry, index
 	for index, e in ipairs(db) do
 		for name in pairs(e.names) do
@@ -120,7 +111,7 @@ function xban.ban_player(player, source, expires, reason) --> bool, err
 	end
 	ACTION("%s bans %s until %s for reason: %s", source, player,
 	  date, reason)
-	ACTION("Banned Names/IPs: %s", concat_keys(e.names, ", "))
+	ACTION("Banned Names/IPs: %s", table.concat(e.names, ", "))
 	return true
 end
 
@@ -140,7 +131,7 @@ function xban.unban_player(player, source) --> bool, err
 	e.expires = nil
 	e.time = nil
 	ACTION("%s unbans %s", source, player)
-	ACTION("Unbanned Names/IPs: %s", concat_keys(e.names, ", "))
+	ACTION("Unbanned Names/IPs: %s", table.concat(e.names, ", "))
 	return true
 end
 
@@ -344,12 +335,18 @@ end
 
 local function save_db()
 	minetest.after(SAVE_INTERVAL, save_db)
+	local f, e = io.open(DB_FILENAME, "wt")
 	db.timestamp = os.time()
-	local contents = assert(xban.serialize_db(db))
-	local ok = minetest.safe_file_write(DB_FILENAME, contents)
-	if not ok then
-		ERROR("Unable to save database")
+	if f then
+		local ok, err = f:write(xban.serialize(db))
+		if not ok then
+			WARNING("Unable to save database: %s", err)
+		end
+	else
+		WARNING("Unable to save database: %s", e)
 	end
+	if f then f:close() end
+	return
 end
 
 local function load_db()
@@ -363,7 +360,7 @@ local function load_db()
 		WARNING("Unable to load database: %s", "Read failed")
 		return
 	end
-	local t, e2 = xban.deserialize_db(cont)
+	local t, e2 = minetest.deserialize(cont)
 	if not t then
 		WARNING("Unable to load database: %s",
 		  "Deserialization failed: "..(e2 or "unknown error"))

serialize.lua

@@ -27,44 +27,5 @@ local function my_serialize_2(t, level)
 end
 
 function xban.serialize(t)
-	minetest.log("warning", "[xban2] xban.serialize() is deprecated")
 	return "return {\n"..my_serialize_2(t, 1).."\n}"
 end
-
--- JSON doesn't allow combined string+number keys, this function moves any
--- number keys into an "entries" table
-function xban.serialize_db(t)
-	local res = {}
-	local entries = {}
-	for k, v in pairs(t) do
-		if type(k) == "number" then
-			entries[k] = v
-		else
-			res[k] = v
-		end
-	end
-	res.entries = entries
-	return minetest.write_json(res, true)
-end
-
-function xban.deserialize_db(s)
-	if s:sub(1, 1) ~= "{" then
-		-- Load legacy databases
-		return minetest.deserialize(s)
-	end
-
-	local res, err = minetest.parse_json(s)
-	if not res then
-		return nil, err
-	end
-
-	-- Remove all "null"s added by empty tables
-	for i, entry in ipairs(res.entries or {}) do
-		entry.names = entry.names or {}
-		entry.record = entry.record or {}
-		res[i] = entry
-	end
-	res.entries = nil
-
-	return res
-end