Add support for a get_keys() equivalent for lower than 5.7 Minetest versions (#153)

* Add support for a get_keys() equivalent for lower than 5.7 Minetest versions

* Do not call the function itself to check if it exists

Co-authored-by: luk3yx <luk3yx@users.noreply.github.com>

* Do not call the function itself to check if it exists (2)

Co-authored-by: luk3yx <luk3yx@users.noreply.github.com>

* Fix an occurrence of get_keys() in is_uuid_existing()

---------

Co-authored-by: luk3yx <luk3yx@users.noreply.github.com>
This commit is contained in:
Athozus 2024-08-09 00:31:28 +02:00 committed by GitHub
parent 4f15c2fe65
commit b9982f11e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -91,17 +91,29 @@ local function search_box(playername, box, uuid)
return false return false
end end
local function search_boxes(playername, boxes, uuid)
local result
for _, b in ipairs(boxes) do
result = search_box(playername, b, uuid)
if result then return result end
end
end
local function is_uuid_existing(uuid) local function is_uuid_existing(uuid)
local boxes = {"inbox", "outbox", "drafts", "trash"}
if mail.storage.get_keys then
for _, k in ipairs(mail.storage:get_keys()) do for _, k in ipairs(mail.storage:get_keys()) do
if string.sub(k,1,5) == "mail/" then if string.sub(k,1,5) == "mail/" then
local p = string.sub(k, 6) local p = string.sub(k, 6)
local result local result = search_boxes(p, boxes, uuid)
local boxes = {"inbox", "outbox", "drafts", "trash"}
for _, b in ipairs(boxes) do
result = search_box(p, b, uuid)
if result then return result end if result then return result end
end end
end end
else
for p, _ in minetest.get_auth_handler().iterate() do
local result = search_boxes(p, boxes, uuid)
if result then return result end
end
end end
return false return false
end end
@ -116,16 +128,7 @@ local function are_message_sames(a, b)
and a.body == b.body and a.body == b.body
end end
local function fix_duplicate_uuids(playername, box) local function replace_other_player_message_uuid(p, m, uuid, new_uuid)
local e = mail.get_storage_entry(playername)
for _, m in ipairs(e[box]) do
local uuid = m.id
local exists = is_uuid_existing(uuid)
if exists and not are_message_sames(exists, m) then
local new_uuid = mail.new_uuid() -- generates a new uuid to replace doublons
for _, k in ipairs(mail.storage:get_keys()) do
if string.sub(k,1,5) == "mail/" then
local p = string.sub(k, 6)
local er = mail.get_storage_entry(p) local er = mail.get_storage_entry(p)
for _, r in ipairs(er.inbox) do for _, r in ipairs(er.inbox) do
if r.id == uuid and not are_message_sames(m, r) then if r.id == uuid and not are_message_sames(m, r) then
@ -149,23 +152,55 @@ local function fix_duplicate_uuids(playername, box)
end end
mail.set_storage_entry(p, er) mail.set_storage_entry(p, er)
end end
local function fix_box_duplicate_uuids(playername, box)
local e = mail.get_storage_entry(playername)
for _, m in ipairs(e[box]) do
local uuid = m.id
local exists = is_uuid_existing(uuid)
if exists and not are_message_sames(exists, m) then
local new_uuid = mail.new_uuid() -- generates a new uuid to replace doublons
if mail.storage.get_keys then
for _, k in ipairs(mail.storage:get_keys()) do
if string.sub(k,1,5) == "mail/" then
local p = string.sub(k, 6)
replace_other_player_message_uuid(p, m, uuid, new_uuid)
end
end
else
for p, _ in minetest.get_auth_handler().iterate() do
replace_other_player_message_uuid(p, m, uuid, new_uuid)
end
end end
end end
end end
end end
local function fix_player_duplicate_uuids(playername)
fix_box_duplicate_uuids(playername, "inbox")
fix_box_duplicate_uuids(playername, "outbox")
fix_box_duplicate_uuids(playername, "drafts")
fix_box_duplicate_uuids(playername, "trash")
end
-- repair database for uuid doublons -- repair database for uuid doublons
local function repair_storage() local function repair_storage()
-- iterate through players -- iterate through players
-- get_keys() was introduced in 5.7
if mail.storage.get_keys then
for _, k in ipairs(mail.storage:get_keys()) do for _, k in ipairs(mail.storage:get_keys()) do
if string.sub(k,1,5) == "mail/" then if string.sub(k,1,5) == "mail/" then
local p = string.sub(k, 6) local p = string.sub(k, 6)
fix_duplicate_uuids(p, "inbox") fix_player_duplicate_uuids(p)
fix_duplicate_uuids(p, "outbox")
fix_duplicate_uuids(p, "drafts")
fix_duplicate_uuids(p, "trash")
end end
end end
else
minetest.after(0, function()
for p, _ in minetest.get_auth_handler().iterate() do
fix_player_duplicate_uuids(p)
end
end)
end
end end
function mail.migrate() function mail.migrate()