From fbecb189d448969927e4b889fce362cace9fb546 Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Sat, 6 Aug 2022 04:09:21 -0400
Subject: [PATCH] Fixed API sending escaped HTML #24

---
 src/api.ts   | 5 +++--
 src/utils.ts | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/api.ts b/src/api.ts
index 8090ff5..0b8eeee 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -5,6 +5,7 @@ import { linkFixer } from './linkFixer';
 import { handleMosaic } from './mosaic';
 import { colorFromPalette } from './palette';
 import { translateTweet } from './translate';
+import { unescapeText } from './utils';
 
 const processMedia = (media: TweetMedia): APIPhoto | APIVideo | null => {
   if (media.type === 'photo') {
@@ -50,7 +51,7 @@ const populateTweetProperties = async (
 
   apiTweet.url = `${Constants.TWITTER_ROOT}/${screenName}/status/${tweet.id_str}`;
   apiTweet.id = tweet.id_str;
-  apiTweet.text = linkFixer(tweet, tweet.full_text);
+  apiTweet.text = unescapeText(linkFixer(tweet, tweet.full_text));
   apiTweet.author = {
     name: name,
     screen_name: screenName,
@@ -130,7 +131,7 @@ const populateTweetProperties = async (
     );
     if (translateAPI !== null && translateAPI?.translation) {
       apiTweet.translation = {
-        text: linkFixer(tweet, translateAPI?.translation || ''),
+        text: unescapeText(linkFixer(tweet, translateAPI?.translation || '')),
         source_lang: translateAPI?.sourceLanguage || '',
         target_lang: translateAPI?.destinationLanguage || ''
       };
diff --git a/src/utils.ts b/src/utils.ts
index fadcce4..7a4b7d5 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -5,3 +5,12 @@ export const sanitizeText = (text: string) => {
     .replace(/</g, '&lt;')
     .replace(/>/g, '&gt;');
 };
+
+export const unescapeText = (text: string) => {
+  return text
+    .replace(/&#34;/g, '"')
+    .replace(/&#39;/g, "'")
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&amp;/g, '&');
+}
\ No newline at end of file