sixam/mail
1
0
Fork 0
mirror of https://github.com/mt-mods/mail.git synced 2025-07-15 18:56:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use core namespace instead of minetest

Browse source
This commit is contained in:
Athozus 2024-10-25 23:00:27 +02:00
parent 8a992b7a29
commit 030a7a3fe8
No known key found for this signature in database
GPG key ID: B50895022E8484BF
29 changed files with 135 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ui/about.lua
View file

@ -119,10 +119,10 @@ function mail.show_about(name)
formspec = formspec .. mail.theme
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end
@ -141,10 +141,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
mail.show_about(playername)
elseif fields.github then
minetest.chat_send_player(playername, "https://github.com/mt-mods/mail")
core.chat_send_player(playername, "https://github.com/mt-mods/mail")
elseif fields.contentdb then
minetest.chat_send_player(playername, "https://content.minetest.net/packages/mt-mods/mail")
core.chat_send_player(playername, "https://content.minetest.net/packages/mt-mods/mail")
elseif fields.contributor_grouping then
mail.selected_idxs.contributor_grouping[playername] = fields.contributor_grouping
mail.show_about(playername)

18
ui/compose.lua
View file

@ -20,18 +20,18 @@ function mail.show_compose(name, to, subject, body, cc, bcc, id)
]] .. mail.theme
formspec = string.format(formspec,
minetest.formspec_escape(to) or "",
minetest.formspec_escape(cc) or "",
minetest.formspec_escape(bcc) or "",
minetest.formspec_escape(subject) or "",
minetest.formspec_escape(body) or "")
core.formspec_escape(to) or "",
core.formspec_escape(cc) or "",
core.formspec_escape(bcc) or "",
core.formspec_escape(subject) or "",
core.formspec_escape(body) or "")
mail.selected_idxs.message[name] = id or mail.new_uuid()
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end
@ -63,7 +63,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
body = fields.body,
})
if not success then
minetest.chat_send_player(name, err)
core.chat_send_player(name, err)
return
end
@ -87,7 +87,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
end
minetest.after(0.5, function()
core.after(0.5, function()
mail.selected_idxs.drafts[name] = nil
mail.show_mail_menu(name)
end)

6
ui/contacts.lua
View file

@ -14,10 +14,10 @@ local contacts_formspec = "size[8,9;]" .. mail.theme .. [[
function mail.show_contacts(name)
local formspec = contacts_formspec .. mail.compile_contact_list(name, mail.selected_idxs.contacts[name])
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end
@ -26,7 +26,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
local contacts = mail.get_contacts(name)
if fields.contacts then
local evt = minetest.explode_table_event(fields.contacts)
local evt = core.explode_table_event(fields.contacts)
for k, _, i in mail.pairs_by_keys(contacts) do
if i == evt.row - 1 then
mail.selected_idxs.contacts[name] = tonumber(k)

8
ui/drafts.lua
View file

@ -32,14 +32,14 @@ function mail.show_drafts(name)
for _, message in ipairs(messages) do
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = minetest.formspec_escape(message.to)
formspec[#formspec + 1] = core.formspec_escape(message.to)
formspec[#formspec + 1] = ","
if message.subject ~= "" then
if string.len(message.subject) > 30 then
formspec[#formspec + 1] = minetest.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = core.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = "..."
else
formspec[#formspec + 1] = minetest.formspec_escape(message.subject)
formspec[#formspec + 1] = core.formspec_escape(message.subject)
end
else
formspec[#formspec + 1] = S("(No subject)")
@ -53,5 +53,5 @@ function mail.show_drafts(name)
else
formspec[#formspec + 1] = "]label[2.25,4.5;" .. S("No drafts") .. "]"
end
minetest.show_formspec(name, "mail:drafts", table.concat(formspec, ""))
core.show_formspec(name, "mail:drafts", table.concat(formspec, ""))
end

8
ui/edit_contact.lua
View file

@ -24,12 +24,12 @@ function mail.show_edit_contact(name, contact_name, note, illegal_name_hint)
end
formspec = formspec .. mail.theme
formspec = string.format(formspec,
minetest.formspec_escape(contact_name or ""),
minetest.formspec_escape(note or ""))
minetest.show_formspec(name, FORMNAME, formspec)
core.formspec_escape(contact_name or ""),
core.formspec_escape(note or ""))
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end

10
ui/edit_maillists.lua
View file

@ -25,13 +25,13 @@ function mail.show_edit_maillist(playername, maillist_name, desc, players, illeg
end
formspec = formspec .. mail.theme
formspec = string.format(formspec,
minetest.formspec_escape(maillist_name or ""),
minetest.formspec_escape(desc or ""),
minetest.formspec_escape(players or ""))
minetest.show_formspec(playername, FORMNAME, formspec)
core.formspec_escape(maillist_name or ""),
core.formspec_escape(desc or ""),
core.formspec_escape(players or ""))
core.show_formspec(playername, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end

10
ui/events.lua
View file

@ -14,7 +14,7 @@ local function nonempty(x)
return ((type(x)=="table")and(#x>0))
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= "mail:inbox" and formname ~= "mail:outbox"
and formname ~= "mail:drafts" and formname ~= "mail:trash" then
return
@ -59,7 +59,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
-- Hanmdle formspec event
if fields.inbox then -- inbox table
local evt = minetest.explode_table_event(fields.inbox)
local evt = core.explode_table_event(fields.inbox)
if evt.row == 1 then -- header
if mail.selected_idxs.sortfield[name] == evt.column-1 then -- if already this field, then change direction
mail.selected_idxs.sortdirection[name] = mail.selected_idxs.sortdirection[name] == "2" and "1" or "2"
@ -105,7 +105,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
if fields.outbox then -- outbox table
local evt = minetest.explode_table_event(fields.outbox)
local evt = core.explode_table_event(fields.outbox)
if evt.row == 1 then -- header
if mail.selected_idxs.sortfield[name] == evt.column-1 then -- if already this field, then change direction
mail.selected_idxs.sortdirection[name] = mail.selected_idxs.sortdirection[name] == "2" and "1" or "2"
@ -151,7 +151,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
if fields.drafts then -- drafts table
local evt = minetest.explode_table_event(fields.drafts)
local evt = core.explode_table_event(fields.drafts)
if evt.row == 1 then -- header
if mail.selected_idxs.sortfield[name] == evt.column-1 then -- if already this field, then change direction
mail.selected_idxs.sortdirection[name] = mail.selected_idxs.sortdirection[name] == "2" and "1" or "2"
@ -176,7 +176,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
end
if fields.trash then -- trash table
local evt = minetest.explode_table_event(fields.trash)
local evt = core.explode_table_event(fields.trash)
if evt.row == 1 then -- header
if mail.selected_idxs.sortfield[name] == evt.column-1 then -- if already this field, then change direction
mail.selected_idxs.sortdirection[name] = mail.selected_idxs.sortdirection[name] == "2" and "1" or "2"

8
ui/inbox.lua
View file

@ -109,14 +109,14 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
end
formspec[#formspec + 1] = "," .. mail.get_color(displayed_color)
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = minetest.formspec_escape(message.from)
formspec[#formspec + 1] = core.formspec_escape(message.from)
formspec[#formspec + 1] = ","
if message.subject ~= "" then
if string.len(message.subject) > 30 then
formspec[#formspec + 1] = minetest.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = core.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = "..."
else
formspec[#formspec + 1] = minetest.formspec_escape(message.subject)
formspec[#formspec + 1] = core.formspec_escape(message.subject)
end
else
formspec[#formspec + 1] = S("(No subject)")
@ -127,5 +127,5 @@ function mail.show_inbox(name, sortfieldindex, sortdirection, filter)
formspec[#formspec + 1] = "]label[2.25,4.5;" .. S("No mail") .. "]"
end
minetest.show_formspec(name, "mail:inbox", table.concat(formspec, ""))
core.show_formspec(name, "mail:inbox", table.concat(formspec, ""))
end

2
ui/init.lua
View file

@ -1,5 +1,5 @@
-- sub files
local MP = minetest.get_modpath(minetest.get_current_modname())
local MP = core.get_modpath(core.get_current_modname())
dofile(MP .. "/ui/inbox.lua")
dofile(MP .. "/ui/outbox.lua")

12
ui/maillists.lua
View file

@ -19,14 +19,14 @@ function mail.show_maillists(name)
for _, maillist in ipairs(maillists) do
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = "@" .. minetest.formspec_escape(maillist.name)
formspec[#formspec + 1] = "@" .. core.formspec_escape(maillist.name)
formspec[#formspec + 1] = ","
if maillist.desc ~= "" then
if string.len(maillist.desc or "") > 30 then
formspec[#formspec + 1] = minetest.formspec_escape(string.sub(maillist.desc, 1, 27))
formspec[#formspec + 1] = core.formspec_escape(string.sub(maillist.desc, 1, 27))
formspec[#formspec + 1] = "..."
else
formspec[#formspec + 1] = minetest.formspec_escape(maillist.desc)
formspec[#formspec + 1] = core.formspec_escape(maillist.desc)
end
else
formspec[#formspec + 1] = S("(No description)")
@ -40,10 +40,10 @@ function mail.show_maillists(name)
else
formspec[#formspec + 1] = "]label[2.25,4.5;" .. S("No maillist") .. "]"
end
minetest.show_formspec(name, FORMNAME, table.concat(formspec, ""))
core.show_formspec(name, FORMNAME, table.concat(formspec, ""))
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end
@ -52,7 +52,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
local maillists = mail.get_maillists(name)
if fields.maillists then
local evt = minetest.explode_table_event(fields.maillists)
local evt = core.explode_table_event(fields.maillists)
mail.selected_idxs.maillists[name] = evt.row - 1
if evt.type == "DCL" and maillists[mail.selected_idxs.maillists[name]] then
local maillist = mail.get_maillist_by_name(name, maillists[mail.selected_idxs.maillists[name]].name)

24
ui/message.lua
View file

@ -52,16 +52,16 @@ function mail.show_message(name, id)
tooltip[forward;]] .. S("Transfer message to other people") .. [[]
]] .. mail.theme
local from = minetest.formspec_escape(message.from) or ""
local to = minetest.formspec_escape(message.to) or ""
local from = core.formspec_escape(message.from) or ""
local to = core.formspec_escape(message.to) or ""
if string.len(to) > 70 then to = string.sub(to, 1, 67) .. "..." end
local cc = minetest.formspec_escape(message.cc) or ""
local cc = core.formspec_escape(message.cc) or ""
if string.len(cc) > 50 then cc = string.sub(cc, 1, 47) .. "..." end
local date = type(message.time) == "number"
and minetest.formspec_escape(os.date(mail.get_setting(name, "date_format"),
and core.formspec_escape(os.date(mail.get_setting(name, "date_format"),
message.time+3600*mail.get_setting(name, "timezone_offset"))) or ""
local subject = minetest.formspec_escape(message.subject) or ""
local body = minetest.formspec_escape(message.body) or ""
local subject = core.formspec_escape(message.subject) or ""
local body = core.formspec_escape(message.body) or ""
formspec = string.format(formspec, from, to, cc, date, subject, body)
if not message.read and mail.get_setting(name, "auto_marking_read") then
@ -69,14 +69,14 @@ function mail.show_message(name, id)
mail.mark_read(name, id)
end
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
function mail.reply(name, message)
if not message then
-- TODO: workaround for https://github.com/mt-mods/mail/issues/84
minetest.log("error", "[mail] reply called with nil message for player: " .. name)
minetest.log("error", "[mail] current mail-context: " .. dump(mail.selected_idxs))
core.log("error", "[mail] reply called with nil message for player: " .. name)
core.log("error", "[mail] current mail-context: " .. dump(mail.selected_idxs))
return
end
mail.show_compose(name, message.from, "Re: "..message.subject, interleave_msg(message.body))
@ -85,8 +85,8 @@ end
function mail.replyall(name, message)
if not message then
-- TODO: workaround for https://github.com/mt-mods/mail/issues/84
minetest.log("error", "[mail] replyall called with nil message for player: " .. name)
minetest.log("error", "[mail] current mail-context: " .. dump(mail.selected_idxs))
core.log("error", "[mail] replyall called with nil message for player: " .. name)
core.log("error", "[mail] current mail-context: " .. dump(mail.selected_idxs))
return
end
@ -121,7 +121,7 @@ function mail.forward(name, message)
mail.show_compose(name, "", "Fw: " .. (message.subject or ""), interleave_msg(message.body))
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end

10
ui/outbox.lua
View file

@ -90,18 +90,18 @@ function mail.show_outbox(name, sortfieldindex, sortdirection, filter)
formspec[#formspec + 1] = "," .. mail.get_color(displayed_color)
formspec[#formspec + 1] = ","
if string.len(message.to) > 20 then
formspec[#formspec + 1] = minetest.formspec_escape(string.sub(message.to, 1, 17))
formspec[#formspec + 1] = core.formspec_escape(string.sub(message.to, 1, 17))
formspec[#formspec + 1] = "..."
else
formspec[#formspec + 1] = minetest.formspec_escape(message.to)
formspec[#formspec + 1] = core.formspec_escape(message.to)
end
formspec[#formspec + 1] = ","
if message.subject ~= "" then
if string.len(message.subject) > 30 then
formspec[#formspec + 1] = minetest.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = core.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = "..."
else
formspec[#formspec + 1] = minetest.formspec_escape(message.subject)
formspec[#formspec + 1] = core.formspec_escape(message.subject)
end
else
formspec[#formspec + 1] = S("(No subject)")
@ -112,5 +112,5 @@ function mail.show_outbox(name, sortfieldindex, sortdirection, filter)
formspec[#formspec + 1] = "]label[2.25,4.5;" .. S("No mail") .. "]"
end
minetest.show_formspec(name, "mail:outbox", table.concat(formspec, ""))
core.show_formspec(name, "mail:outbox", table.concat(formspec, ""))
end

10
ui/receivers.lua
View file

@ -1,5 +1,5 @@
-- translation
local S = minetest.get_translator("mail")
local S = core.get_translator("mail")
local FORMNAME = "mail:receivers"
@ -23,7 +23,7 @@ function mail.show_receivers(name, id)
table[4,1.5;3.8,4.5;cc;%s]
]] .. mail.theme
local from = minetest.formspec_escape(message.from) or ""
local from = core.formspec_escape(message.from) or ""
local to = mail.parse_player_list(message.to or "")
local to_str = mail.get_color("header") .. "," .. S("To") .. ",,"
to_str = to_str .. table.concat(to, ",,")
@ -31,13 +31,13 @@ function mail.show_receivers(name, id)
local cc_str = mail.get_color("header") .. "," .. S("CC") .. ",,"
cc_str = cc_str .. table.concat(cc, ",,")
local date = type(message.time) == "number"
and minetest.formspec_escape(os.date(mail.get_setting(name, "date_format"), message.time)) or ""
and core.formspec_escape(os.date(mail.get_setting(name, "date_format"), message.time)) or ""
formspec = string.format(formspec, from, date, to_str, cc_str)
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end

6
ui/select_contact.lua
View file

@ -39,10 +39,10 @@ function mail.show_select_contact(name, to, cc)
bcc = ""
end]]--
formspec = string.format(formspec, contacts, to, cc)--, bcc()
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end
@ -60,7 +60,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
bcc = "bccremove"
}) do
if fields[k] then
local evt = minetest.explode_table_event(fields[k])
local evt = core.explode_table_event(fields[k])
mail.selected_idxs[k][name] = evt.row - 1
if evt.type == "DCL" and mail.selected_idxs[k][name] then
fields[action] = true

8
ui/settings.lua
View file

@ -184,10 +184,10 @@ function mail.show_settings(name)
end
end
formspec = formspec .. mail.theme
minetest.show_formspec(name, FORMNAME, formspec)
core.show_formspec(name, FORMNAME, formspec)
end
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
if formname ~= FORMNAME then
return
end
@ -215,7 +215,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
mail.selected_idxs[setting][playername] = mail.selected_idxs[setting][playername] or
mail.get_setting(playername, setting)
if fields[setting] then
local evt = minetest.explode_table_event(fields[setting])
local evt = core.explode_table_event(fields[setting])
mail.selected_idxs["index_" .. setting][playername] = evt.row-1
elseif fields["add_" .. setting] then
table.insert(mail.selected_idxs[setting][playername], fields["field_" .. setting])
@ -233,7 +233,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
return
elseif fields.groups then
local evt = minetest.explode_table_event(fields.groups)
local evt = core.explode_table_event(fields.groups)
mail.selected_idxs.settings_group[playername] = mail.settings_groups[tonumber(evt.row)].name
mail.show_settings(playername)
elseif fields.optionstab == "1" then

8
ui/trash.lua
View file

@ -28,14 +28,14 @@ function mail.show_trash(name)
for _, message in ipairs(messages) do
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = ","
formspec[#formspec + 1] = minetest.formspec_escape(message.to)
formspec[#formspec + 1] = core.formspec_escape(message.to)
formspec[#formspec + 1] = ","
if message.subject ~= "" then
if string.len(message.subject) > 30 then
formspec[#formspec + 1] = minetest.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = core.formspec_escape(string.sub(message.subject, 1, 27))
formspec[#formspec + 1] = "..."
else
formspec[#formspec + 1] = minetest.formspec_escape(message.subject)
formspec[#formspec + 1] = core.formspec_escape(message.subject)
end
else
formspec[#formspec + 1] = S("(No subject)")
@ -49,5 +49,5 @@ function mail.show_trash(name)
else
formspec[#formspec + 1] = "]label[2.25,4.5;" .. S("Trash is empty") .. "]"
end
minetest.show_formspec(name, "mail:trash", table.concat(formspec, ""))
core.show_formspec(name, "mail:trash", table.concat(formspec, ""))
end