From e95983f5dfe8fba7852a6ac1a42c2048e83db03d Mon Sep 17 00:00:00 2001
From: Yamagishi Kazutoshi <ykzts@desire.sh>
Date: Thu, 4 May 2017 22:52:08 +0900
Subject: Decode IDNA in PreviewCard (#2781)

---
 .../mastodon/features/status/components/card.js        | 18 +++++++++++-------
 app/javascript/styles/components.scss                  |  6 ++++++
 2 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'app/javascript')

diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js
index 9e7d4f884..ebd120e74 100644
--- a/app/javascript/mastodon/features/status/components/card.js
+++ b/app/javascript/mastodon/features/status/components/card.js
@@ -1,11 +1,15 @@
 import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import punycode from 'punycode'
 
-const hostStyle = {
-  display: 'block',
-  marginTop: '5px',
-  fontSize: '13px'
-};
+const IDNA_PREFIX = 'xn--';
+
+const decodeIDNA = domain => {
+  return domain
+    .split('.')
+    .map(part => part.indexOf(IDNA_PREFIX) === 0 ? punycode.decode(part.slice(IDNA_PREFIX.length)) : part)
+    .join('.');
+}
 
 const getHostname = url => {
   const parser = document.createElement('a');
@@ -30,7 +34,7 @@ class Card extends React.PureComponent {
     }
 
     if (provider.length < 1) {
-      provider = getHostname(card.get('url'))
+      provider = decodeIDNA(getHostname(card.get('url')));
     }
 
     return (
@@ -40,7 +44,7 @@ class Card extends React.PureComponent {
         <div className='status-card__content'>
           <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>
           <p className='status-card__description'>{(card.get('description') || '').substring(0, 50)}</p>
-          <span className='status-card__host' style={hostStyle}>{provider}</span>
+          <span className='status-card__host'>{provider}</span>
         </div>
       </a>
     );
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 3c91e730b..93a3d7046 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -1818,6 +1818,12 @@ button.icon-button.active i.fa-retweet {
   color: $color3;
 }
 
+.status-card__host {
+  display: block;
+  margin-top: 5px;
+  font-size: 13px;
+}
+
 .status-card__image {
   flex: 0 0 100px;
   background: lighten($color1, 8%);
-- 
cgit