@@ -28,12 +28,23 @@ source: |
2828 any(html.xpath(body.html, '//h2').nodes,
2929 // org vip
3030 any($org_vips,
31- strings.icontains(..display_text, .display_name)
32- or strings.icontains(..display_text,
33- strings.concat(.first_name, " ", .last_name )
31+ (
32+ .display_name != ""
33+ and strings.icontains(..display_text, .display_name )
3434 )
35- or strings.icontains(..display_text,
36- strings.concat(.last_name, ", ", .first_name)
35+ or (
36+ .first_name != ""
37+ and .last_name != ""
38+ and strings.icontains(..display_text,
39+ strings.concat(.first_name, " ", .last_name)
40+ )
41+ )
42+ or (
43+ .first_name != ""
44+ and .last_name != ""
45+ and strings.icontains(..display_text,
46+ strings.concat(.last_name, ", ", .first_name)
47+ )
3748 )
3849 )
3950 // org sld as the board name
@@ -50,18 +61,29 @@ source: |
5061 strings.starts_with(.display_text, 'A note from ')
5162 and strings.iends_with(.display_text, 'From')
5263 and any($org_vips,
53- strings.icontains(..display_text, .display_name)
54- or strings.icontains(..display_text,
55- strings.concat(.first_name,
56- " ",
57- .last_name
58- )
64+ (
65+ .display_name != ""
66+ and strings.icontains(..display_text, .display_name)
67+ )
68+ or (
69+ .first_name != ""
70+ and .last_name != ""
71+ and strings.icontains(..display_text,
72+ strings.concat(.first_name,
73+ " ",
74+ .last_name
75+ )
76+ )
5977 )
60- or strings.icontains(..display_text,
61- strings.concat(.last_name,
62- ", ",
63- .first_name
64- )
78+ or (
79+ .first_name != ""
80+ and .last_name != ""
81+ and strings.icontains(..display_text,
82+ strings.concat(.last_name,
83+ ", ",
84+ .first_name
85+ )
86+ )
6587 )
6688 )
6789 )
0 commit comments