PostRetweetメソッドをISocialProtocolMutationに移動

diff --git a/OpenTween/SocialProtocol/ISocialProtocolMutation.cs b/OpenTween/SocialProtocol/ISocialProtocolMutation.cs
index 65480a5..41679c0 100644 (file)
--- a/OpenTween/SocialProtocol/ISocialProtocolMutation.cs
+++ b/OpenTween/SocialProtocol/ISocialProtocolMutation.cs
@@ -31,5 +31,7 @@ namespace OpenTween.SocialProtocol
         public Task FavoritePost(PostId postId);
 
         public Task UnfavoritePost(PostId postId);
+
+        public Task<PostClass?> RetweetPost(PostId postId);
     }
 }

diff --git a/OpenTween/SocialProtocol/Twitter/TwitterGraphqlMutation.cs b/OpenTween/SocialProtocol/Twitter/TwitterGraphqlMutation.cs
index f595bf6..6074027 100644 (file)
--- a/OpenTween/SocialProtocol/Twitter/TwitterGraphqlMutation.cs
+++ b/OpenTween/SocialProtocol/Twitter/TwitterGraphqlMutation.cs
@@ -1,5 +1,11 @@
 // OpenTween - Client of Twitter
-// Copyright (c) 2024 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// 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.
@@ -60,6 +66,21 @@ namespace OpenTween.SocialProtocol.Twitter
                 .ConfigureAwait(false);
         }
 
+        public async Task<PostClass?> RetweetPost(PostId postId)
+        {
+            var statusId = this.AssertTwitterStatusId(postId);
+            var request = new CreateRetweetRequest
+            {
+                TweetId = statusId,
+            };
+
+            await request.Send(this.account.Connection)
+                .ConfigureAwait(false);
+
+            // graphql のレスポンスには PostClass 生成に必要な情報が不足しているため null を返す
+            return null;
+        }
+
         private TwitterStatusId AssertTwitterStatusId(PostId postId)
         {
             return postId is TwitterStatusId statusId

diff --git a/OpenTween/SocialProtocol/Twitter/TwitterV1Mutation.cs b/OpenTween/SocialProtocol/Twitter/TwitterV1Mutation.cs
index ea48b95..5f7568d 100644 (file)
--- a/OpenTween/SocialProtocol/Twitter/TwitterV1Mutation.cs
+++ b/OpenTween/SocialProtocol/Twitter/TwitterV1Mutation.cs
@@ -1,5 +1,11 @@
 // OpenTween - Client of Twitter
-// Copyright (c) 2024 kim_upsilon (@kim_upsilon) <https://upsilo.net/~upsilon/>
+// 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.
@@ -65,11 +71,32 @@ namespace OpenTween.SocialProtocol.Twitter
                 .ConfigureAwait(false);
         }
 
+        public async Task<PostClass?> RetweetPost(PostId postId)
+        {
+            var statusId = this.AssertTwitterStatusId(postId);
+
+            using var response = await this.account.Legacy.Api.StatusesRetweet(statusId)
+                .ConfigureAwait(false);
+
+            var status = await response.LoadJsonAsync()
+                .ConfigureAwait(false);
+
+            // Retweet判定
+            if (status.RetweetedStatus == null)
+                throw new WebApiException("Invalid Json!");
+
+            // Retweetしたものを返す
+            return this.CreatePostFromJson(status);
+        }
+
         private TwitterStatusId AssertTwitterStatusId(PostId postId)
         {
             return postId is TwitterStatusId statusId
                 ? statusId
                 : throw new WebApiException($"Not supported type: {postId.GetType()}");
         }
+
+        private PostClass CreatePostFromJson(TwitterStatus status)
+            => this.account.Legacy.CreatePostsFromStatusData(status, firstLoad: false, favTweet: false);
     }
 }

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index d5f0872..5ef28ea 100644 (file)
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1712,7 +1712,7 @@ namespace OpenTween
                 await this.RefreshTabAsync<HomeTabModel>();
         }
 
-        private async Task RetweetAsync(IReadOnlyList<PostId> statusIds)
+        private async Task RetweetAsync(IReadOnlyList<PostClass> posts)
         {
             await this.workerSemaphore.WaitAsync();
 
@@ -1721,7 +1721,7 @@ namespace OpenTween
                 var progress = new Progress<string>(x => this.StatusLabel.Text = x);
 
                 this.RefreshTasktrayIcon();
-                await this.RetweetAsyncInternal(progress, this.workerCts.Token, statusIds);
+                await this.RetweetAsyncInternal(progress, this.workerCts.Token, posts);
             }
             catch (WebApiException ex)
             {
@@ -1734,7 +1734,7 @@ namespace OpenTween
             }
         }
 
