fix pattern matching (#433)

src/utils/eventsToItems.ts

@@ -1,3 +1,5 @@
+import { filterEventByPatterns } from './filterEventByPatterns';
+
 import type { CalendarEvent } from './calendarEvents';
 import type { CalendarItem } from './calendarItem';
 import type { ItemSettings } from './itemSettings';
@@ -31,20 +33,12 @@ const eventToItem = (event: CalendarEvent | undefined, { pattern, useSummary }:
     return [];
   }
 
-  const { content: { summary }} = event;
-
   const possibleTypes = pattern.
     map((pat, idx) => ({
       ...pat,
       idx
     })).
-    filter((pat: Pattern) => {
-      if (pat.pattern_exact) {
-        return pat.pattern && summary.toLowerCase() === pat.pattern.toLowerCase();
-      }
-
-      return pat.pattern && summary.toLowerCase().includes(pat.pattern.toLowerCase());
-    });
+    filter(pat => filterEventByPatterns(pat, event));
 
   if (possibleTypes.length > 0) {
     return possibleTypes.map(pat => getData(event, pat, useSummary));

src/utils/filterEventByPatterns.ts

@@ -0,0 +1,14 @@
+import type { CalendarEvent } from './calendarEvents';
+import type { ItemSettings } from './itemSettings';
+
+const filterEventByPatterns = ({ pattern, pattern_exact }: ItemSettings, { content: { summary }}: CalendarEvent) => {
+  if (pattern_exact) {
+    return pattern && summary.toLowerCase() === pattern.toLowerCase();
+  }
+
+  return pattern && summary.toLowerCase().includes(pattern.toLowerCase());
+};
+
+export {
+  filterEventByPatterns
+};

src/utils/findActiveEvents.ts

@@ -1,5 +1,6 @@
 import { getDayFromDate } from './getDayFromDate';
 import { getTimeZoneOffset } from './getTimeZoneOffset';
+import { filterEventByPatterns } from './filterEventByPatterns';
 
 import type { CalendarEvent } from './calendarEvents';
 import type { TrashCardConfig } from '../cards/trash-card/trash-card-config';
@@ -26,9 +27,9 @@ const isMatchingAnyPatterns = (item: CalendarEvent, config: Config) => {
   }
 
   const trashTypes = config.pattern.filter(pat => pat.type !== 'others');
-  const patterns = trashTypes.map(pat => pat.pattern).filter(pattern => pattern !== undefined);
+  const patterns = trashTypes.filter(pattern => pattern.pattern !== undefined);
 
-  return patterns.length === 0 || patterns.some(pattern => item.content.summary.toLowerCase().includes(pattern.toLowerCase()));
+  return patterns.length === 0 || patterns.some(pat => filterEventByPatterns(pat, item));
 };
 
 const isNotPastWholeDayEvent = (item: CalendarEvent, now: Date, dropAfter: boolean): boolean =>