fixup! fixup! fixup! WIP

browser/index.mjs

@@ -63,6 +63,17 @@ const tokenMatches = token => {
   return issue => issue.textContent.includes(token)
 }
 
+const issueMatches = tokens => tokens.reduce((acc, token, index) => {
+  const prev = tokens[index - 1]
+
+  if (token === 'or') return acc
+
+  return (prev === 'or')
+    ? or(acc, tokenMatches(token))
+    : and(acc, tokenMatches(token))
+}, alwaysTrue)
+
+
 state(
   () => ({
     query: getQueryParam('q') || '',
@@ -84,18 +95,8 @@ state(
       return acc
     }, {})
 
-    const issueMatches = state.tokens.reduce((acc, token, index) => {
-      const prev = state.tokens[index - 1]
-
-      if (token === 'or') return acc
-
-      return (prev === 'or')
-        ? or(acc, tokenMatches(token))
-        : and(acc, tokenMatches(token))
-    }, alwaysTrue)
-
     // What to do with things that are not a token?
-    state.matchedIssueElements = issues.filter(issueMatches)
+    state.matchedIssueElements = issues.filter(issueMatches(tokens))
 
     search(state, push)
     issuesFn(state)