Merge 0.10->trunk

[prosody.git] / util / filters.lua

diff --git a/util/filters.lua b/util/filters.lua
index d143666bf8d8f212225d475cdc8312317e746ad4..f405c0bdd91f70a47a51fa3e2a11d0cba8f93b97 100644 (file)
--- a/util/filters.lua
+++ b/util/filters.lua
@@ -1,22 +1,22 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
 local t_insert, t_remove = table.insert, table.remove;
 
-module "filters"
+local _ENV = nil;
 
 local new_filter_hooks = {};
 
-function initialize(session)
+local function initialize(session)
        if not session.filters then
                local filters = {};
                session.filters = filters;
-               
+
                function session.filter(type, data)
                        local filter_list = filters[type];
                        if filter_list then
@@ -28,37 +28,39 @@ function initialize(session)
                        return data;
                end
        end
-       
+
        for i=1,#new_filter_hooks do
                new_filter_hooks[i](session);
        end
-       
+
        return session.filter;
 end
 
-function add_filter(session, type, callback, priority)
+local function add_filter(session, type, callback, priority)
        if not session.filters then
                initialize(session);
        end
-       
+
        local filter_list = session.filters[type];
        if not filter_list then
                filter_list = {};
                session.filters[type] = filter_list;
+       elseif filter_list[callback] then
+               return; -- Filter already added
        end
-       
+
        priority = priority or 0;
-       
+
        local i = 0;
        repeat
                i = i + 1;
-       until not filter_list[i] or filter_list[filter_list[i]] >= priority;
-       
+       until not filter_list[i] or filter_list[filter_list[i]] < priority;
+
        t_insert(filter_list, i, callback);
        filter_list[callback] = priority;
 end
 
-function remove_filter(session, type, callback)
+local function remove_filter(session, type, callback)
        if not session.filters then return; end
        local filter_list = session.filters[type];
        if filter_list and filter_list[callback] then
@@ -72,11 +74,11 @@ function remove_filter(session, type, callback)
        end
 end
 
-function add_filter_hook(callback)
+local function add_filter_hook(callback)
        t_insert(new_filter_hooks, callback);
 end
 
-function remove_filter_hook(callback)
+local function remove_filter_hook(callback)
        for i=1,#new_filter_hooks do
                if new_filter_hooks[i] == callback then
                        t_remove(new_filter_hooks, i);
@@ -84,4 +86,10 @@ function remove_filter_hook(callback)
        end
 end
 
-return _M;
+return {
+       initialize = initialize;
+       add_filter = add_filter;
+       remove_filter = remove_filter;
+       add_filter_hook = add_filter_hook;
+       remove_filter_hook = remove_filter_hook;
+};