Merge pull request #341 from StampyAI/glossary

Dedupe glossary and update placeholder
StampyAI · Oct 15, 2023 · 5162aef · 5162aef
2 parents 8586087 + a729919
commit 5162aef
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/app/components/search.tsx b/app/components/search.tsx
@@ -36,7 +36,7 @@ export default function Search({
   const searchInputRef = useRef('')
 
   const [urlSearchParams] = useSearchParams()
-  const placeholder = urlSearchParams.get('placeholder') ?? 'Ask a question about AGI safety'
+  const placeholder = urlSearchParams.get('placeholder') ?? 'Ask a question about AI safety'
 
   const {search, isPendingSearch, results} = useSearch(onSiteAnswersRef, limitFromUrl)
 

diff --git a/app/routes/questions/$question.tsx b/app/routes/questions/$question.tsx
@@ -258,24 +258,31 @@ function Contents({pageid, html, glossary}: {pageid: PageId; html: string; gloss
      * Replace all known glossary words in the given `textNode` with:
      *  - a span to mark it as a glossary item
      *  - an on hover popup with a short explaination of the glossary item
+     *  - use each glossary item only once
      */
+    const unusedGlossaryEntries = Object.values(glossary)
+      .filter((item) => item.pageid != pageid)
+      .map(({term}) => term)
+      .sort((a, b) => b.length - a.length)
+      .map(
+        (term) =>
+          [
+            new RegExp(`(^|[^\\w-])(${term})($|[^\\w-])`, 'i'),
+            '$1<span class="glossary-entry">$2</span>$3',
+          ] as const
+      )
     const insertGlossary = (textNode: Node) => {
       const html = (textNode.textContent || '').replace('’', "'").replace('—', '-')
       // The glossary items have to be injected somewhere, so this does it by manually wrapping any known
       // definitions with spans. This is done from the longest to the shortest to make sure that sub strings
       // of longer definitions don't override them.
-      const updated = Object.values(glossary)
-        .filter((item) => item.pageid != pageid)
-        .map(({term}) => term)
-        .sort((a, b) => b.length - a.length)
-        .reduce(
-          (html, entry) =>
-            html.replace(
-              new RegExp(`(^|[^\\w-])(${entry})($|[^\\w-])`, 'gi'),
-              '$1<span class="glossary-entry">$2</span>$3'
-            ),
-          html
-        )
+      const updated = unusedGlossaryEntries.reduce((html, [match, replacement], index) => {
+        if (html.match(match)) {
+          unusedGlossaryEntries.splice(index, 1)
+          return html.replace(match, replacement)
+        }
+        return html
+      }, html)
       if (updated == html) {
         return textNode
       }