Fix luacheck (too long lines) in storage.lua

This commit is contained in:
Athozus 2023-03-14 12:46:23 +01:00
parent c0c3692c2b
commit 75e547fc45
No known key found for this signature in database
GPG key ID: B50895022E8484BF

View file

@ -47,7 +47,8 @@ function mail.getPlayerMessages(playername)
if msg.bcc then if msg.bcc then
bcc = msg.bcc bcc = msg.bcc
end end
local receivers = mail.extractMaillists((msg.to .. "," .. cc .. "," .. bcc),",") -- extracted maillists from all receivers -- extracted maillists from all receivers
local receivers = mail.extractMaillists((msg.to .. "," .. cc .. "," .. bcc),",")
for _, receiver in ipairs(receivers) do for _, receiver in ipairs(receivers) do
receiver = string.gsub(receiver, " ", "") -- avoid blank spaces (ex : " singleplayer" instead of "singleplayer") receiver = string.gsub(receiver, " ", "") -- avoid blank spaces (ex : " singleplayer" instead of "singleplayer")
if receiver == playername then -- check if player is a receiver if receiver == playername then -- check if player is a receiver
@ -81,7 +82,8 @@ function mail.getPlayerInboxMessages(playername)
if msg.bcc then if msg.bcc then
bcc = msg.bcc bcc = msg.bcc
end end
local receivers = mail.extractMaillists((msg.to .. "," .. cc .. "," .. bcc),",") -- extracted maillists from all receivers -- extracted maillists from all receivers
local receivers = mail.extractMaillists((msg.to .. "," .. cc .. "," .. bcc),",")
for _, receiver in ipairs(receivers) do for _, receiver in ipairs(receivers) do
receiver = string.gsub(receiver, " ", "") -- avoid blank spaces (ex : " singleplayer" instead of "singleplayer") receiver = string.gsub(receiver, " ", "") -- avoid blank spaces (ex : " singleplayer" instead of "singleplayer")
if receiver == playername then -- check if player is a receiver if receiver == playername then -- check if player is a receiver
@ -105,7 +107,8 @@ function mail.getPlayerSentMessages(playername)
if messages[1] then if messages[1] then
for _, msg in ipairs(messages) do for _, msg in ipairs(messages) do
if msg.sender == playername then -- check if player is the sender if msg.sender == playername then -- check if player is the sender
if mail.getMessageStatus(playername, msg.id) ~= "deleted" then -- do not return if the message was deleted from player -- do not return if the message was deleted from player
if mail.getMessageStatus(playername, msg.id) ~= "deleted" then
table.insert(playerSentMessages, msg) table.insert(playerSentMessages, msg)
end end
end end
@ -139,7 +142,8 @@ function mail.addMessage(message)
-- add default status (unread for receivers) of this message -- add default status (unread for receivers) of this message
local isSenderAReceiver = false local isSenderAReceiver = false
local receivers = mail.extractMaillists((message.to .. "," .. (message.cc or "") .. "," .. (message.bcc or ""))) -- extracted maillists from all receivers -- extracted maillists from all receivers
local receivers = mail.extractMaillists((message.to .. "," .. (message.cc or "") .. "," .. (message.bcc or "")))
for _, receiver in ipairs(receivers) do for _, receiver in ipairs(receivers) do
if minetest.player_exists(receiver) then -- avoid blank names if minetest.player_exists(receiver) then -- avoid blank names
@ -268,7 +272,11 @@ function mail.setMaillist(ml_id, updated_maillist, players_string)
for _, maillist in ipairs(maillists) do for _, maillist in ipairs(maillists) do
if maillist.id == ml_id then if maillist.id == ml_id then
maillist_id = maillist.id maillist_id = maillist.id
maillists[_] = {id = maillist_id, owner = updated_maillist.owner, name = updated_maillist.name, desc = updated_maillist.desc} maillists[_] = {
id = maillist_id,
owner = updated_maillist.owner,
name = updated_maillist.name,
desc = updated_maillist.desc}
end end
end end
if mail.write_json_file(mail.maildir .. "/mail.maillists.json", maillists) then if mail.write_json_file(mail.maildir .. "/mail.maillists.json", maillists) then
@ -389,7 +397,9 @@ function mail.deleteMaillist(ml_id)
table.remove(maillists, _) table.remove(maillists, _)
end end
end end
if mail.write_json_file(mail.maildir .. "/mail.maillists_players.json", maillists_players) and mail.write_json_file(mail.maildir .. "/mail.maillists.json", maillists) then local players_writing_done = mail.write_json_file(mail.maildir .. "/mail.maillists_players.json", maillists_players)
local maillist_writing_done = mail.write_json_file(mail.maildir .. "/mail.maillists.json", maillists)
if players_writing_done and maillist_writing_done then
return true return true
else else
minetest.log("error","[mail] Save failed!") minetest.log("error","[mail] Save failed!")