MTSR/mail
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use interleaved style (#124)

Browse Source 
* Generate interleaved style when replying/forwarding a message (#120)

* Simplify interleaving function

Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com>

---------

Co-authored-by: SX <50966843+S-S-X@users.noreply.github.com>
This commit is contained in:
Athozus 2023-12-09 00:01:21 +01:00 committed by GitHub
parent 3bad371353
commit 77de24e467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/message.lua
View File

@ -3,6 +3,11 @@ local S = minetest.get_translator("mail")
local FORMNAME = "mail:message" local FORMNAME = "mail:message"
local function interleaveMsg(body)
return "> " .. (body or ""):gsub("\n", "\n> ")
end
function mail.show_message(name, id) function mail.show_message(name, id)
local message = mail.get_message(name, id) local message = mail.get_message(name, id)
if not message then if not message then
@ -65,8 +70,7 @@ function mail.reply(name, message)
minetest.log("error", "[mail] current mail-context: " .. dump(mail.selected_idxs)) minetest.log("error", "[mail] current mail-context: " .. dump(mail.selected_idxs))
return return
end end
local replyfooter = "Type your reply here.\n\n--Original message follows--\n" ..message.body mail.show_compose(name, message.from, "Re: "..message.subject, interleaveMsg(message.body))
mail.show_compose(name, message.from, "Re: "..message.subject, replyfooter)
end end
function mail.replyall(name, message) function mail.replyall(name, message)
@ -77,8 +81,6 @@ function mail.replyall(name, message)
return return
end end
local replyfooter = "Type your reply here.\n\n--Original message follows--\n" ..message.body
-- new recipients are the sender plus the original recipients, minus ourselves -- new recipients are the sender plus the original recipients, minus ourselves
local recipients = message.to or "" local recipients = message.to or ""
if message.from ~= nil then if message.from ~= nil then
@ -103,12 +105,11 @@ function mail.replyall(name, message)
end end
cc = mail.concat_player_list(cc) cc = mail.concat_player_list(cc)
mail.show_compose(name, recipients, "Re: "..message.subject, replyfooter, cc) mail.show_compose(name, recipients, "Re: "..message.subject, interleaveMsg(message.body), cc)
end end
function mail.forward(name, message) function mail.forward(name, message)
local fwfooter = "Type your message here.\n\n--Original message follows--\n" .. (message.body or "") mail.show_compose(name, "", "Fw: " .. (message.subject or ""), interleaveMsg(message.body))
mail.show_compose(name, "", "Fw: " .. (message.subject or ""), fwfooter)
end end
minetest.register_on_player_receive_fields(function(player, formname, fields) minetest.register_on_player_receive_fields(function(player, formname, fields)