comparison mod_firewall/conditions.lib.lua @ 6110:9db1529c06c2

Merge upstream
author tmolitor <thilo@eightysoft.de>
date Sun, 05 Jan 2025 17:50:02 +0100
parents cc665f343690
children b15601203d0d
comparison
equal deleted inserted replaced
6109:4cb1cad2badd 6110:9db1529c06c2
121 function condition_handlers.IN_ROSTER_GROUP(group) 121 function condition_handlers.IN_ROSTER_GROUP(group)
122 return ("not not (roster_entry and roster_entry.groups[%q])"):format(group), { "roster_entry" }; 122 return ("not not (roster_entry and roster_entry.groups[%q])"):format(group), { "roster_entry" };
123 end 123 end
124 124
125 function condition_handlers.SUBSCRIBED() 125 function condition_handlers.SUBSCRIBED()
126 return "(bare_to == bare_from or to_node and rostermanager.is_contact_subscribed(to_node, to_host, bare_from))", 126 return "(bare_to == bare_from or to_node and rostermanager.is_user_subscribed(to_node, to_host, bare_from))",
127 { "rostermanager", "split_to", "bare_to", "bare_from" }; 127 { "rostermanager", "split_to", "bare_to", "bare_from" };
128 end 128 end
129 129
130 function condition_handlers.PENDING_SUBSCRIPTION_FROM_SENDER() 130 function condition_handlers.PENDING_SUBSCRIPTION_FROM_SENDER()
131 return "(bare_to == bare_from or to_node and rostermanager.is_contact_pending_in(to_node, to_host, bare_from))", 131 return "(bare_to == bare_from or to_node and rostermanager.is_contact_pending_in(to_node, to_host, bare_from))",