OSDN Git Service

TwitterDataModel.Configuration を TwitterConfiguration に移行
authorKimura Youichi <kim.upsilon@bucyou.net>
Mon, 5 May 2014 12:23:57 +0000 (21:23 +0900)
committerKimura Youichi <kim.upsilon@bucyou.net>
Mon, 5 May 2014 17:20:34 +0000 (02:20 +0900)
OpenTween/Api/TwitterConfiguration.cs [new file with mode: 0644]
OpenTween/Api/TwitterDataModel.cs
OpenTween/AppendSettingDialog.cs
OpenTween/OpenTween.csproj
OpenTween/Twitter.cs

diff --git a/OpenTween/Api/TwitterConfiguration.cs b/OpenTween/Api/TwitterConfiguration.cs
new file mode 100644 (file)
index 0000000..f7d9e08
--- /dev/null
@@ -0,0 +1,80 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) <kiri.feather@gmail.com>
+//           (c) 2008-2011 Moz (@syo68k)
+//           (c) 2008-2011 takeshik (@takeshik) <http://www.takeshik.org/>
+//           (c) 2010-2011 anis774 (@anis774) <http://d.hatena.ne.jp/anis774/>
+//           (c) 2010-2011 fantasticswallow (@f_swallow) <http://twitter.com/f_swallow>
+//           (c) 2011      Egtra (@egtra) <http://dev.activebasic.com/egtra/>
+//           (c) 2013      kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// All rights reserved.
+//
+// This file is part of OpenTween.
+//
+// This program is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by the Free
+// Software Foundation; either version 3 of the License, or (at your option)
+// any later version.
+//
+// This program is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program. If not, see <http://www.gnu.org/licenses/>, or write to
+// the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+// Boston, MA 02110-1301, USA.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenTween.Api
+{
+    [DataContract]
+    public class TwitterConfiguration
+    {
+        [DataMember(Name = "characters_reserved_per_media")]
+        public int CharactersReservedPerMedia { get; set; }
+
+        [DataMember(Name = "photo_size_limit")]
+        public int PhotoSizeLimit { get; set; }
+
+        [DataMember(Name = "photo_sizes")]
+        public TwitterMediaSizes PhotoSizes { get; set; }
+
+        [DataMember(Name = "non_username_paths")]
+        public string[] NonUsernamePaths { get; set; }
+
+        [DataMember(Name = "short_url_length")]
+        public int ShortUrlLength { get; set; }
+
+        [DataMember(Name = "short_url_length_https")]
+        public int ShortUrlLengthHttps { get; set; }
+
+        [DataMember(Name = "max_media_per_upload")]
+        public int MaxMediaPerUpload { get; set; }
+
+        /// <exception cref="SerializationException"/>
+        public static TwitterConfiguration ParseJson(string json)
+        {
+            return MyCommon.CreateDataFromJson<TwitterConfiguration>(json);
+        }
+
+        /// <summary>
+        /// 設定が取得できるまでの間に代わりに使用する適当な値を返します
+        /// </summary>
+        public static TwitterConfiguration DefaultConfiguration()
+        {
+            return new TwitterConfiguration
+            {
+                CharactersReservedPerMedia = 20,
+                ShortUrlLength = 19,
+                ShortUrlLengthHttps = 20,
+            };
+        }
+    }
+}
index 378f15e..421db2c 100644 (file)
@@ -408,34 +408,5 @@ namespace OpenTween.Api
             [DataMember(Name = "query")] public string Query;
             [DataMember(Name = "max_id_str")] public string MaxIdStr;
         }
-
-        [DataContract]
-        public class PhotoSize
-        {
-            [DataMember(Name = "h")] public int Height;
-            [DataMember(Name = "w")] public int Width;
-            [DataMember(Name = "resize")] public string Resize;
-        }
-
-        [DataContract]
-        public class PhotoType
-        {
-            [DataMember(Name = "large")] public PhotoSize LargeSize;
-            [DataMember(Name = "medium")] public PhotoSize MediumSize;
-            [DataMember(Name = "small")] public PhotoSize SmallSize;
-            [DataMember(Name = "thumb")] public PhotoSize ThumbSize;
-        }
-
-        [DataContract]
-        public class Configuration
-        {
-            [DataMember(Name = "characters_reserved_per_media")] public int CharactersReservedPerMedia = 20;
-            [DataMember(Name = "photo_size_limit")] public int PhotoSizeLimit;
-            [DataMember(Name = "photo_sizes")] public PhotoType PhotoSizes;
-            [DataMember(Name = "non_username_paths")] public string[] NonUsernamePaths;
-            [DataMember(Name = "short_url_length")] public int ShortUrlLength = 19;
-            [DataMember(Name = "short_url_length_https")] public int ShortUrlLengthHttps = 20;
-            [DataMember(Name = "max_media_per_upload")] public int MaxMediaPerUpload;
-        }
     }
 }
index bbd9b31..4ccf3cf 100644 (file)
@@ -68,7 +68,7 @@ namespace OpenTween
         public bool IsRemoveSameEvent;
         public bool IsNotifyUseGrowl;
 
-        public TwitterDataModel.Configuration TwitterConfiguration = new TwitterDataModel.Configuration();
+        public TwitterConfiguration TwitterConfiguration = TwitterConfiguration.DefaultConfiguration();
 
         private string _pin;
 
index abffadd..f1032aa 100644 (file)
@@ -62,6 +62,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Api\ApiLimit.cs" />
+    <Compile Include="Api\TwitterConfiguration.cs" />
     <Compile Include="Api\TwitterEntity.cs" />
     <Compile Include="Api\TwitterList.cs" />
     <Compile Include="Api\TwitterUser.cs" />
index f753968..c12add0 100644 (file)
@@ -2455,7 +2455,7 @@ namespace OpenTween
         /// t.co の文字列長などの設定情報を取得します
         /// </summary>
         /// <exception cref="WebApiException"/>
-        public TwitterDataModel.Configuration ConfigurationApi()
+        public TwitterConfiguration ConfigurationApi()
         {
             HttpStatusCode res;
             var content = "";
@@ -2474,7 +2474,7 @@ namespace OpenTween
 
             try
             {
-                return MyCommon.CreateDataFromJson<TwitterDataModel.Configuration>(content);
+                return TwitterConfiguration.ParseJson(content);
             }
             catch(SerializationException e)
             {