-        private async Task RetweetAsyncInternal(IProgress<string> p, CancellationToken ct, IReadOnlyList<PostId> statusIds)
+        private async Task RetweetAsyncInternal(IProgress<string> p, CancellationToken ct, IReadOnlyList<PostClass> posts)
         {
             if (ct.IsCancellationRequested)
                 return;
@@ -1744,14 +1744,19 @@ namespace OpenTween
 
             p.Report("Posting...");
 
-            var posts = new List<PostClass>();
+            var retweetedPosts = new List<PostClass>();
 
             await Task.Run(async () =>
             {
-                foreach (var statusId in statusIds)
+                foreach (var post in posts)
                 {
-                    var post = await this.tw.PostRetweet(statusId).ConfigureAwait(false);
-                    if (post != null) posts.Add(post);
+                    var statusId = post.RetweetedId ?? post.StatusId;
+
+                    var retweetedPost = await this.CurrentTabAccount.Mutation.RetweetPost(statusId)
+                        .ConfigureAwait(false);
+
+                    if (retweetedPost != null)
+                        retweetedPosts.Add(retweetedPost);
                 }
             });
 
@@ -1771,7 +1776,7 @@ namespace OpenTween
 
             // 自分のRTはTLの更新では取得できない場合があるので、
             // 投稿時取得の有無に関わらず追加しておく
-            posts.ForEach(post => this.statuses.AddPost(post));
+            retweetedPosts.ForEach(post => this.statuses.AddPost(post));
 
             if (this.settings.Common.PostAndGet)
             {
@@ -7938,9 +7943,7 @@ namespace OpenTween
                     }
                 }
 
-                var statusIds = selectedPosts.Select(x => x.StatusId).ToList();
-
-                await this.RetweetAsync(statusIds);
+                await this.RetweetAsync(selectedPosts);
             }
         }
 

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 3f94068..c9136b9 100644 (file)
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -387,51 +387,6 @@ namespace OpenTween
             dmTab.AddPostQueue(post);
         }
 
-        public async Task<PostClass?> PostRetweet(PostId id)
-        {
-            this.CheckAccountState();
-
-            // データ部分の生成
-            var post = TabInformations.GetInstance()[id];
-            if (post == null)
-                throw new WebApiException("Err:Target isn't found.");
-
-            var target = post.RetweetedId ?? id;  // 再RTの場合は元発言をRT
-
-            if (this.Api.AuthType == APIAuthType.TwitterComCookie)
-            {
-                var request = new CreateRetweetRequest
-                {
-                    TweetId = target.ToTwitterStatusId(),
-                };
-                await request.Send(this.Api.Connection).ConfigureAwait(false);
-                return null;
-            }
-
-            using var response = await this.Api.StatusesRetweet(target.ToTwitterStatusId())
-                .ConfigureAwait(false);
-
-            var status = await response.LoadJsonAsync()
-                .ConfigureAwait(false);
-
-            // 二重取得回避
-            lock (this.lockObj)
-            {
-                var statusId = new TwitterStatusId(status.IdStr);
-                if (TabInformations.GetInstance().ContainsKey(statusId))
-                    return null;
-            }
-
-            // Retweet判定
-            if (status.RetweetedStatus == null)
-                throw new WebApiException("Invalid Json!");
-
-            // Retweetしたものを返す
-            var retweetPost = this.CreatePostsFromStatusData(status, firstLoad: false);
-
-            return retweetPost;
-        }
-
         public async Task DeleteRetweet(PostClass post)
         {
             if (post.RetweetedId == null)
@@ -708,7 +663,7 @@ namespace OpenTween
         private PostClass CreatePostsFromStatusData(TwitterStatus status, bool firstLoad)
             => this.CreatePostsFromStatusData(status, firstLoad, favTweet: false);
 
-        private PostClass CreatePostsFromStatusData(TwitterStatus status, bool firstLoad, bool favTweet)
+        internal PostClass CreatePostsFromStatusData(TwitterStatus status, bool firstLoad, bool favTweet)
         {
             var post = this.postFactory.CreateFromStatus(status, this.UserId, this.Api.AccountState.FollowerIds, firstLoad, favTweet);
             _ = this.urlExpander.Expand(post);