From 74f28ad9687e4505445f303180ad12598ebfa298 Mon Sep 17 00:00:00 2001 From: spx Date: Sat, 6 Sep 2014 08:52:42 +0900 Subject: [PATCH] =?utf8?q?Twitpic=E3=82=92=E7=94=BB=E5=83=8F=E3=81=AE?= =?utf8?q?=E6=8A=95=E7=A8=BF=E5=85=88=E3=81=8B=E3=82=89=E5=89=8A=E9=99=A4?= =?utf8?q?=EF=BC=88=E3=82=B5=E3=83=BC=E3=83=93=E3=82=B9=E7=B5=82=E4=BA=86?= =?utf8?q?=E3=81=AE=E3=81=9F=E3=82=81=EF=BC=89=20=E3=83=87=E3=83=95?= =?utf8?q?=E3=82=A9=E3=83=AB=E3=83=88=E3=81=AE=E6=8A=95=E7=A8=BF=E5=85=88?= =?utf8?q?=E3=82=92Twitter=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- OpenTween/Connection/TwitPic.cs | 177 -------------------------------------- OpenTween/MediaSelector.cs | 3 +- OpenTween/OpenTween.csproj | 1 - OpenTween/Resources/ChangeLog.txt | 2 + 4 files changed, 3 insertions(+), 180 deletions(-) delete mode 100644 OpenTween/Connection/TwitPic.cs diff --git a/OpenTween/Connection/TwitPic.cs b/OpenTween/Connection/TwitPic.cs deleted file mode 100644 index f5a05422..00000000 --- a/OpenTween/Connection/TwitPic.cs +++ /dev/null @@ -1,177 +0,0 @@ -// OpenTween - Client of Twitter -// Copyright (c) 2007-2011 kiri_feather (@kiri_feather) -// (c) 2008-2011 Moz (@syo68k) -// (c) 2008-2011 takeshik (@takeshik) -// (c) 2010-2011 anis774 (@anis774) -// (c) 2010-2011 fantasticswallow (@f_swallow) -// (c) 2011 spinor (@tplantd) -// (c) 2014 kim_upsilon (@kim_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 , 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.IO; -using System.Linq; -using System.Net; -using System.Threading.Tasks; -using System.Xml; -using System.Xml.Linq; -using System.Xml.XPath; -using OpenTween.Api; - -namespace OpenTween.Connection -{ - public class TwitPic : IMediaUploadService - { - private readonly string[] pictureExt = new[] { ".jpg", ".jpeg", ".gif", ".png" }; - - private readonly string[] multimediaExt = new[] { ".avi", ".wmv", ".flv", ".m4v", ".mov", ".mp4", ".rm", ".mpeg", ".mpg", ".3gp", ".3g2" }; - - private readonly long MaxFileSize = 10L * 1024 * 1024; // Image only - // Multimedia filesize limit unknown. But length limit is 1:30. - - private readonly Twitter tw; - private readonly TwitpicApi twitpicApi; - - private TwitterConfiguration twitterConfig; - - public TwitPic(Twitter twitter, TwitterConfiguration twitterConfig) - { - this.tw = twitter; - this.twitterConfig = twitterConfig; - - this.twitpicApi = new TwitpicApi(twitter.AccessToken, twitter.AccessTokenSecret); - } - - public int MaxMediaCount - { - get { return 1; } - } - - public string SupportedFormatsStrForDialog - { - get - { - return "Image Files(*" + string.Join(";*", this.pictureExt) + ")|*" + string.Join(";*", this.pictureExt) - + "|Videos(*" + string.Join(";*", this.multimediaExt) + ")|*" + string.Join(";*", this.multimediaExt); - } - } - - public bool CheckFileExtension(string fileExtension) - { - fileExtension = fileExtension.ToLower(); - - return this.pictureExt.Contains(fileExtension) || - this.multimediaExt.Contains(fileExtension); - } - - public bool CheckFileSize(string fileExtension, long fileSize) - { - var maxFileSize = this.GetMaxFileSize(fileExtension); - return maxFileSize == null || fileSize <= maxFileSize.Value; - } - - public long? GetMaxFileSize(string fileExtension) - { - if (this.multimediaExt.Contains(fileExtension)) - return null; // Multimedia : no check - - return MaxFileSize; - } - - public async Task PostStatusAsync(string text, long? inReplyToStatusId, string[] filePaths) - { - if (filePaths.Length != 1) - throw new ArgumentOutOfRangeException("filePaths"); - - var file = new FileInfo(filePaths[0]); - - if (!file.Exists) - throw new ArgumentException("Err:File isn't exists.", "filePaths[0]"); - - var xml = await this.twitpicApi.UploadFileAsync(file, text) - .ConfigureAwait(false); - - var imageUrlElm = xml.XPathSelectElement("/image/url"); - if (imageUrlElm == null) - throw new WebApiException("Invalid API response", xml.ToString()); - - var textWithImageUrl = text + " " + imageUrlElm.Value.Trim(); - - await Task.Run(() => this.tw.PostStatus(textWithImageUrl, inReplyToStatusId)) - .ConfigureAwait(false); - } - - public int GetReservedTextLength(int mediaCount) - { - return this.twitterConfig.ShortUrlLength; - } - - public void UpdateTwitterConfiguration(TwitterConfiguration config) - { - this.twitterConfig = config; - } - - public class TwitpicApi : HttpConnectionOAuthEcho - { - private static readonly Uri UploadEndpoint = new Uri("http://api.twitpic.com/2/upload.xml"); - - public TwitpicApi(string twitterAccessToken, string twitterAccessTokenSecret) - : base(new Uri("http://api.twitter.com/"), new Uri("https://api.twitter.com/1.1/account/verify_credentials.json")) - { - this.Initialize(ApplicationSettings.TwitterConsumerKey, ApplicationSettings.TwitterConsumerSecret, - twitterAccessToken, twitterAccessTokenSecret, "", ""); - - this.InstanceTimeout = 120000; - } - - /// - /// 画像のアップロードを行います - /// - /// - /// - public async Task UploadFileAsync(FileInfo file, string message) - { - // 参照: http://dev.twitpic.com/docs/2/upload/ - - var param = new Dictionary - { - {"key", ApplicationSettings.TwitpicApiKey}, - {"message", message}, - }; - var paramFiles = new List> - { - new KeyValuePair("media", file), - }; - var response = ""; - - var uploadTask = Task.Run(() => this.GetContent(HttpConnection.PostMethod, - UploadEndpoint, param, paramFiles, ref response, null, null)); - - var ret = await uploadTask.ConfigureAwait(false); - - if (ret != HttpStatusCode.OK) - throw new WebApiException("Err:" + ret, response); - - return XDocument.Parse(response); - } - } - } -} diff --git a/OpenTween/MediaSelector.cs b/OpenTween/MediaSelector.cs index 052e733e..0c66d9eb 100644 --- a/OpenTween/MediaSelector.cs +++ b/OpenTween/MediaSelector.cs @@ -123,10 +123,9 @@ namespace OpenTween this.pictureService = null; this.pictureService = new Dictionary { - {"TwitPic", new TwitPic(tw, twitterConfig)}, + {"Twitter", new TwitterPhoto(tw, twitterConfig)}, {"img.ly", new imgly(tw, twitterConfig)}, {"yfrog", new yfrog(tw, twitterConfig)}, - {"Twitter", new TwitterPhoto(tw, twitterConfig)}, {"ついっぷるフォト", new TwipplePhoto(tw, twitterConfig)}, {"Imgur", new Imgur(tw, twitterConfig)}, }; diff --git a/OpenTween/OpenTween.csproj b/OpenTween/OpenTween.csproj index 12927b37..a3eb61e5 100644 --- a/OpenTween/OpenTween.csproj +++ b/OpenTween/OpenTween.csproj @@ -170,7 +170,6 @@ ListManage.cs - diff --git a/OpenTween/Resources/ChangeLog.txt b/OpenTween/Resources/ChangeLog.txt index 0ea42098..8160850c 100644 --- a/OpenTween/Resources/ChangeLog.txt +++ b/OpenTween/Resources/ChangeLog.txt @@ -1,6 +1,8 @@ 更新履歴 ==== Ver 1.2.4-beta1(2014/xx/xx) + * CHG: サービス終了のため、Twitpic を画像の投稿先から削除 + - それに伴い、デフォルトの投稿先を Twitter に変更しました ==== Ver 1.2.3(2014/09/03) * NEW: UserSteams の (un)mute イベント追加に対応 -- 2.11.0