Split inbox into api.lua and gui.lua
This commit is contained in:
rubenwardy
parent
38ade9e590
commit
498a62bc93
44
api.lua
Normal file
44
api.lua
Normal file
@ -0,0 +1,44 @@
|
||||
mail.highlightedmessages = {}
|
||||
|
||||
mail.messages = {}
|
||||
|
||||
|
||||
mail.registered_on_receives = {}
|
||||
function mail.register_on_receive(func)
|
||||
mail.registered_on_receive[#mail.registered_on_receives + 1] = func
|
||||
end
|
||||
|
||||
mail.receive_mail_message = "You have a new message from %s! Subject: %s\nTo view it, type /mail"
|
||||
|
||||
function mail.send(src,dst,subject,body)
|
||||
minetest.log("action", "[mail] '" .. src .. "' sends mail to '" .. dst ..
|
||||
"' with subject '" .. subject .. "' and body: '" .. body .. "'")
|
||||
|
||||
if not mail.messages[dst] then mail.messages[dst] = {} end
|
||||
table.insert(mail.messages[dst],1,{
|
||||
unread=true,
|
||||
sender=src,
|
||||
subject=subject,
|
||||
body=body,
|
||||
time=os.time()
|
||||
})
|
||||
|
||||
for _, player in ipairs(minetest.get_connected_players()) do
|
||||
local name = player:get_player_name()
|
||||
if name == dst then
|
||||
if subject == "" then subject = "(No subject)" end
|
||||
if string.len(subject) > 30 then
|
||||
subject = string.sub(subject,1,27) .. "..."
|
||||
end
|
||||
minetest.chat_send_player(dst,
|
||||
string.format(mail.receive_mail_message, src, subject))
|
||||
end
|
||||
end
|
||||
mail.save()
|
||||
|
||||
for i=1, #mail.registered_on_receives do
|
||||
if mail.registered_on_receives[i](src, dst, subject, body) then
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,4 +1,3 @@
|
||||
|
||||
minetest.register_chatcommand("mail",{
|
||||
description = "Open the mail interface",
|
||||
func = function(name)
|
||||
|
||||
168
gui.lua
168
gui.lua
@ -1,3 +1,171 @@
|
||||
|
||||
mail.inboxformspec = "size[8,9;]"..
|
||||
"button_exit[7.5,0;0.5,0.5;quit;X]"..
|
||||
"button[6.25,1;1.5,0.5;new;New Message]"..
|
||||
"button[6.25,2;1.5,0.5;read;Read]"..
|
||||
"button[6.25,3;1.5,0.5;reply;Reply]"..
|
||||
"button[6.25,4;1.5,0.5;forward;Forward]"..
|
||||
"button[6.25,5;1.5,0.5;delete;Delete]"..
|
||||
"button[6.25,6;1.5,0.5;markread;Mark Read]"..
|
||||
"button[6.25,7;1.5,0.5;markunread;Mark Unread]"..
|
||||
"button[6.25,8;1.5,0.5;about;About]"..
|
||||
"textlist[0,0.5;6,8.5;message;"
|
||||
|
||||
function mail.showabout(name)
|
||||
local formspec = "size[4,5;]"..
|
||||
"button[3.5,0;0.5,0.5;back;X]"..
|
||||
"label[0,0;Mail]"..
|
||||
"label[0,0.5;By cheapie]"..
|
||||
"label[0,1;http://github.com/cheapie/mail]"..
|
||||
"label[0,1.5;See LICENSE file for license information]"..
|
||||
"label[0,2.5;NOTE: Communication using this system]"..
|
||||
"label[0,3;is NOT guaranteed to be private!]"..
|
||||
"label[0,3.5;Admins are able to view the messages]"..
|
||||
"label[0,4;of any player.]"
|
||||
minetest.show_formspec(name,"mail:about",formspec)
|
||||
end
|
||||
|
||||
function mail.showinbox(name)
|
||||
local formspec = mail.inboxformspec
|
||||
if not mail.messages[name] then mail.messages[name] = {} end
|
||||
local idx, message
|
||||
if mail.messages[name][1] then
|
||||
for idx,message in ipairs(mail.messages[name]) do
|
||||
if idx ~= 1 then formspec = formspec .. "," end
|
||||
if message.unread then
|
||||
formspec = formspec .. "#FF8888"
|
||||
end
|
||||
formspec = formspec .. "From: " .. minetest.formspec_escape(message.sender) .. " Subject: "
|
||||
if message.subject ~= "" then
|
||||
if string.len(message.subject) > 30 then
|
||||
formspec = formspec .. minetest.formspec_escape(string.sub(message.subject,1,27)).. "..."
|
||||
else
|
||||
formspec = formspec .. minetest.formspec_escape(message.subject)
|
||||
end
|
||||
else
|
||||
formspec = formspec .. "(No subject)"
|
||||
end
|
||||
end
|
||||
formspec = formspec .. "]label[0,0;Welcome! You've got mail!]"
|
||||
else
|
||||
formspec = formspec .. "No mail :(]label[0,0;Welcome!]"
|
||||
end
|
||||
minetest.show_formspec(name,"mail:inbox",formspec)
|
||||
end
|
||||
|
||||
function mail.showmessage(name,msgnumber)
|
||||
local message = mail.messages[name][msgnumber]
|
||||
local formspec = "size[8,6]button[7.5,0;0.5,0.5;back;X]label[0,0;From: %s]label[0,0.5;Subject: %s]textarea[0.25,1;8,4;body;;%s]button[1,5;2,1;reply;Reply]button[3,5;2,1;forward;Forward]button[5,5;2,1;delete;Delete]"
|
||||
local sender = minetest.formspec_escape(message.sender)
|
||||
local subject = minetest.formspec_escape(message.subject)
|
||||
local body = minetest.formspec_escape(message.body)
|
||||
formspec = string.format(formspec,sender,subject,body)
|
||||
minetest.show_formspec(name,"mail:message",formspec)
|
||||
end
|
||||
|
||||
function mail.showcompose(name,defaulttgt,defaultsubj,defaultbody)
|
||||
local formspec = "size[8,8]field[0.25,0.5;4,1;to;To:;%s]field[0.25,1.5;4,1;subject;Subject:;%s]textarea[0.25,2.5;8,4;body;;%s]button[1,7;2,1;cancel;Cancel]button[7.5,0;0.5,0.5;cancel;X]button[5,7;2,1;send;Send]"
|
||||
formspec = string.format(formspec,minetest.formspec_escape(defaulttgt),minetest.formspec_escape(defaultsubj),minetest.formspec_escape(defaultbody))
|
||||
minetest.show_formspec(name,"mail:compose",formspec)
|
||||
end
|
||||
|
||||
function mail.handle_receivefields(player, formname, fields)
|
||||
if formname == "" and fields and fields.quit and minetest.get_modpath("unified_inventory") then
|
||||
unified_inventory.set_inventory_formspec(player, "craft")
|
||||
end
|
||||
|
||||
if formname == "mail:about" then
|
||||
minetest.after(0.5, function()
|
||||
mail.showinbox(player:get_player_name())
|
||||
end)
|
||||
elseif formname == "mail:inbox" then
|
||||
local name = player:get_player_name()
|
||||
if fields.message then
|
||||
local event = minetest.explode_textlist_event(fields.message)
|
||||
mail.highlightedmessages[name] = event.index
|
||||
if event.type == "DCL" and mail.messages[name][mail.highlightedmessages[name]] then
|
||||
mail.messages[name][mail.highlightedmessages[name]].unread = false
|
||||
mail.showmessage(name,mail.highlightedmessages[name])
|
||||
end
|
||||
end
|
||||
if fields.read then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then
|
||||
mail.messages[name][mail.highlightedmessages[name]].unread = false
|
||||
mail.showmessage(name,mail.highlightedmessages[name])
|
||||
end
|
||||
elseif fields.delete then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then table.remove(mail.messages[name],mail.highlightedmessages[name]) end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
elseif fields.reply and mail.messages[name][mail.highlightedmessages[name]] then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local replyfooter = "Type your reply here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,message.sender,"Re: "..message.subject,replyfooter)
|
||||
elseif fields.forward and mail.messages[name][mail.highlightedmessages[name]] then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local fwfooter = "Type your message here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,"","Fw: "..message.subject,fwfooter)
|
||||
elseif fields.markread then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then mail.messages[name][mail.highlightedmessages[name]].unread = false end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
elseif fields.markunread then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then mail.messages[name][mail.highlightedmessages[name]].unread = true end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
elseif fields.new then
|
||||
mail.showcompose(name,"","","Type your message here.")
|
||||
elseif fields.quit then
|
||||
if minetest.get_modpath("unified_inventory") then
|
||||
unified_inventory.set_inventory_formspec(player, "craft")
|
||||
end
|
||||
elseif fields.about then
|
||||
mail.showabout(name)
|
||||
end
|
||||
return true
|
||||
elseif formname == "mail:message" then
|
||||
local name = player:get_player_name()
|
||||
if fields.back then
|
||||
mail.showinbox(name)
|
||||
elseif fields.reply then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local replyfooter = "Type your reply here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,message.sender,"Re: "..message.subject,replyfooter)
|
||||
elseif fields.forward then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local fwfooter = "Type your message here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,"","Fw: "..message.subject,fwfooter)
|
||||
elseif fields.delete then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then table.remove(mail.messages[name],mail.highlightedmessages[name]) end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
end
|
||||
return true
|
||||
elseif formname == "mail:compose" then
|
||||
if fields.send then
|
||||
mail.send(player:get_player_name(),fields.to,fields.subject,fields.body)
|
||||
end
|
||||
minetest.after(0.5, function()
|
||||
mail.showinbox(player:get_player_name())
|
||||
end)
|
||||
return true
|
||||
elseif formname == "mail:unreadnag" then
|
||||
if fields.yes then
|
||||
mail.showinbox(player:get_player_name())
|
||||
else
|
||||
minetest.chat_send_player(player:get_player_name(),"You can use the /mail command" .. (minetest.get_modpath("unified_inventory") and " or the mail button in the inventory " or " ") .. "to read your messages later.")
|
||||
end
|
||||
return true
|
||||
elseif fields.mail then
|
||||
mail.showinbox(player:get_player_name())
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_on_player_receive_fields(mail.handle_receivefields)
|
||||
|
||||
|
||||
if minetest.get_modpath("unified_inventory") then
|
||||
mail.receive_mail_message = mail.receive_mail_message ..
|
||||
" or use the mail button in the inventory"
|
||||
|
||||
211
inbox.lua
211
inbox.lua
@ -1,211 +0,0 @@
|
||||
mail.highlightedmessages = {}
|
||||
|
||||
mail.messages = {}
|
||||
|
||||
|
||||
mail.inboxformspec = "size[8,9;]"..
|
||||
"button_exit[7.5,0;0.5,0.5;quit;X]"..
|
||||
"button[6.25,1;1.5,0.5;new;New Message]"..
|
||||
"button[6.25,2;1.5,0.5;read;Read]"..
|
||||
"button[6.25,3;1.5,0.5;reply;Reply]"..
|
||||
"button[6.25,4;1.5,0.5;forward;Forward]"..
|
||||
"button[6.25,5;1.5,0.5;delete;Delete]"..
|
||||
"button[6.25,6;1.5,0.5;markread;Mark Read]"..
|
||||
"button[6.25,7;1.5,0.5;markunread;Mark Unread]"..
|
||||
"button[6.25,8;1.5,0.5;about;About]"..
|
||||
"textlist[0,0.5;6,8.5;message;"
|
||||
|
||||
|
||||
mail.registered_on_receives = {}
|
||||
function mail.register_on_receive(func)
|
||||
mail.registered_on_receive[#mail.registered_on_receives + 1] = func
|
||||
end
|
||||
|
||||
mail.receive_mail_message = "You have a new message from %s! Subject: %s\nTo view it, type /mail"
|
||||
|
||||
function mail.send(src,dst,subject,body)
|
||||
minetest.log("action", "[mail] '" .. src .. "' sends mail to '" .. dst ..
|
||||
"' with subject '" .. subject .. "' and body: '" .. body .. "'")
|
||||
|
||||
if not mail.messages[dst] then mail.messages[dst] = {} end
|
||||
table.insert(mail.messages[dst],1,{
|
||||
unread=true,
|
||||
sender=src,
|
||||
subject=subject,
|
||||
body=body,
|
||||
time=os.time()
|
||||
})
|
||||
|
||||
for _, player in ipairs(minetest.get_connected_players()) do
|
||||
local name = player:get_player_name()
|
||||
if name == dst then
|
||||
if subject == "" then subject = "(No subject)" end
|
||||
if string.len(subject) > 30 then
|
||||
subject = string.sub(subject,1,27) .. "..."
|
||||
end
|
||||
minetest.chat_send_player(dst,
|
||||
string.format(mail.receive_mail_message, src, subject))
|
||||
end
|
||||
end
|
||||
mail.save()
|
||||
|
||||
for i=1, #mail.registered_on_receives do
|
||||
if mail.registered_on_receives[i](src, dst, subject, body) then
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function mail.showabout(name)
|
||||
local formspec = "size[4,5;]"..
|
||||
"button[3.5,0;0.5,0.5;back;X]"..
|
||||
"label[0,0;Mail]"..
|
||||
"label[0,0.5;By cheapie]"..
|
||||
"label[0,1;http://github.com/cheapie/mail]"..
|
||||
"label[0,1.5;See LICENSE file for license information]"..
|
||||
"label[0,2.5;NOTE: Communication using this system]"..
|
||||
"label[0,3;is NOT guaranteed to be private!]"..
|
||||
"label[0,3.5;Admins are able to view the messages]"..
|
||||
"label[0,4;of any player.]"
|
||||
minetest.show_formspec(name,"mail:about",formspec)
|
||||
end
|
||||
|
||||
function mail.showinbox(name)
|
||||
local formspec = mail.inboxformspec
|
||||
if not mail.messages[name] then mail.messages[name] = {} end
|
||||
local idx, message
|
||||
if mail.messages[name][1] then
|
||||
for idx,message in ipairs(mail.messages[name]) do
|
||||
if idx ~= 1 then formspec = formspec .. "," end
|
||||
if message.unread then
|
||||
formspec = formspec .. "#FF8888"
|
||||
end
|
||||
formspec = formspec .. "From: " .. minetest.formspec_escape(message.sender) .. " Subject: "
|
||||
if message.subject ~= "" then
|
||||
if string.len(message.subject) > 30 then
|
||||
formspec = formspec .. minetest.formspec_escape(string.sub(message.subject,1,27)).. "..."
|
||||
else
|
||||
formspec = formspec .. minetest.formspec_escape(message.subject)
|
||||
end
|
||||
else
|
||||
formspec = formspec .. "(No subject)"
|
||||
end
|
||||
end
|
||||
formspec = formspec .. "]label[0,0;Welcome! You've got mail!]"
|
||||
else
|
||||
formspec = formspec .. "No mail :(]label[0,0;Welcome!]"
|
||||
end
|
||||
minetest.show_formspec(name,"mail:inbox",formspec)
|
||||
end
|
||||
|
||||
function mail.showmessage(name,msgnumber)
|
||||
local message = mail.messages[name][msgnumber]
|
||||
local formspec = "size[8,6]button[7.5,0;0.5,0.5;back;X]label[0,0;From: %s]label[0,0.5;Subject: %s]textarea[0.25,1;8,4;body;;%s]button[1,5;2,1;reply;Reply]button[3,5;2,1;forward;Forward]button[5,5;2,1;delete;Delete]"
|
||||
local sender = minetest.formspec_escape(message.sender)
|
||||
local subject = minetest.formspec_escape(message.subject)
|
||||
local body = minetest.formspec_escape(message.body)
|
||||
formspec = string.format(formspec,sender,subject,body)
|
||||
minetest.show_formspec(name,"mail:message",formspec)
|
||||
end
|
||||
|
||||
function mail.showcompose(name,defaulttgt,defaultsubj,defaultbody)
|
||||
local formspec = "size[8,8]field[0.25,0.5;4,1;to;To:;%s]field[0.25,1.5;4,1;subject;Subject:;%s]textarea[0.25,2.5;8,4;body;;%s]button[1,7;2,1;cancel;Cancel]button[7.5,0;0.5,0.5;cancel;X]button[5,7;2,1;send;Send]"
|
||||
formspec = string.format(formspec,minetest.formspec_escape(defaulttgt),minetest.formspec_escape(defaultsubj),minetest.formspec_escape(defaultbody))
|
||||
minetest.show_formspec(name,"mail:compose",formspec)
|
||||
end
|
||||
|
||||
function mail.handle_receivefields(player, formname, fields)
|
||||
if formname == "" and fields and fields.quit and minetest.get_modpath("unified_inventory") then
|
||||
unified_inventory.set_inventory_formspec(player, "craft")
|
||||
end
|
||||
|
||||
if formname == "mail:about" then
|
||||
minetest.after(0.5, function()
|
||||
mail.showinbox(player:get_player_name())
|
||||
end)
|
||||
elseif formname == "mail:inbox" then
|
||||
local name = player:get_player_name()
|
||||
if fields.message then
|
||||
local event = minetest.explode_textlist_event(fields.message)
|
||||
mail.highlightedmessages[name] = event.index
|
||||
if event.type == "DCL" and mail.messages[name][mail.highlightedmessages[name]] then
|
||||
mail.messages[name][mail.highlightedmessages[name]].unread = false
|
||||
mail.showmessage(name,mail.highlightedmessages[name])
|
||||
end
|
||||
end
|
||||
if fields.read then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then
|
||||
mail.messages[name][mail.highlightedmessages[name]].unread = false
|
||||
mail.showmessage(name,mail.highlightedmessages[name])
|
||||
end
|
||||
elseif fields.delete then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then table.remove(mail.messages[name],mail.highlightedmessages[name]) end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
elseif fields.reply and mail.messages[name][mail.highlightedmessages[name]] then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local replyfooter = "Type your reply here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,message.sender,"Re: "..message.subject,replyfooter)
|
||||
elseif fields.forward and mail.messages[name][mail.highlightedmessages[name]] then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local fwfooter = "Type your message here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,"","Fw: "..message.subject,fwfooter)
|
||||
elseif fields.markread then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then mail.messages[name][mail.highlightedmessages[name]].unread = false end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
elseif fields.markunread then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then mail.messages[name][mail.highlightedmessages[name]].unread = true end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
elseif fields.new then
|
||||
mail.showcompose(name,"","","Type your message here.")
|
||||
elseif fields.quit then
|
||||
if minetest.get_modpath("unified_inventory") then
|
||||
unified_inventory.set_inventory_formspec(player, "craft")
|
||||
end
|
||||
elseif fields.about then
|
||||
mail.showabout(name)
|
||||
end
|
||||
return true
|
||||
elseif formname == "mail:message" then
|
||||
local name = player:get_player_name()
|
||||
if fields.back then
|
||||
mail.showinbox(name)
|
||||
elseif fields.reply then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local replyfooter = "Type your reply here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,message.sender,"Re: "..message.subject,replyfooter)
|
||||
elseif fields.forward then
|
||||
local message = mail.messages[name][mail.highlightedmessages[name]]
|
||||
local fwfooter = "Type your message here."..string.char(10)..string.char(10).."--Original message follows--"..string.char(10)..message.body
|
||||
mail.showcompose(name,"","Fw: "..message.subject,fwfooter)
|
||||
elseif fields.delete then
|
||||
if mail.messages[name][mail.highlightedmessages[name]] then table.remove(mail.messages[name],mail.highlightedmessages[name]) end
|
||||
mail.showinbox(name)
|
||||
mail.save()
|
||||
end
|
||||
return true
|
||||
elseif formname == "mail:compose" then
|
||||
if fields.send then
|
||||
mail.send(player:get_player_name(),fields.to,fields.subject,fields.body)
|
||||
end
|
||||
minetest.after(0.5, function()
|
||||
mail.showinbox(player:get_player_name())
|
||||
end)
|
||||
return true
|
||||
elseif formname == "mail:unreadnag" then
|
||||
if fields.yes then
|
||||
mail.showinbox(player:get_player_name())
|
||||
else
|
||||
minetest.chat_send_player(player:get_player_name(),"You can use the /mail command" .. (minetest.get_modpath("unified_inventory") and " or the mail button in the inventory " or " ") .. "to read your messages later.")
|
||||
end
|
||||
return true
|
||||
elseif fields.mail then
|
||||
mail.showinbox(player:get_player_name())
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_on_player_receive_fields(mail.handle_receivefields)
|
||||
2
init.lua
2
init.lua
@ -4,7 +4,7 @@ mail = {}
|
||||
local MP = minetest.get_modpath(minetest.get_current_modname())
|
||||
dofile(MP .. "/chatcommands.lua")
|
||||
dofile(MP .. "/persistence.lua")
|
||||
dofile(MP .. "/inbox.lua")
|
||||
dofile(MP .. "/api.lua")
|
||||
dofile(MP .. "/gui.lua")
|
||||
|
||||
-- optional webmail stuff below
|
||||
|
||||
@ -18,4 +18,4 @@ minetest.register_on_joinplayer(function(player)
|
||||
)
|
||||
end
|
||||
end,player)
|
||||
end)
|
||||
end)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user