Software / code / prosody-modules
Changeset
86:fc7055efd568
mod_muc_log: retrieving the room config, is not a kick of a person!! :) (thx again to flo spotting it!)
| author | Thilo Cestonaro <thilo@cestona.ro> |
|---|---|
| date | Sun, 08 Nov 2009 22:10:42 +0100 |
| parents | 85:83494de806a4 |
| children | 87:0e639d081ba7 |
| files | mod_muc_log/mod_muc_log.lua |
| diffstat | 1 files changed, 33 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_muc_log/mod_muc_log.lua Sun Nov 08 18:35:53 2009 +0100 +++ b/mod_muc_log/mod_muc_log.lua Sun Nov 08 22:10:42 2009 +0100 @@ -304,29 +304,35 @@ local function parseIqStanza(stanza, timeStuff, nick) local text = nil; - for _,tag in ipairs(stanza) do - if tag.tag == "query" then - for _,item in ipairs(tag) do - if item.tag == "item" then - for _,reason in ipairs(item) do - if reason.tag == "reason" then - text = reason[1]; - break; + local victim = nil; + if(stanza.attr.type == "set") then + for _,tag in ipairs(stanza) do + if tag.tag == "query" then + for _,item in ipairs(tag) do + if item.tag == "item" and item.attr.nick ~= nil and tostring(item.attr.role) == 'none' then + victim = item.attr.nick; + for _,reason in ipairs(item) do + if reason.tag == "reason" then + text = reason[1]; + break; + end end - end - break; - end + break; + end + end + break; end - break; + end + if victim ~= nil then + if text ~= nil then + text = html.day.reason:gsub("###REASON###", htmlEscape(text)); + else + text = ""; + end + return html.day.kick:gsub("###TIME_STUFF###", timeStuff):gsub("###VICTIM###", victim):gsub("###REASON_STUFF###", text); end end - - if text ~= nil then - text = html.day.reason:gsub("###REASON###", htmlEscape(text)); - else - text = ""; - end - return html.day.kick:gsub("###TIME_STUFF###", timeStuff):gsub("###VICTIM###", nick):gsub("###REASON_STUFF###", text); + return; end local function parsePresenceStanza(stanza, timeStuff, nick) @@ -409,6 +415,7 @@ local timeStuff = html.day.time:gsub("###TIME###", stanza.attr.time); if stanza[1] ~= nil then local nick; + local tmp; -- grep nick from "from" resource if stanza[1].attr.from ~= nil then -- presence and messages @@ -418,14 +425,18 @@ end if stanza[1].tag == "presence" and nick ~= nil then - ret = ret .. parsePresenceStanza(stanza[1], timeStuff, nick); + tmp = parsePresenceStanza(stanza[1], timeStuff, nick); elseif stanza[1].tag == "message" then - ret = ret .. parseMessageStanza(stanza[1], timeStuff, nick); + tmp = parseMessageStanza(stanza[1], timeStuff, nick); elseif stanza[1].tag == "iq" then - ret = ret .. parseIqStanza(stanza[1], timeStuff, nick); + tmp = parseIqStanza(stanza[1], timeStuff, nick); else module:log("info", "unknown stanza subtag in log found. room: %s; day: %s", bareRoomJid, query.year .. "/" .. query.month .. "/" .. query.day); end + if tmp ~= nil then + ret = ret .. tmp + tmp = nil; + end end end end
