ShortUrl.ExpandUrlStrAsync() メソッドの名前を ExpandUrlAsync に変更

diff --git a/OpenTween.Tests/ShortUrlTest.cs b/OpenTween.Tests/ShortUrlTest.cs
index fb51943..8c4fcfe 100644 (file)
--- a/OpenTween.Tests/ShortUrlTest.cs
+++ b/OpenTween.Tests/ShortUrlTest.cs
@@ -181,7 +181,7 @@ namespace OpenTween
         }
 
         [Fact]
-        public async Task ExpandUrlStrAsync_Test()
+        public async Task ExpandUrlAsync_String_Test()
         {
             var handler = new HttpMessageHandlerMock();
             using (var http = new HttpClient(handler))
@@ -198,14 +198,14 @@ namespace OpenTween
                 });
 
                 Assert.Equal("http://example.com/hoge2",
-                    await shortUrl.ExpandUrlStrAsync("http://t.co/hoge1"));
+                    await shortUrl.ExpandUrlAsync("http://t.co/hoge1"));
 
                 Assert.Equal(0, handler.QueueCount);
             }
         }
 
         [Fact]
-        public async Task ExpandUrlStrAsync_SchemeLessUrlTest()
+        public async Task ExpandUrlAsync_String_SchemeLessUrlTest()
         {
             var handler = new HttpMessageHandlerMock();
             using (var http = new HttpClient(handler))
@@ -223,14 +223,14 @@ namespace OpenTween
 
                 // スキームが省略されたURL
                 Assert.Equal("http://example.com/hoge2",
-                    await shortUrl.ExpandUrlStrAsync("t.co/hoge1"));
+                    await shortUrl.ExpandUrlAsync("t.co/hoge1"));
 
                 Assert.Equal(0, handler.QueueCount);
             }
         }
 
         [Fact]
-        public async Task ExpandUrlStrAsync_InvalidUrlTest()
+        public async Task ExpandUrlAsync_String_InvalidUrlTest()
         {
             var handler = new HttpMessageHandlerMock();
             using (var http = new HttpClient(handler))
@@ -245,7 +245,7 @@ namespace OpenTween
                 });
 
                 // 不正なURL
-                Assert.Equal("..hogehoge..", await shortUrl.ExpandUrlStrAsync("..hogehoge.."));
+                Assert.Equal("..hogehoge..", await shortUrl.ExpandUrlAsync("..hogehoge.."));
 
                 Assert.Equal(1, handler.QueueCount);
             }

diff --git a/OpenTween/ShortUrl.cs b/OpenTween/ShortUrl.cs
index b040230..bf89cd9 100644 (file)
--- a/OpenTween/ShortUrl.cs
+++ b/OpenTween/ShortUrl.cs
@@ -230,20 +230,26 @@ namespace OpenTween
         /// <summary>
         /// 短縮 URL を非同期に展開します
         /// </summary>
+        /// <remarks>
+        /// 不正なURLが渡された場合は例外を投げず uriStr をそのまま返します
+        /// </remarks>
         /// <param name="uriStr">展開するURL</param>
         /// <returns>URLの展開を行うタスク</returns>
-        public Task<string> ExpandUrlStrAsync(string uriStr)
+        public Task<string> ExpandUrlAsync(string uriStr)
         {
-            return this.ExpandUrlStrAsync(uriStr, 10);
+            return this.ExpandUrlAsync(uriStr, 10);
         }
 
         /// <summary>
         /// 短縮 URL を非同期に展開します
         /// </summary>
+        /// <remarks>
+        /// 不正なURLが渡された場合は例外を投げず uriStr をそのまま返します
+        /// </remarks>
         /// <param name="uriStr">展開するURL</param>
         /// <param name="redirectLimit">再帰的に展開を試みる上限</param>
         /// <returns>URLの展開を行うタスク</returns>
-        public async Task<string> ExpandUrlStrAsync(string uriStr, int redirectLimit)
+        public async Task<string> ExpandUrlAsync(string uriStr, int redirectLimit)
         {
             Uri uri;
 
@@ -293,7 +299,7 @@ namespace OpenTween
                 return Task.FromResult(html);
 
             return HtmlLinkPattern.ReplaceAsync(html, async m =>
-                m.Groups[1].Value + await this.ExpandUrlStrAsync(m.Groups[2].Value, redirectLimit).ConfigureAwait(false) + m.Groups[3].Value);
+                m.Groups[1].Value + await this.ExpandUrlAsync(m.Groups[2].Value, redirectLimit).ConfigureAwait(false) + m.Groups[3].Value);
         }
 
         /// <summary>

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 1f5830a..d2b045a 100644 (file)
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -2886,7 +2886,7 @@ namespace OpenTween
                 //    sb.Append("http://");
                 //}
                 var url = mu.Result("${url}");
-                var title = await ShortUrl.Instance.ExpandUrlStrAsync(url);
+                var title = await ShortUrl.Instance.ExpandUrlAsync(url);
                 sb.Append(url + "\" title=\"" + MyCommon.ConvertToReadableUrl(title) + "\">").Append(url).Append("</a>");
                 if (media != null && !media.ContainsKey(url)) media.Add(url, title);
                 return sb.ToString();
@@ -2975,7 +2975,7 @@ namespace OpenTween
                 {
                     foreach (var ent in entities.Urls)
                     {
-                        ent.ExpandedUrl = await ShortUrl.Instance.ExpandUrlStrAsync(ent.ExpandedUrl)
+                        ent.ExpandedUrl = await ShortUrl.Instance.ExpandUrlAsync(ent.ExpandedUrl)
                             .ConfigureAwait(false);
 
                         if (media != null && !media.ContainsKey(ent.Url))

diff --git a/OpenTween/UserInfoDialog.cs b/OpenTween/UserInfoDialog.cs
index 3e9c233..9acfca8 100644 (file)
--- a/OpenTween/UserInfoDialog.cs
+++ b/OpenTween/UserInfoDialog.cs
@@ -178,7 +178,7 @@ namespace OpenTween
         {
             if (uri != null)
             {
-                var expandedUrl = await ShortUrl.Instance.ExpandUrlStrAsync(uri);
+                var expandedUrl = await ShortUrl.Instance.ExpandUrlAsync(uri);
 
                 this.LinkLabelWeb.Text = uri;
                 this.LinkLabelWeb.Tag = expandedUrl;