diff -r 22e6c003a83a -r ae69cea97598 plugins/tell.lua --- a/plugins/tell.lua Thu May 20 14:33:09 2010 +0100 +++ b/plugins/tell.lua Thu May 20 14:33:41 2010 +0100 @@ -3,45 +3,45 @@ function riddim.plugins.tell(bot) bot:hook("commands/tell", function (command) - if command.room then - local s, e = command.param:find(" "); - local nick = command.param:sub(0, s - 1); - local msg = command.param:sub(s + 1); - local found = false; - - for tmp,_ in pairs(command.room.occupants) do - if tmp == nick then - found = true; - break; - end + if command.room then + local s, e = command.param:find(" "); + local nick = command.param:sub(0, s - 1); + local msg = command.param:sub(s + 1); + local found = false; + + for tmp,_ in pairs(command.room.occupants) do + if tmp == nick then + found = true; + break; end + end - if not found then - if(tellings[nick] == nil) then - tellings[nick] = {}; - end - tellings[nick][#tellings[nick] + 1] = {from=command.sender.nick, msg=msg}; - return "Ok! Will tell " .. nick .. " what you have said!"; + if not found then + if(tellings[nick] == nil) then + tellings[nick] = {}; + end + tellings[nick][#tellings[nick] + 1] = {from=command.sender.nick, msg=msg}; + return "Ok! Will tell " .. nick .. " what you have said!"; + else + if nick == command.sender.nick then + return "Are you going crazy!? You are " .. nick .. "!"; else - if nick == command.sender.nick then - return "Are you going crazy!? You are " .. nick .. "!"; - else - return "Aehm?! ... " .. nick .. " is currently online!"; - end + return "Aehm?! ... " .. nick .. " is currently online!"; end - else - return "Sorry, but this command only makes sense if you execute it in a groupchat."; + end + else + return "Sorry, but this command only makes sense if you execute it in a groupchat."; + end + end); + + bot:hook("groupchat/joined", function (room) + room:hook("occupant-joined", function (occupant) + if(tellings[occupant.nick] ~= nil) then + for _,msg in ipairs(tellings[occupant.nick]) do + room:send_message(occupant.nick .. ": Welcome back! " .. msg.from .. " told me, to tell you, \"" .. msg.msg .. "\"."); + end end end); - - bot:hook("groupchat/joined", function (room) - room:hook("occupant-joined", function (occupant) - if(tellings[occupant.nick] ~= nil) then - for _,msg in ipairs(tellings[occupant.nick]) do - room:send_message(occupant.nick .. ": Welcome back! " .. msg.from .. " told me, to tell you, \"" .. msg.msg .. "\"."); - end - end - end); - end); + end); end