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
zcmX|*yKmEA6vh430X0e6uW5@iv_VK6GdOjUCK(ea&7*eXJe<Uls*?A^kHq%pI!*;C
zNQe;-e?pNuR~fp1)P)%)1_q`wu#^Q5OC?OI_DXlTzjN+6#~0xE0=!-ar*AeWaC-Lm
z9dzK%BW!81aP2%gdnP$2&nNhO%>6>Lp_YdHn_HXm9;+sJr7`3N9Yr#=R?ge37@IY|
z7VnrlrlM1Mj?5TRHrhFi5wT)Uh*rb^3abptY?CdT74(X1=0cHzDbk%pN><Z!Cq44D
zL!8L?N+h{WiBihf3=Q`TgPIUtW=xD|KBi~&u36BiI@8{%r?+yYL0%!+e6tqj)vBrV
zx~860gIsS=+-*|jVO^zBOUf(JxIdm5j>cNPz$)XSS#6T(Y7C8euUQojbu@02$Y{Ns
z7ks_8FQYUoT(H3Q1p*Q3s3MmqMwM@QOZk{+q=p<j?rQPEfM>Z#iqR5OCR_^AMm}0J
zg@_jNZl}Y$jGRP$d1MIQJw`4j`vHyU1tMLtEQ$JHr;=6_HHn0Bt7Fn!LKyjaRG*E8
zkyawvBwLnJVmc-nSrpKMTtm&V_c{k#>-_Y3<0-Hm_&@xdP98o1D+m7fFC7?$;qVfJ
zf8iCpoVp%;fp4#f`8hv6y&_!85Aa1xa37vy@FP5jf8Y=J4Su#{CvbmZ83!J`C!>~H
zYalzsfg9Jl105}_SzzuCtXg1h2AnIn-E(`Ncj0#T?CgMFt%wsGp1@D=JNyOD;Dr_O
z3hpo3>>hAySXr_G54a0lcG`d&+$2Ky8*|v~ZZP}jvMM{R{Xa9$U6-|)=cdf+KTnI<
Ai~s-t

delta 214
zcmZoTz}Rqrae_1>+e8^>Mz)O!OZYjMc>Xf*)${z_*!YoW^Iw@dMwYmR26r~s%hfUp
z09pIE7#J9s_}?+`|KNYOS<v7S|K@l4f&!dOyg+dl{tFD7c^p>rPn;m@z{A4KD9e<Y
zSCU$km|Vii%*-gxRGg7tTEfl5%qa^K=U`;!6bB1~3})d!%fSDF{~P~V{yUom754HQ
k^RY0>GQv$^;bvhJXM`BT%*(<l%Lp@viIas>oD*yi0Q>zsSO5S3

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