From 8beec340d3b6c025895962b19144a8d2c2894820 Mon Sep 17 00:00:00 2001
From: Peter Nerlich <peter.nerlich+dev@googlemail.com>
Date: Wed, 12 Aug 2020 11:51:01 +0200
Subject: [PATCH] revert renaming "sender" to "from" to maintain backwards
compatibility
---
api.lua | 2 +-
gui.lua | 10 +++++-----
test/auth.sqlite | Bin 24576 -> 24576 bytes
util/normalize.lua | 1 -
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/api.lua b/api.lua
index 1b3c3a8..c480f7c 100644
--- a/api.lua
+++ b/api.lua
@@ -67,7 +67,7 @@ function mail.send(src, dst, subject, body)
-- form the actual mail
local msg = {
unread = true,
- from = m.from,
+ sender = m.from,
to = m.to,
subject = m.subject,
body = m.body,
diff --git a/gui.lua b/gui.lua
index 0739d9d..3973b5e 100644
--- a/gui.lua
+++ b/gui.lua
@@ -60,7 +60,7 @@ function mail.show_inbox(name)
end
end
formspec[#formspec + 1] = ","
- formspec[#formspec + 1] = minetest.formspec_escape(message.from)
+ formspec[#formspec + 1] = minetest.formspec_escape(message.sender)
formspec[#formspec + 1] = ","
if message.subject ~= "" then
if string.len(message.subject) > 30 then
@@ -102,7 +102,7 @@ function mail.show_message(name, msgnumber)
button[6,8.5;2,1;delete;Delete]
]] .. theme
- local from = minetest.formspec_escape(message.from)
+ local from = minetest.formspec_escape(message.sender)
local to = minetest.formspec_escape(message.to)
local cc = minetest.formspec_escape(message.cc)
local subject = minetest.formspec_escape(message.subject)
@@ -144,7 +144,7 @@ end
function mail.reply(name, message)
mail.ensure_new_format(message)
local replyfooter = "Type your reply here.\n\n--Original message follows--\n" ..message.body
- mail.show_compose(name, message.from, "Re: "..message.subject, replyfooter)
+ mail.show_compose(name, message.sender, "Re: "..message.subject, replyfooter)
end
function mail.replyall(name, message)
@@ -152,8 +152,8 @@ function mail.replyall(name, message)
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
local recipients = message.to
- if message.from ~= nil then
- recipients = message.from .. ", " .. recipients
+ if message.sender ~= nil then
+ recipients = message.sender .. ", " .. recipients
end
recipients = mail.parse_player_list(recipients)
for k,v in pairs(recipients) do
diff --git a/test/auth.sqlite b/test/auth.sqlite
index eaf402dc8dc47ebb62cc33f2928b4de31443851f..e3f882920a157151ebc4af34d92adacfd6ff78b0 100644
GIT binary patch
delta 695
zcmZoTz}Rqrae_4C@`*CejLSDBEaB&3=B{SotLOR4UA?g}m%F~Ho|%n7yfv4lB(=E2
zSlLiH&o7|JHL@_dAT&R{Ft@TeHBdVxqFgyKGSMZy(yg+v)Hx{B$g4cp-!Z++N#7|X
zFxxRA$E3uf$hXAH%qZ0-AiFdouQJfwGPp9wC*9Q}ugKFU-Lt|V%{(;6*C5Qu$jmt>
z*TW#iyuh!#+__#~+qX);!Y9(H)W0;NGPu||$v4d{$<r_}EI+7FKP@sP(IT=as<JRM
zqq5Y$$TT!FKg2u5IlLgL$fqPVH>l9j#n{EGprWccC^(?7Dx@+h#mF<tsiZ1WyD}=L
zthA&mIn2m0DLg3KAT!Ott1u-Z)HFCCD_g%rzo;T2FTB1yDl%0&EXXOR+@l~gpem!-
zB{)AaAk@;sx7gL$%OcFwr##3pq%zyG*j(Gp)56;~&%GooucAC#+s`*I#68QTSU=Om
zGQ%i5H>Wh;EyA;~u*kh6J3KYL(kIk4yTTyTIV-@?qNF&?D8M}+Jl7+~(<!&yzr>{2
zG&H#=Fn~2Z-cUMn^Iw@dMwWQvz3(^I%hfUp#T)Nw=VD-BVCH|q!2g5)9siTff(qC8
zC%@C@U@~Uj{7zp`K$Mx6fq{XIe>(&JQU2}x-}qnh-{ZfqSx{jye=LsxGovhXW?o5Z
zQDSllCqFZzICF7EerXAh2s5KB6I?==nNgexEWs_r%qa^K=MZG(6bB1)@!w)#<6q3o
zznK3#|5N@i{2TcXY!+1L=a1!O;gn^BX%OOLVU%TrTPVQI!YIxNv5}wuD+3n`r#K_n
XJV6Eq25trj0PBIfMFgw|;uv87Pm9@%
delta 214
zcmZoTz}Rqrae_1>+e8^>Mz)O!OZYjMc>Xf*)${z_*!YoW^Iw@dMwYmR26r~s%hfUp
z#4R+~$Hl<Fz{LNKf&T~pyUl_IkN7vg(-#!rWa4FDU|`|Dz_6LeVKx8639=46EX<6u
zOqqElsYQv&C7jI6jN(ki8Tq9p+)T`zvM_NDMrKZNurSDA7XGsg{4e;w@t@_tvsqAK
nFTXJ#3!^L}+!PjW7DjPKh%wB(ES$28FmsqVSvbWx!3F^U`~5sv
diff --git a/util/normalize.lua b/util/normalize.lua
index f91859f..ec440d9 100644
--- a/util/normalize.lua
+++ b/util/normalize.lua
@@ -50,7 +50,6 @@ end
function mail.ensure_new_format(message)
if message.sender then
- message.from = message.sender
message.to = name
end
end
--
GitLab