From cd0d182ce475abcf324518a7d17aabc68e5af3b9 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 22 May 2015 05:58:50 +0900
Subject: [PATCH] =?utf8?q?=E5=BC=95=E7=94=A8=E3=83=84=E3=82=A4=E3=83=BC?=
 =?utf8?q?=E3=83=88=E3=81=AE=E3=83=AA=E3=83=B3=E3=82=AF=E5=85=88URL?=
 =?utf8?q?=E3=81=AB=E6=AD=A3=E3=81=97=E3=81=8FscreenName=E3=82=92=E5=90=AB?=
 =?utf8?q?=E3=82=81=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/TweenMainTest.cs |  6 +++---
 OpenTween/Tween.cs               | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index b8343ef7..49dd7b51 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -181,7 +181,7 @@ namespace OpenTween
             // PostClass.Text はリンクを除去するのみでエスケープは行わない
             // (TweetFormatter によって既にエスケープされた文字列が格納されているため)
 
-            var expected = "<a class=\"quote-tweet-link\" href=\"https://twitter.com/status/status/12345\">" +
+            var expected = "<a class=\"quote-tweet-link\" href=\"https://twitter.com/kim_upsilon/status/12345\">" +
                 "<blockquote class=\"quote-tweet\">" +
                 "<p>@twitterapi hogehoge</p> &mdash; upsilon (@kim_upsilon) " + DateTime.Parse("2015/03/30 3:30:00") +
                 "</blockquote></a>";
@@ -194,10 +194,10 @@ namespace OpenTween
             var statusId = 12345L; // リンク先のステータスID
             var html = "<marquee>hogehoge</marquee>"; // HTMLをそのまま出力する (エスケープしない)
 
-            var expected = "<a class=\"quote-tweet-link\" href=\"https://twitter.com/status/status/12345\">" +
+            var expected = "<a class=\"quote-tweet-link\" href=\"https://twitter.com/twitter/status/12345\">" +
                 "<blockquote class=\"quote-tweet\"><marquee>hogehoge</marquee></blockquote>" +
                 "</a>";
-            Assert.Equal(expected, TweenMain.FormatQuoteTweetHtml(statusId, html));
+            Assert.Equal(expected, TweenMain.FormatQuoteTweetHtml("twitter", statusId, html));
         }
 
         [Fact]
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index e96a3ea6..22b114cc 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -6482,12 +6482,18 @@ namespace OpenTween
                 " (@" + WebUtility.HtmlEncode(post.ScreenName) + ") " +
                 WebUtility.HtmlEncode(post.CreatedAt.ToString());
 
-            return FormatQuoteTweetHtml(post.StatusId, innerHtml);
+            return FormatQuoteTweetHtml(post.ScreenName, post.StatusId, innerHtml);
         }
 
         internal static string FormatQuoteTweetHtml(long statusId, string innerHtml)
         {
-            return "<a class=\"quote-tweet-link\" href=\"https://twitter.com/status/status/" + statusId + "\">" +
+            // screenName が不明な場合、とりあえず https://twitter.com/statuses/status/{statusId} にリンクする
+            return FormatQuoteTweetHtml("statuses", statusId, innerHtml);
+        }
+
+        internal static string FormatQuoteTweetHtml(string screenName, long statusId, string innerHtml)
+        {
+            return "<a class=\"quote-tweet-link\" href=\"https://twitter.com/" + WebUtility.HtmlEncode(screenName) + "/status/" + statusId + "\">" +
                 "<blockquote class=\"quote-tweet\">" + innerHtml + "</blockquote>" +
                 "</a>";
         }
-- 
2.11.0