From 67b91737a80a8bcb7b070346f9a35a1a572239a2 Mon Sep 17 00:00:00 2001
From: ANIKITI <anikiti07@hotmail.co.jp>
Date: Tue, 7 Aug 2012 19:19:25 +0900
Subject: [PATCH] =?utf8?q?=E3=81=A4=E3=81=84=E3=81=A3=E3=81=B7=E3=82=8B?=
 =?utf8?q?=E3=83=95=E3=82=A9=E3=83=88=E3=81=AE=E3=82=B5=E3=83=A0=E3=83=8D?=
 =?utf8?q?=E3=82=A4=E3=83=AB=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E5=8F=96?=
 =?utf8?q?=E5=BE=97=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?utf8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween/Thumbnail.cs | 40 +++++++++-------------------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/OpenTween/Thumbnail.cs b/OpenTween/Thumbnail.cs
index 715936b1..c67de234 100644
--- a/OpenTween/Thumbnail.cs
+++ b/OpenTween/Thumbnail.cs
@@ -2127,7 +2127,8 @@ namespace OpenTween
             if (mc.Success)
             {
                 // TODO 成功時はサムネイルURLを作成しimglist.Addする
-                args.imglist.Add(new KeyValuePair<string, string>(args.url, mc.Value));
+                // http://p.twipple.jp/wiki/API_Thumbnail/ja
+                args.imglist.Add(new KeyValuePair<string, string>(args.url, mc.Result("http://p.twipple.jp/show/large/${contentId}")));
                 return true;
             }
             else
@@ -2151,37 +2152,14 @@ namespace OpenTween
         private bool TwipplePhoto_CreateImage(CreateImageArgs args)
         {
             // TODO: サムネイル画像読み込み処理を記述します
-            var http = new HttpVarious();
-            var mc = Regex.Match(args.url.Value, "^http://p.twipple.jp/(?<contentId>[0-9a-z]+)", RegexOptions.IgnoreCase);
-            if (mc.Success)
-            {
-                var src = "";
-                if (http.GetData(args.url.Key, null, out src, 0, out args.errmsg, ""))
-                {
-                    var thumbnail_url = "";
-                    var ContentId = mc.Groups["contentId"].Value;
-                    var DataDir = new StringBuilder();
-
-                    // DataDir作成
-                    DataDir.Append("data");
-                    for (int i = 0; i < ContentId.Length; i++)
-                    {
-                        DataDir.Append("/");
-                        DataDir.Append(ContentId[i]);
-                    }
-
-                    // サムネイルURL抽出
-                    thumbnail_url = Regex.Match(src, @"http://p\.twipple\.jp/" + DataDir.ToString() + @"_s\.([a-zA-Z]+)").Value;
+            var image = new HttpVarious().GetImage(args.url.Value, args.url.Key, 10000, out args.errmsg);
+            if (image == null)
+                return false;
 
-                    if (string.IsNullOrEmpty(thumbnail_url)) return false;
-                    var _img = http.GetImage(thumbnail_url, args.url.Key, 0, out args.errmsg);
-                    if (_img == null) return false;
-                    args.pics.Add(new KeyValuePair<string, Image>(args.url.Key, _img));
-                    args.tooltipText.Add(new KeyValuePair<string, string>(args.url.Key, ""));
-                    return true;
-                }
-            }
-            return false;
+            // 成功した場合はURLに対応する画像、ツールチップテキストを登録
+            args.pics.Add(new KeyValuePair<string, Image>(args.url.Key, image));
+            args.tooltipText.Add(new KeyValuePair<string, string>(args.url.Key, ""));
+            return true;
         }
 
 #endregion
-- 
2.11.0