@@ -18,21 +18,43 @@ source: |
1818 )
1919 and (
2020 any($org_vips,
21- strings.icontains(body.html.inner_text, .display_name)
22- or strings.icontains(body.html.inner_text,
23- strings.concat(.first_name, " ", .last_name )
21+ (
22+ .display_name != ""
23+ and strings.icontains(body.html.inner_text, .display_name )
2424 )
25- or strings.icontains(body.html.inner_text,
26- strings.concat(.last_name, ", ", .first_name)
25+ or (
26+ .first_name != ""
27+ and .last_name != ""
28+ and strings.icontains(body.html.inner_text,
29+ strings.concat(.first_name, " ", .last_name)
30+ )
31+ )
32+ or (
33+ .first_name != ""
34+ and .last_name != ""
35+ and strings.icontains(body.html.inner_text,
36+ strings.concat(.last_name, ", ", .first_name)
37+ )
2738 )
2839 )
2940 or any($org_vips,
30- strings.icontains(body.plain.raw, .display_name)
31- or strings.icontains(body.plain.raw,
32- strings.concat(.first_name, " ", .last_name )
41+ (
42+ .display_name != ""
43+ and strings.icontains(body.plain.raw, .display_name )
3344 )
34- or strings.icontains(body.plain.raw,
35- strings.concat(.last_name, ", ", .first_name)
45+ or (
46+ .first_name != ""
47+ and .last_name != ""
48+ and strings.icontains(body.plain.raw,
49+ strings.concat(.first_name, " ", .last_name)
50+ )
51+ )
52+ or (
53+ .first_name != ""
54+ and .last_name != ""
55+ and strings.icontains(body.plain.raw,
56+ strings.concat(.last_name, ", ", .first_name)
57+ )
3658 )
3759 )
3860 )
0 commit comments