OSDN Git Service

Twitter.TwitterUserstreamを非同期なメソッドで書き換え
[opentween/open-tween.git] / OpenTween / Connection / HttpTwitter.cs
index c48564e..a4c0775 100644 (file)
@@ -152,219 +152,6 @@ namespace OpenTween
             this.Initialize("", "", "", 0);
         }
 
-        public HttpStatusCode UpdateStatus(string status, long? replyToId, List<long> mediaIds, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("status", status);
-            if (replyToId != null) param.Add("in_reply_to_status_id", replyToId.ToString());
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-            //if (AppendSettingDialog.Instance.ShortenTco && AppendSettingDialog.Instance.UrlConvertAuto) param.Add("wrap_links", "true")
-
-            if (mediaIds != null && mediaIds.Count > 0)
-                param.Add("media_ids", string.Join(",", mediaIds));
-
-            return httpCon.GetContent(PostMethod,
-                this.CreateTwitterUri("/1.1/statuses/update.json"),
-                param,
-                ref content,
-                null,
-                null);
-        }
-
-        public HttpStatusCode UpdateStatusWithMedia(string status, long? replyToId, IMediaItem item, ref string content)
-        {
-            //画像投稿用エンドポイント
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("status", status);
-            if (replyToId != null) param.Add("in_reply_to_status_id", replyToId.ToString());
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-            //if (AppendSettingDialog.Instance.ShortenTco && AppendSettingDialog.Instance.UrlConvertAuto) param.Add("wrap_links", "true")
-
-            var binary = new List<KeyValuePair<string, IMediaItem>>();
-            binary.Add(new KeyValuePair<string, IMediaItem>("media[]", item));
-
-            return httpCon.GetContent(PostMethod,
-                this.CreateTwitterUri("/1.1/statuses/update_with_media.json"),
-                param,
-                binary,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/statuses/update_with_media"));
-        }
-
-        public HttpStatusCode UploadMedia(IMediaItem item, ref string content)
-        {
-            //画像投稿専用エンドポイント
-            var binary = new List<KeyValuePair<string, IMediaItem>>();
-            binary.Add(new KeyValuePair<string, IMediaItem>("media", item));
-
-            return httpCon.GetContent(PostMethod,
-                this.CreateTwitterUploadUri("/1.1/media/upload.json"),
-                null,
-                binary,
-                ref content,
-                null,
-                null);
-        }
-
-        public HttpStatusCode SendDirectMessage(string status, string sendto, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("text", status);
-            param.Add("screen_name", sendto);
-            //if (AppendSettingDialog.Instance.ShortenTco && AppendSettingDialog.Instance.UrlConvertAuto) param.Add("wrap_links", "true")
-
-            return httpCon.GetContent(PostMethod,
-                this.CreateTwitterUri("/1.1/direct_messages/new.json"),
-                param,
-                ref content,
-                null,
-                null);
-        }
-
-        public HttpStatusCode RetweetStatus(long id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(PostMethod,
-                this.CreateTwitterUri("/1.1/statuses/retweet/" + id + ".json"),
-                param,
-                ref content,
-                null,
-                null);
-        }
-
-        public HttpStatusCode ShowStatuses(long id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/statuses/show/" + id + ".json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/statuses/show/:id"));
-        }
-
-        public HttpStatusCode HomeTimeline(int? count, long? max_id, long? since_id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            if (count != null)
-                param.Add("count", count.ToString());
-            if (max_id != null)
-                param.Add("max_id", max_id.ToString());
-            if (since_id != null)
-                param.Add("since_id", since_id.ToString());
-
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/statuses/home_timeline.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/statuses/home_timeline"));
-        }
-
-        public HttpStatusCode UserTimeline(long? user_id, string screen_name, int? count, long? max_id, long? since_id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-
-            if ((user_id == null && string.IsNullOrEmpty(screen_name)) ||
-                (user_id != null && !string.IsNullOrEmpty(screen_name))) return HttpStatusCode.BadRequest;
-
-            if (user_id != null)
-                param.Add("user_id", user_id.ToString());
-            if (!string.IsNullOrEmpty(screen_name))
-                param.Add("screen_name", screen_name);
-            if (count != null)
-                param.Add("count", count.ToString());
-            if (max_id != null)
-                param.Add("max_id", max_id.ToString());
-            if (since_id != null)
-                param.Add("since_id", since_id.ToString());
-
-            param.Add("include_rts", "true");
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/statuses/user_timeline.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/statuses/user_timeline"));
-        }
-
-        public HttpStatusCode Mentions(int? count, long? max_id, long? since_id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            if (count != null)
-                param.Add("count", count.ToString());
-            if (max_id != null)
-                param.Add("max_id", max_id.ToString());
-            if (since_id != null)
-                param.Add("since_id", since_id.ToString());
-
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/statuses/mentions_timeline.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/statuses/mentions_timeline"));
-        }
-
-        public HttpStatusCode DirectMessages(int? count, long? max_id, long? since_id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            if (count != null)
-                param.Add("count", count.ToString());
-            if (max_id != null)
-                param.Add("max_id", max_id.ToString());
-            if (since_id != null)
-                param.Add("since_id", since_id.ToString());
-            param.Add("full_text", "true");
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/direct_messages.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/direct_messages"));
-        }
-
-        public HttpStatusCode DirectMessagesSent(int? count, long? max_id, long? since_id, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            if (count != null)
-                param.Add("count", count.ToString());
-            if (max_id != null)
-                param.Add("max_id", max_id.ToString());
-            if (since_id != null)
-                param.Add("since_id", since_id.ToString());
-            param.Add("full_text", "true");
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/direct_messages/sent.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/direct_messages/sent"));
-        }
-
         public HttpStatusCode Favorites(int? count, ref string content)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
@@ -413,29 +200,6 @@ namespace OpenTween
                 this.CreateApiCalllback("/saved_searches/list"));
         }
 
