From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 14 Jun 2024 14:37:41 +0000 (+0900)
Subject: Cookie使用時に「Listの発言取得に公式RTを含める」の設定が適用されない不具合を修正
X-Git-Tag: OpenTween_v3.15.1^2~3^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ae8c29099837eda00f0ff7c970082adb4612485;p=opentween%2Fopen-tween.git

Cookie使用時に「Listの発言取得に公式RTを含める」の設定が適用されない不具合を修正

Fixes: 961e4ee8 ("ISocialProtocolClient.GetListTimelineメソッドを追加")
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9fdceda4..a2bf7fda 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
 更新履歴
 
 ==== Unreleased
+ * FIX: Cookie使用時に「Listの発言取得に公式RTを含める」の設定が適用されない不具合を修正
 
 ==== Ver 3.15.0(2024/06/14)
  * NEW: Misskeyでのノート投稿時のファイル添付に対応しました
diff --git a/OpenTween/SocialProtocol/Twitter/TimelineResponseFilter.cs b/OpenTween/SocialProtocol/Twitter/TimelineResponseFilter.cs
index 01644475..287757c3 100644
--- a/OpenTween/SocialProtocol/Twitter/TimelineResponseFilter.cs
+++ b/OpenTween/SocialProtocol/Twitter/TimelineResponseFilter.cs
@@ -39,6 +39,8 @@ namespace OpenTween.SocialProtocol.Twitter
 
         public bool IsHomeTimeline { get; set; }
 
+        public bool IncludeRts { get; set; } = true;
+
         public TimelineResponseFilter(TwitterAccountState accountState)
         {
             this.accountState = accountState;
@@ -56,6 +58,9 @@ namespace OpenTween.SocialProtocol.Twitter
                 filteredPosts = this.FilterMutedUserPosts(filteredPosts);
             }
 
+            if (!this.IncludeRts)
+                filteredPosts = this.FilterRetweets(filteredPosts);
+
             return filteredPosts.ToArray();
         }
 
@@ -85,5 +90,8 @@ namespace OpenTween.SocialProtocol.Twitter
 
             return false;
         }
+
+        private IEnumerable<PostClass> FilterRetweets(IEnumerable<PostClass> posts)
+            => posts.Where(x => x.RetweetedId == null);
     }
 }
diff --git a/OpenTween/SocialProtocol/Twitter/TwitterGraphqlClient.cs b/OpenTween/SocialProtocol/Twitter/TwitterGraphqlClient.cs
index 84acb0f5..1c51788c 100644
--- a/OpenTween/SocialProtocol/Twitter/TwitterGraphqlClient.cs
+++ b/OpenTween/SocialProtocol/Twitter/TwitterGraphqlClient.cs
@@ -33,6 +33,7 @@ using System.Threading.Tasks;
 using OpenTween.Api.GraphQL;
 using OpenTween.Api.TwitterV2;
 using OpenTween.Models;
+using OpenTween.Setting;
 
 namespace OpenTween.SocialProtocol.Twitter
 {
@@ -177,7 +178,10 @@ namespace OpenTween.SocialProtocol.Twitter
 
             var posts = this.account.Legacy.CreatePostsFromJson(statuses, firstLoad);
 
-            var filter = new TimelineResponseFilter(this.account.AccountState);
+            var filter = new TimelineResponseFilter(this.account.AccountState)
+            {
+                IncludeRts = SettingManager.Instance.Common.IsListsIncludeRts,
+            };
             posts = filter.Run(posts);
 
             return new(posts, cursorTop, cursorBottom);