about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/account
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-21 18:10:56 +0200
committerThibG <thib@sitedethib.com>2018-07-21 21:44:49 +0200
commit1aa253c41d65fcff3ad1c3115b8a57d0ecb710cc (patch)
tree2503629786f902ddad1365c57cfc2640c28580cb /app/javascript/flavours/glitch/features/account
parentc99054ecb283727816177859cb456fd2ee4481b0 (diff)
Display custom emoji in account notes in WebUI (fixes #595)
Diffstat (limited to 'app/javascript/flavours/glitch/features/account')
-rw-r--r--app/javascript/flavours/glitch/features/account/components/header.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js
index 464c73c9a..59d9477d6 100644
--- a/app/javascript/flavours/glitch/features/account/components/header.js
+++ b/app/javascript/flavours/glitch/features/account/components/header.js
@@ -83,7 +83,7 @@ export default class Header extends ImmutablePureComponent {
       actionBtn = '';
     }
 
-    const { text, metadata } = processBio(account.get('note'));
+    const { text, metadata } = processBio(account.get('note_emojified'));
 
     return (
       <div className='account__header__wrapper'>
@@ -121,8 +121,8 @@ export default class Header extends ImmutablePureComponent {
               <div className='account__header__fields'>
                 {metadata.map((pair, i) => (
                   <dl key={i}>
-                    <dt dangerouslySetInnerHTML={{ __html: emojify(pair[0]) }} title={pair[0]} />
-                    <dd dangerouslySetInnerHTML={{ __html: emojify(pair[1]) }} title={pair[1]} />
+                    <dt dangerouslySetInnerHTML={{ __html: pair[0] }} title={pair[0]} />
+                    <dd dangerouslySetInnerHTML={{ __html: pair[1] }} title={pair[1]} />
                   </dl>
                 ))}
               </div>