X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Ffilters.lua;h=d143666bf8d8f212225d475cdc8312317e746ad4;hb=464a04b551dca8f5c6c11ea706704cd3b9ef489c;hp=09a81cdb101fb9ccd183333346e0bce7c4b28237;hpb=40de60209ab3d362d0ce06439a8ebbcbf49b782b;p=prosody.git

diff --git a/util/filters.lua b/util/filters.lua
index 09a81cdb..d143666b 100644
--- a/util/filters.lua
+++ b/util/filters.lua
@@ -10,22 +10,35 @@ local t_insert, t_remove = table.insert, table.remove;
 
 module "filters"
 
-local function initialize_session(session)
-	local filters = {};
-	session.filters = filters;
-	
-	function session.filter(type, data)
-		local filter_list = filters[type];
-		for i = 1, #filter_list do
-			data = filter_list[i](data);
+local new_filter_hooks = {};
+
+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
+				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)
 	if not session.filters then
-		initialize_session(session);
+		initialize(session);
 	end
 	
 	local filter_list = session.filters[type];
@@ -46,6 +59,7 @@ function add_filter(session, type, callback, priority)
 end
 
 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
 		for i=1, #filter_list do
@@ -58,4 +72,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;