From 8b5b686f087f99d1a2b54e0760add8180d77fa7e Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Wed, 20 Mar 2019 17:29:12 +0100
Subject: [Glitch] Add support for custom emojis in poll options
Fixes #956
Port 80f0910e2141b24082b9143266a9a6cf1ef6a516 to glitch-soc
---
app/javascript/flavours/glitch/components/poll.js | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
(limited to 'app/javascript/flavours/glitch/components')
diff --git a/app/javascript/flavours/glitch/components/poll.js b/app/javascript/flavours/glitch/components/poll.js
index a1b297ce7..56331cb29 100644
--- a/app/javascript/flavours/glitch/components/poll.js
+++ b/app/javascript/flavours/glitch/components/poll.js
@@ -44,6 +44,11 @@ const timeRemainingString = (intl, date, now) => {
return relativeTime;
};
+const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
+ obj[`:${emoji.get('shortcode')}:`] = emoji.toJS();
+ return obj;
+}, {});
+
export default @injectIntl
class Poll extends ImmutablePureComponent {
@@ -99,6 +104,12 @@ class Poll extends ImmutablePureComponent {
const active = !!this.state.selected[`${optionIndex}`];
const showResults = poll.get('voted') || poll.get('expired');
+ let titleEmojified = option.get('title_emojified');
+ if (!titleEmojified) {
+ const emojiMap = makeEmojiMap(poll);
+ titleEmojified = emojify(escapeTextContentForBrowser(option.get('title')), emojiMap);
+ }
+
return (
<li key={option.get('title')}>
{showResults && (
@@ -122,7 +133,7 @@ class Poll extends ImmutablePureComponent {
{!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />}
{showResults && <span className='poll__number'>{Math.round(percent)}%</span>}
- <span dangerouslySetInnerHTML={{ __html: option.get('title_emojified', emojify(escapeTextContentForBrowser(option.get('title')))) }} />
+ <span dangerouslySetInnerHTML={{ __html: titleEmojified }} />
</label>
</li>
);
--
cgit