From: spx <spx268@gmail.com>
Date: Thu, 19 Jun 2014 12:45:24 +0000 (+0900)
Subject: PostClass.MediaをDictionaryからListへ変更した
X-Git-Tag: OpenTween_v1.2.2~13
X-Git-Url: http://git.osdn.net/view?p=opentween%2Fopen-tween.git;a=commitdiff_plain;h=e06ab60c8ee9bc9185ef76ab2157a09e86242f78

PostClass.MediaをDictionaryからListへ変更した
---

diff --git a/OpenTween/StatusDictionary.cs b/OpenTween/StatusDictionary.cs
index 0d8f9753..59681145 100644
--- a/OpenTween/StatusDictionary.cs
+++ b/OpenTween/StatusDictionary.cs
@@ -85,7 +85,7 @@ namespace OpenTween
         public int RetweetedCount { get; set; }
         public long? RetweetedByUserId { get; set; }
         public long? InReplyToUserId { get; set; }
-        public Dictionary<string, List<string>> Media { get; set; }
+        public List<string> Media { get; set; }
 
         public string RelTabName { get; set; }
         public int FavoritedCount { get; set; }
@@ -162,7 +162,7 @@ namespace OpenTween
         {
             RetweetedBy = "";
             RelTabName = "";
-            Media = new Dictionary<string, List<string>>();
+            Media = new List<string>();
             ReplyToList = new List<string>();
         }
 
@@ -377,7 +377,7 @@ namespace OpenTween
             var clone = (PostClass)this.MemberwiseClone();
             clone.ReplyToList = new List<string>(this.ReplyToList);
             clone.PostGeo = new StatusGeo { Lng = this.PostGeo.Lng, Lat = this.PostGeo.Lat };
-            clone.Media = new Dictionary<string, List<string>>(this.Media);
+            clone.Media = new List<string>(this.Media);
 
             return clone;
         }
diff --git a/OpenTween/Thumbnail/ThumbnailGenerator.cs b/OpenTween/Thumbnail/ThumbnailGenerator.cs
index 9f678f61..997063f8 100644
--- a/OpenTween/Thumbnail/ThumbnailGenerator.cs
+++ b/OpenTween/Thumbnail/ThumbnailGenerator.cs
@@ -210,7 +210,7 @@ namespace OpenTween.Thumbnail
 
             if (post.Media != null)
             {
-                foreach (var media in post.Media.Values.SelectMany(x => x))
+                foreach (var media in post.Media)
                 {
                     var thumbInfo = await ThumbnailGenerator.GetThumbnailInfoAsync(media, post, token)
                         .ConfigureAwait(false);
diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 272abdef..aeb3b996 100644
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -2967,7 +2967,7 @@ namespace OpenTween
             return retStr;
         }
 
-        public async Task<string> CreateHtmlAnchorAsync(string text, List<string> AtList, TwitterEntities entities, Dictionary<string, List<string>> media)
+        public async Task<string> CreateHtmlAnchorAsync(string text, List<string> AtList, TwitterEntities entities, List<string> media)
         {
             if (entities != null)
             {
@@ -2978,17 +2978,8 @@ namespace OpenTween
                         ent.ExpandedUrl = await ShortUrl.Instance.ExpandUrlAsync(ent.ExpandedUrl)
                             .ConfigureAwait(false);
 
-                        if (media != null)
-                        {
-                            List<string> mediaUrls;
-                            if (!media.TryGetValue(ent.Url, out mediaUrls))
-                            {
-                                mediaUrls = new List<string>();
-                                media.Add(ent.Url, mediaUrls);
-                            }
-                            else if (mediaUrls.Contains(ent.ExpandedUrl)) continue;
-                            mediaUrls.Add(ent.ExpandedUrl);
-                        }
+                        if (media != null && !media.Contains(ent.ExpandedUrl))
+                            media.Add(ent.ExpandedUrl);
                     }
                 }
                 if (entities.Hashtags != null)
@@ -3013,14 +3004,8 @@ namespace OpenTween
                     {
                         foreach (var ent in entities.Media)
                         {
-                            List<string> mediaUrls;
-                            if (!media.TryGetValue(ent.Url, out mediaUrls))
-                            {
-                                mediaUrls = new List<string>();
-                                media.Add(ent.Url, mediaUrls);
-                            }
-                            else if (mediaUrls.Contains(ent.MediaUrl)) continue;
-                            mediaUrls.Add(ent.MediaUrl);
+                            if (!media.Contains(ent.MediaUrl))
+                                media.Add(ent.MediaUrl);
                         }
                     }
                 }
@@ -3035,7 +3020,7 @@ namespace OpenTween
         }
 
         [Obsolete]
-        public string CreateHtmlAnchor(string text, List<string> AtList, TwitterEntities entities, Dictionary<string, List<string>> media)
+        public string CreateHtmlAnchor(string text, List<string> AtList, TwitterEntities entities, List<string> media)
         {
             return this.CreateHtmlAnchorAsync(text, AtList, entities, media).Result;
         }