廃止された twurl.nl によるURL短縮機能を削除

diff --git a/OpenTween/MyCommon.cs b/OpenTween/MyCommon.cs
index 8e9d7c8..4e053a4 100644 (file)
--- a/OpenTween/MyCommon.cs
+++ b/OpenTween/MyCommon.cs
@@ -104,7 +104,6 @@ namespace OpenTween
         {
             TinyUrl,
             Isgd,
-            Twurl,
             Bitly,
             Jmp,
             Uxnu,
@@ -112,6 +111,7 @@ namespace OpenTween
             Nicoms,
             //廃止
             Unu = -1,
+            Twurl = -1,
         }
 
         public enum HITRESULT

diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt
index db830d2..2742237 100644 (file)
--- a/OpenTween/Resources/ChangeLog.txt
+++ b/OpenTween/Resources/ChangeLog.txt
@@ -6,6 +6,7 @@
  * CHG: Microsoft Translator Text API v3 に対応
   - OpenTweenの古いバージョンの翻訳機能は 2019/4/30 以降に使用できなくなります
  * CHG: 廃止された短縮URLサービスのドメインをURL展開の対象から削除
+ * CHG: 廃止された twurl.nl によるURL短縮機能を削除
  * CHG: 廃止されたサービスのサムネイル表示対応を削除
  * CHG: サービス終了したFavstarに関するメニュー項目を削除
 

diff --git a/OpenTween/ShortUrl.cs b/OpenTween/ShortUrl.cs
index f3d65b5..1a8255c 100644 (file)
--- a/OpenTween/ShortUrl.cs
+++ b/OpenTween/ShortUrl.cs
@@ -311,9 +311,6 @@ namespace OpenTween
                     case MyCommon.UrlConverter.Isgd:
                         return await this.ShortenByIsgdAsync(srcUri)
                             .ConfigureAwait(false);
-                    case MyCommon.UrlConverter.Twurl:
-                        return await this.ShortenByTwurlAsync(srcUri)
-                            .ConfigureAwait(false);
                     case MyCommon.UrlConverter.Bitly:
                         return await this.ShortenByBitlyAsync(srcUri, "bit.ly")
                             .ConfigureAwait(false);
@@ -385,31 +382,6 @@ namespace OpenTween
             }
         }
 
-        private async Task<Uri> ShortenByTwurlAsync(Uri srcUri)
-        {
-            // 明らかに長くなると推測できる場合は短縮しない
-            if ("http://twurl.nl/xxxxxx".Length > srcUri.OriginalString.Length)
-                return srcUri;
-
-            var content = new FormUrlEncodedContent(new[]
-            {
-                new KeyValuePair<string, string>("link[url]", srcUri.OriginalString),
-            });
-
-            using (var response = await this.http.PostAsync("http://tweetburner.com/links", content).ConfigureAwait(false))
-            {
-                response.EnsureSuccessStatusCode();
-
-                var result = await response.Content.ReadAsStringAsync()
-                    .ConfigureAwait(false);
-
-                if (!Regex.IsMatch(result, @"^https?://"))
-                    throw new WebApiException("Failed to create URL.", result);
-
-                return new Uri(result.TrimEnd());
-            }
-        }
-
         private async Task<Uri> ShortenByBitlyAsync(Uri srcUri, string domain = "bit.ly")
         {
             // 明らかに長くなると推測できる場合は短縮しない

diff --git a/OpenTween/Tween.Designer.cs b/OpenTween/Tween.Designer.cs
index 60b1277..5bc0d80 100644 (file)
--- a/OpenTween/Tween.Designer.cs
+++ b/OpenTween/Tween.Designer.cs
@@ -150,7 +150,6 @@
             this.UrlUndoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.TinyURLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.IsgdToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.TwurlnlToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.BitlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.JmpStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.UxnuMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -1304,7 +1303,6 @@
             this.UrlUndoToolStripMenuItem,
             this.TinyURLToolStripMenuItem,
             this.IsgdToolStripMenuItem,
-            this.TwurlnlToolStripMenuItem,
             this.BitlyToolStripMenuItem,
             this.JmpStripMenuItem,
             this.UxnuMenuItem});
@@ -1335,12 +1333,6 @@
             resources.ApplyResources(this.IsgdToolStripMenuItem, "IsgdToolStripMenuItem");
             this.IsgdToolStripMenuItem.Click += new System.EventHandler(this.IsgdToolStripMenuItem_Click);
             // 
-            // TwurlnlToolStripMenuItem
-            // 
-            this.TwurlnlToolStripMenuItem.Name = "TwurlnlToolStripMenuItem";
-            resources.ApplyResources(this.TwurlnlToolStripMenuItem, "TwurlnlToolStripMenuItem");
-            this.TwurlnlToolStripMenuItem.Click += new System.EventHandler(this.TwurlnlToolStripMenuItem_Click);
-            // 
             // BitlyToolStripMenuItem
             // 
             this.BitlyToolStripMenuItem.Name = "BitlyToolStripMenuItem";
@@ -2299,7 +2291,6 @@
         internal System.Windows.Forms.ToolStripMenuItem UrlUndoToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem TinyURLToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem IsgdToolStripMenuItem;
-        internal System.Windows.Forms.ToolStripMenuItem TwurlnlToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem BitlyToolStripMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem UxnuMenuItem;
         internal System.Windows.Forms.ToolStripMenuItem UpdateFollowersMenuItem1;

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 520b67e..3b360c4 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -9274,9 +9274,6 @@ namespace OpenTween
         private async void IsgdToolStripMenuItem_Click(object sender, EventArgs e)
             => await this.UrlConvertAsync(MyCommon.UrlConverter.Isgd);
 
-        private async void TwurlnlToolStripMenuItem_Click(object sender, EventArgs e)
-            => await this.UrlConvertAsync(MyCommon.UrlConverter.Twurl);
-
         private async void UxnuMenuItem_Click(object sender, EventArgs e)
             => await this.UrlConvertAsync(MyCommon.UrlConverter.Uxnu);
 

diff --git a/OpenTween/Tween.en.resx b/OpenTween/Tween.en.resx
index 5222638..819f3d9 100644 (file)
--- a/OpenTween/Tween.en.resx
+++ b/OpenTween/Tween.en.resx
@@ -830,9 +830,6 @@
   <data name="IsgdToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>218, 24</value>
   </data>
-  <data name="TwurlnlToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 24</value>
-  </data>
   <data name="BitlyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>218, 24</value>
   </data>

diff --git a/OpenTween/Tween.resx b/OpenTween/Tween.resx
index fbfe8d0..141eb84 100644 (file)
--- a/OpenTween/Tween.resx
+++ b/OpenTween/Tween.resx
@@ -1453,12 +1453,6 @@
   <data name="IsgdToolStripMenuItem.Text" xml:space="preserve">
     <value>is.gd</value>
   </data>
-  <data name="TwurlnlToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>228, 22</value>
-  </data>
-  <data name="TwurlnlToolStripMenuItem.Text" xml:space="preserve">
-    <value>twurl.nl</value>
-  </data>
   <data name="BitlyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>228, 22</value>
   </data>
@@ -3024,12 +3018,6 @@
   <data name="&gt;&gt;IsgdToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;TwurlnlToolStripMenuItem.Name" xml:space="preserve">
-    <value>TwurlnlToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;TwurlnlToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;BitlyToolStripMenuItem.Name" xml:space="preserve">
     <value>BitlyToolStripMenuItem</value>
   </data>