Fix search suggestions for Invidious

FreeTubeApp · Oct 31, 2023 · 9e5602f · 9e5602f
1 parent 19b90a5
commit 9e5602f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
@@ -6,7 +6,7 @@ import FtProfileSelector from '../ft-profile-selector/ft-profile-selector.vue'
 import debounce from 'lodash.debounce'
 
 import { IpcChannels } from '../../../constants'
-import { openInternalPath } from '../../helpers/utils'
+import { decodeHTML, openInternalPath } from '../../helpers/utils'
 import { clearLocalSearchSuggestionsSession, getLocalSearchSuggestions } from '../../helpers/api/local'
 import { invidiousAPICall } from '../../helpers/api/invidious'
 
@@ -258,7 +258,7 @@ export default defineComponent({
       }
 
       invidiousAPICall(searchPayload).then((results) => {
-        this.searchSuggestionsDataList = results.suggestions
+        this.searchSuggestionsDataList = results.suggestions.map(suggestion => decodeHTML(suggestion))
       }).catch((err) => {
         console.error(err)
         if (process.env.IS_ELECTRON && this.backendFallback) {

diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
@@ -664,6 +664,17 @@ export function escapeHTML(untrusted) {
     .replaceAll('\'', '&apos;')
 }
 
+/**
+ * Decode an html encoded string (for when we're not displaying something as html)
+ * @param {string} htmlEncodedString
+ * @returns {string}
+ */
+export function decodeHTML(htmlEncodedString) {
+  const testDiv = document.createElement('div')
+  testDiv.innerHTML = htmlEncodedString
+  return testDiv.innerText
+}
+
 /**
  * Performs a deep copy of a javascript object
  * @param {Object} obj