X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ffilters.lua;h=6290e53b1744bf82c7c24a0cdeb6b759aaf12a3c;hb=533fc1fa57ce10fc0821f8edaeb247f2710a543c;hp=f6a3e77ae36c1bfb6c94c0fd2fbead13908026ab;hpb=21150443be50adadd65a04396626e8a4dd7a5093;p=prosody.git

diff --git a/util/filters.lua b/util/filters.lua
index f6a3e77a..6290e53b 100644
--- a/util/filters.lua
+++ b/util/filters.lua
@@ -10,20 +10,30 @@ local t_insert, t_remove = table.insert, table.remove;
 
 module "filters"
 
+local new_filter_hooks = {};
+
 function initialize(session)
-	local filters = {};
-	session.filters = filters;
-	
-	function session.filter(type, data)
-		local filter_list = filters[type];
-		if filter_list then
-			for i = 1, #filter_list do
-				data = filter_list[i](data);
-				if data == nil then break; end
+	if not session.filters then
+		local filters = {};
+		session.filters = filters;
+		
+		function session.filter(type, data)
+			local filter_list = filters[type];
+			if filter_list then
+				for i = 1, #filter_list do
+					data = filter_list[i](data, session);
+					if data == nil then break; end
+				end
 			end
+			return data;
 		end
-		return data;
 	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)
@@ -35,6 +45,8 @@ function add_filter(session, type, callback, priority)
 	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;
@@ -42,7 +54,7 @@ function add_filter(session, type, callback, priority)
 	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;
@@ -62,4 +74,16 @@ function remove_filter(session, type, callback)
 	end
 end
 
-return _M;
\ No newline at end of file
+function add_filter_hook(callback)
+	t_insert(new_filter_hooks, callback);
+end
+
+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);
+		end
+	end
+end
+
+return _M;