-        public HttpStatusCode FollowerIds(long cursor, ref string content)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("cursor", cursor.ToString());
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/followers/ids.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/followers/ids"));
-        }
-
-        public HttpStatusCode NoRetweetIds(ref string content)
-        {
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/friendships/no_retweets/ids.json"),
-                null,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/friendships/no_retweets/ids"));
-        }
-
         public HttpStatusCode RateLimitStatus(ref string content)
         {
             return httpCon.GetContent(GetMethod,
@@ -508,30 +272,6 @@ namespace OpenTween
                 this.CreateApiCalllback("/lists/subscriptions"));
         }
 
-        public HttpStatusCode GetListsStatuses(long userId, long list_id, int? per_page, long? max_id, long? since_id, Boolean isRTinclude, ref string content)
-        {
-            //認証なくても取得できるが、protectedユーザー分が抜ける
-            Dictionary<string, string> param = new Dictionary<string, string>();
-            param.Add("user_id", userId.ToString());
-            param.Add("list_id", list_id.ToString());
-            param.Add("include_rts", isRTinclude ? "true" : "false");
-            if (per_page != null)
-                param.Add("count", per_page.ToString());
-            if (max_id != null)
-                param.Add("max_id", max_id.ToString());
-            if (since_id != null)
-                param.Add("since_id", since_id.ToString());
-            param.Add("include_entities", "true");
-            param.Add("include_ext_alt_text", "true");
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/lists/statuses.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/lists/statuses"));
-        }
-
         public HttpStatusCode CreateLists(string listname, Boolean isPrivate, string description, ref string content)
         {
             string mode = "public";
@@ -624,46 +364,6 @@ namespace OpenTween
                 this.CreateApiCalllback("/statuses/retweeters/ids"));
         }
 
-        public HttpStatusCode GetBlockUserIds(ref string content, long? cursor)
-        {
-            var param = new Dictionary<string, string>();
-
-            if (cursor != null)
-                param.Add("cursor", cursor.ToString());
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/blocks/ids.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/blocks/ids"));
-        }
-
-        public HttpStatusCode GetMuteUserIds(ref string content, long? cursor)
-        {
-            var param = new Dictionary<string, string>();
-
-            if (cursor != null)
-                param.Add("cursor", cursor.ToString());
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/mutes/users/ids.json"),
-                param,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/mutes/users/ids"));
-        }
-
-        public HttpStatusCode GetConfiguration(ref string content)
-        {
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUri("/1.1/help/configuration.json"),
-                null,
-                ref content,
-                this.CreateRatelimitHeadersDict(),
-                this.CreateApiCalllback("/help/configuration"));
-        }
-
         public HttpStatusCode VerifyCredentials(ref string content)
         {
             return httpCon.GetContent(GetMethod,
@@ -737,26 +437,6 @@ namespace OpenTween
             };
         }
 
-        public HttpStatusCode UserStream(ref Stream content,
-                                         bool allAtReplies,
-                                         string trackwords,
-                                         string userAgent)
-        {
-            Dictionary<string, string> param = new Dictionary<string, string>();
-
-            if (allAtReplies)
-                param.Add("replies", "all");
-
-            if (!string.IsNullOrEmpty(trackwords))
-                param.Add("track", trackwords);
-
-            return httpCon.GetContent(GetMethod,
-                this.CreateTwitterUserStreamUri("/1.1/user.json"),
-                param,
-                ref content,
-                userAgent);
-        }
-
         public HttpStatusCode FilterStream(ref Stream content,
                                            string trackwords,
                                            string userAgent)