@playpilot/tpi 8.29.0-beta.1 → 8.29.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@playpilot/tpi",
-	"version": "8.29.0-beta.1",
+	"version": "8.29.0-beta.2",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

package/src/lib/injection.ts

@@ -7,6 +7,7 @@ import { clearAfterArticlePlaylinks, insertAfterArticlePlaylinks } from './after
 import { clearInTextDisclaimer, insertInTextDisclaimer } from './disclaimer'
 import { exploreTitleUrl, titleUrl } from './routes'
 import { clearInTextWidgets, insertInTextWidgets } from './inTextWidgets'
+import { decodeHtmlEntities, encodeHtmlEntities } from './html'
 
 export const keyDataAttribute = 'data-playpilot-injection-key'
 export const keySelector = `[${keyDataAttribute}]`
@@ -84,9 +85,21 @@ export function injectLinksInDocument(elements: HTMLElement[], injections: LinkI
       // We insert the html here separately from below, where it's done with replacementIndex because we need to capture all html
       // that may have been inside of the match.
       if (replacementIndex === -1) {
-        const match = findShortestMatchBetweenPhrases(element.innerHTML, injection.title, phrase_before || '', phrase_after || '')
+        let match = findShortestMatchBetweenPhrases(element.innerHTML, injection.title, phrase_before || '', phrase_after || '')
 
         if (match) {
+          // This is a crude way of checking if a match contains HTML elements
+          // If the title is directly inside of an element we discard the rest.
+          // This happens sometimes in lists that consists of nothing but titles and may contain special characters
+          if (match.match.includes(">") && match.match.includes("<")) {
+            const encodedTitle = encodeHtmlEntities(injection.title)
+            const matchInsideHTMLIndex = match.match.search(new RegExp(`>\s*${encodedTitle}\s*<`)) + 1
+
+            if (matchInsideHTMLIndex > 0) {
+              match = { match: match.match.slice(matchInsideHTMLIndex, matchInsideHTMLIndex + encodedTitle.length), index: matchInsideHTMLIndex }
+            }
+          }
+
           const { leadingSpaces, trailingSpaces } = getNumberOfLeadingAndTrailingSpaces(match.match)
 
           linkElement.innerHTML = match.match.trim()

package/src/tests/lib/injection.test.js

@@ -867,6 +867,26 @@ describe('injection.ts', () => {
       expect(document.querySelectorAll('a')).toHaveLength(4)
     })
 
+    it('Should properly inject into lists of titles that contain special characters', () => {
+      document.body.innerHTML = `<section>
+          <ul>
+            <li>Daisy Jones & The Six</li>
+            <li>Love & Death</li>
+          </ul>
+        </section>
+      `
+
+      const elements = getLinkInjectionElements(/** @type {HTMLElement} */ (document.querySelector('section')))
+      const injections = [
+        generateInjection('Daisy Jones & The Six', 'Daisy Jones & The Six'),
+        generateInjection('Love & Death', 'Love & Death'),
+      ]
+
+      injectLinksInDocument(elements, { aiInjections: [], manualInjections: injections })
+
+      expect(document.querySelectorAll('a')).toHaveLength(2)
+    })
+
     it('Should properly inject into titles that are split up by multiple elements when phrase_before and phrase_after are given', () => {
       document.body.innerHTML = '<section>Some text with a <strong>phra</strong><strong>se</strong> in it</section>'