diff options
| author | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2011-04-05 13:26:43 +0100 |
| commit | 8c9d841c3d81694d063bd931dbfee0634f53e8f7 (patch) | |
| tree | 35cdd4996c2ba4c67a4805bd01e3830d1dc171f5 /plugins/mod_privacy.lua | |
| parent | 54a5982b5d000a98726601dada57050ac5cb21b4 (diff) | |
| parent | ca74173a8221e9cd93db30c7bb89c8b181f8b60b (diff) | |
| download | prosody-8c9d841c3d81694d063bd931dbfee0634f53e8f7.tar.gz prosody-8c9d841c3d81694d063bd931dbfee0634f53e8f7.zip | |
Merge 0.8->trunk
Diffstat (limited to 'plugins/mod_privacy.lua')
| -rw-r--r-- | plugins/mod_privacy.lua | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua index d5842e26..2d696154 100644 --- a/plugins/mod_privacy.lua +++ b/plugins/mod_privacy.lua @@ -45,28 +45,6 @@ function isAnotherSessionUsingDefaultList(origin) end end -function sendUnavailable(origin, to, from) ---[[ example unavailable presence stanza -<presence from="node@host/resource" type="unavailable" to="node@host" > - <status>Logged out</status> -</presence> -]]-- - local presence = st.presence({from=from, type="unavailable"}); - presence:tag("status"):text("Logged out"); - - local node, host = jid_bare(to); - local bare = node .. "@" .. host; - - local user = bare_sessions[bare]; - if user then - for resource, session in pairs(user.sessions) do - presence.attr.to = session.full_jid; - module:log("debug", "send unavailable to: %s; from: %s", tostring(presence.attr.to), tostring(presence.attr.from)); - origin.send(presence); - end - end -end - function declineList(privacy_lists, origin, stanza, which) if which == "default" then if isAnotherSessionUsingDefaultList(origin) then @@ -123,7 +101,7 @@ function deleteList(privacy_lists, origin, stanza, name) return {"modify", "bad-request", "Not existing list specifed to be deleted."}; end -function createOrReplaceList (privacy_lists, origin, stanza, name, entries, roster) +function createOrReplaceList (privacy_lists, origin, stanza, name, entries) local bare_jid = origin.username.."@"..origin.host; if privacy_lists.lists == nil then @@ -323,7 +301,6 @@ function checkIfNeedToBeBlocked(e, session) return; -- from one of a user's resource to another => HANDS OFF! end - local item; local listname = session.activePrivacyList; if listname == nil then listname = privacy_lists.default; -- no active list selected, use default list @@ -414,7 +391,6 @@ function preCheckIncoming(e) end if resource == nil then local prio = 0; - local session_; if bare_sessions[node.."@"..host] ~= nil then for resource, session_ in pairs(bare_sessions[node.."@"..host].sessions) do if session_.priority ~= nil and session_.priority > prio then |