From 8fb00a961c2359591fc6f3f3a0c5ac27b8182402 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Mon, 16 Apr 2018 20:54:16 -0700 Subject: [PATCH] refactor to avoid unnecessary emojify computations (#143) --- routes/_components/status/StatusContent.html | 8 ++++---- routes/_components/status/StatusSpoiler.html | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/routes/_components/status/StatusContent.html b/routes/_components/status/StatusContent.html index 197bbde2..257ba374 100644 --- a/routes/_components/status/StatusContent.html +++ b/routes/_components/status/StatusContent.html @@ -77,10 +77,10 @@ shown && 'shown' ) }, - massagedContent: (originalStatus, $autoplayGifs) => { - let content = originalStatus.content - - content = emojifyText(content, originalStatus.emojis, $autoplayGifs) + content: (originalStatus) => originalStatus.content, + emojis: (originalStatus) => originalStatus.emojis, + massagedContent: (content, emojis, $autoplayGifs) => { + content = emojifyText(content, emojis, $autoplayGifs) // GNU Social and Pleroma don't add

tags if (!content.startsWith('

')) { diff --git a/routes/_components/status/StatusSpoiler.html b/routes/_components/status/StatusSpoiler.html index 1571e169..682ecc11 100644 --- a/routes/_components/status/StatusSpoiler.html +++ b/routes/_components/status/StatusSpoiler.html @@ -61,9 +61,10 @@ store: () => store, computed: { spoilerText: (originalStatus) => originalStatus.spoiler_text, - massagedSpoilerText: (spoilerText, originalStatus, $autoplayGifs) => { + emojis: (originalStatus) => originalStatus.emojis, + massagedSpoilerText: (spoilerText, emojis, $autoplayGifs) => { spoilerText = escapeHtml(spoilerText) - return emojifyText(spoilerText, originalStatus.emojis, $autoplayGifs) + return emojifyText(spoilerText, emojis, $autoplayGifs) }, delegateKey: (uuid) => `spoiler-${uuid}` },