From 5f84b1a20befc2a0a033ccd441b9c9326ca34453 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sun, 7 Jan 2024 03:22:08 +0900
Subject: [PATCH 01/16] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=20v3.11.1-dev=20=E9=96=8B=E7=99=BA=E9=96=8B=E5=A7=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.txt                              | 2 ++
 OpenTween/Properties/AssemblyInfo.cs       | 2 +-
 OpenTween/Properties/Resources.Designer.cs | 4 +++-
 appveyor.yml                               | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 57496d110..a1e4333e8 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,7 @@
 更新履歴
 
+==== Unreleased
+
 ==== Ver 3.11.0(2024/01/07)
  * NEW: Cookie使用時の関連発言表示に対応
  * FIX: APIリクエストのタイムアウト時に接続が切断されない場合がある不具合を修正
diff --git a/OpenTween/Properties/AssemblyInfo.cs b/OpenTween/Properties/AssemblyInfo.cs
index f2841c999..8721b00d9 100644
--- a/OpenTween/Properties/AssemblyInfo.cs
+++ b/OpenTween/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 // 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です
 [assembly: Guid("2d0ae0ba-adac-49a2-9b10-26fd69e695bf")]
 
-[assembly: AssemblyVersion("3.11.0.0")]
+[assembly: AssemblyVersion("3.11.0.1")]
 
 [assembly: InternalsVisibleTo("OpenTween.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // for Moq
diff --git a/OpenTween/Properties/Resources.Designer.cs b/OpenTween/Properties/Resources.Designer.cs
index 7a466ce67..7615947b6 100644
--- a/OpenTween/Properties/Resources.Designer.cs
+++ b/OpenTween/Properties/Resources.Designer.cs
@@ -580,6 +580,8 @@ internal static string ChangeIconToolStripMenuItem_Confirm {
         /// <summary>
         ///   更新履歴
         ///
+        ///==== Unreleased
+        ///
         ///==== Ver 3.11.0(2024/01/07)
         /// * NEW: Cookie使用時の関連発言表示に対応
         /// * FIX: APIリクエストのタイムアウト時に接続が切断されない場合がある不具合を修正
@@ -595,7 +597,7 @@ internal static string ChangeIconToolStripMenuItem_Confirm {
         ///==== Ver 3.9.0(2023/12/03)
         /// * NEW: graphqlエンドポイントに対するレートリミットの表示に対応
         /// * CHG: タイムライン更新時に全件ではなく新着投稿のみ差分を取得する動作に変更
-        /// * FIX: 設定したタイムアウト時間を超えてAPI接続が持続する場合がある不 [残りの文字列は切り詰められました]&quot;; に類似しているローカライズされた文字列を検索します。
+        /// * FIX: 設定したタイムアウト時間を [残りの文字列は切り詰められました]&quot;; に類似しているローカライズされた文字列を検索します。
         /// </summary>
         internal static string ChangeLog {
             get {
diff --git a/appveyor.yml b/appveyor.yml
index b60cfa1cd..001f7c2fe 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 3.10.1.{build}
+version: 3.11.0.{build}
 
 os: Visual Studio 2022
 

From 0f418ce494b6dcaa4687ece4bcca0cdf8b3ab12a Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 8 Jan 2024 04:15:44 +0900
Subject: [PATCH 02/16] =?UTF-8?q?DetailsHtmlBuilder=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/DetailsHtmlBuilderTest.cs          | 45 +++++++++++
 OpenTween/Models/DetailsHtmlBuilder.cs        | 77 +++++++++++++++++++
 OpenTween/Tween.cs                            | 49 ++----------
 OpenTween/TweetDetailsView.cs                 | 19 +++--
 OpenTween/UserInfoDialog.cs                   | 13 ++--
 5 files changed, 147 insertions(+), 56 deletions(-)
 create mode 100644 OpenTween.Tests/Models/DetailsHtmlBuilderTest.cs
 create mode 100644 OpenTween/Models/DetailsHtmlBuilder.cs

diff --git a/OpenTween.Tests/Models/DetailsHtmlBuilderTest.cs b/OpenTween.Tests/Models/DetailsHtmlBuilderTest.cs
new file mode 100644
index 000000000..6ba0287e9
--- /dev/null
+++ b/OpenTween.Tests/Models/DetailsHtmlBuilderTest.cs
@@ -0,0 +1,45 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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.Xml.Linq;
+using System.Xml.XPath;
+using Xunit;
+
+namespace OpenTween.Models
+{
+    public class DetailsHtmlBuilderTest
+    {
+        [Fact]
+        public void Build_Test()
+        {
+            var settingCommon = new SettingCommon();
+            var settingLocal = new SettingLocal();
+            using var theme = new ThemeManager(settingLocal);
+
+            var builder = new DetailsHtmlBuilder();
+            builder.Prepare(settingCommon, theme);
+
+            var actualHtml = builder.Build("tetete");
+            var parsedDocument = XDocument.Parse(actualHtml);
+            Assert.Equal("tetete", parsedDocument.XPathSelectElement("/html/body/p").Value);
+        }
+    }
+}
diff --git a/OpenTween/Models/DetailsHtmlBuilder.cs b/OpenTween/Models/DetailsHtmlBuilder.cs
new file mode 100644
index 000000000..a0219b9e3
--- /dev/null
+++ b/OpenTween/Models/DetailsHtmlBuilder.cs
@@ -0,0 +1,77 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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.
+
+#nullable enable
+
+using System;
+using System.Drawing;
+
+namespace OpenTween.Models
+{
+    public class DetailsHtmlBuilder
+    {
+        private const string TemplateHead =
+            """<head><meta http-equiv="X-UA-Compatible" content="IE=8" />"""
+            + """<style type="text/css"><!-- """
+            + "body, p, pre {margin: 0;} "
+            + """body {font-family: "%FONT_FAMILY%", "Segoe UI Emoji", sans-serif; font-size: %FONT_SIZE%pt; background-color:rgb(%BG_COLOR%); word-wrap: break-word; color:rgb(%FONT_COLOR%);} """
+            + "pre {font-family: inherit;} "
+            + "a:link, a:visited, a:active, a:hover {color:rgb(%LINK_COLOR%); } "
+            + "img.emoji {width: 1em; height: 1em; margin: 0 .05em 0 .1em; vertical-align: -0.1em; border: none;} "
+            + ".quote-tweet {border: 1px solid #ccc; margin: 1em; padding: 0.5em;} "
+            + ".quote-tweet.reply {border-color: rgb(%BG_REPLY_COLOR%);} "
+            + ".quote-tweet-link {color: inherit !important; text-decoration: none;}"
+            + "--></style>"
+            + "</head>";
+
+        private const string TemplateMonospaced =
+            $"<html>{TemplateHead}<body><pre>%CONTENT_HTML%</pre></body></html>";
+
+        private const string TemplateProportional =
+            $"<html>{TemplateHead}<body><p>%CONTENT_HTML%</p></body></html>";
+
+        private string? preparedTemplate = null;
+
+        public void Prepare(SettingCommon settingCommon, ThemeManager theme)
+        {
+            var htmlTemplate = settingCommon.IsMonospace ? TemplateMonospaced : TemplateProportional;
+
+            static string ColorToRGBString(Color color)
+                => $"{color.R},{color.G},{color.B}";
+
+            this.preparedTemplate = htmlTemplate
+                .Replace("%FONT_FAMILY%", theme.FontDetail.Name)
+                .Replace("%FONT_SIZE%", theme.FontDetail.Size.ToString())
+                .Replace("%FONT_COLOR%", ColorToRGBString(theme.ColorDetail))
+                .Replace("%LINK_COLOR%", ColorToRGBString(theme.ColorDetailLink))
+                .Replace("%BG_COLOR%", ColorToRGBString(theme.ColorDetailBackcolor))
+                .Replace("%BG_REPLY_COLOR%", ColorToRGBString(theme.ColorAtTo));
+        }
+
+        public string Build(string contentHtml)
+        {
+            if (this.preparedTemplate == null)
+                throw new InvalidOperationException("Template is not prepared.");
+
+            return this.preparedTemplate.Replace("%CONTENT_HTML%", contentHtml);
+        }
+    }
+}
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index ae3c66027..7124676b2 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -98,27 +98,7 @@ public partial class TweenMain : OTBaseForm
 
         private readonly object syncObject = new(); // ロック用
 
-        private const string DetailHtmlFormatHead =
-            """<head><meta http-equiv="X-UA-Compatible" content="IE=8">"""
-            + """<style type="text/css"><!-- """
-            + "body, p, pre {margin: 0;} "
-            + """body {font-family: "%FONT_FAMILY%", "Segoe UI Emoji", sans-serif; font-size: %FONT_SIZE%pt; background-color:rgb(%BG_COLOR%); word-wrap: break-word; color:rgb(%FONT_COLOR%);} """
-            + "pre {font-family: inherit;} "
-            + "a:link, a:visited, a:active, a:hover {color:rgb(%LINK_COLOR%); } "
-            + "img.emoji {width: 1em; height: 1em; margin: 0 .05em 0 .1em; vertical-align: -0.1em; border: none;} "
-            + ".quote-tweet {border: 1px solid #ccc; margin: 1em; padding: 0.5em;} "
-            + ".quote-tweet.reply {border-color: rgb(%BG_REPLY_COLOR%);} "
-            + ".quote-tweet-link {color: inherit !important; text-decoration: none;}"
-            + "--></style>"
-            + "</head>";
-
-        private const string DetailHtmlFormatTemplateMono =
-            $"<html>{DetailHtmlFormatHead}<body><pre>%CONTENT_HTML%</pre></body></html>";
-
-        private const string DetailHtmlFormatTemplateNormal =
-            $"<html>{DetailHtmlFormatHead}<body><p>%CONTENT_HTML%</p></body></html>";
-
-        private string detailHtmlFormatPreparedTemplate = null!;
+        private readonly DetailsHtmlBuilder detailsHtmlBuilder = new();
 
         private bool myStatusError = false;
         private bool myStatusOnline = false;
@@ -356,13 +336,13 @@ ThumbnailGenerator thumbGenerator
 
             // フォント＆文字色＆背景色保持
             this.themeManager = new(this.settings.Local);
-            this.tweetDetailsView.Initialize(this, this.iconCache, this.themeManager);
+            this.tweetDetailsView.Initialize(this, this.iconCache, this.themeManager, this.detailsHtmlBuilder);
 
             // StringFormatオブジェクトへの事前設定
             this.sfTab.Alignment = StringAlignment.Center;
             this.sfTab.LineAlignment = StringAlignment.Center;
 
-            this.InitDetailHtmlFormat();
+            this.detailsHtmlBuilder.Prepare(this.settings.Common, this.themeManager);
             this.tweetDetailsView.ClearPostBrowser();
 
             this.recommendedStatusFooter = " [TWNv" + Regex.Replace(MyCommon.FileVersion.Replace(".", ""), "^0*", "") + "]";
@@ -754,22 +734,6 @@ private void InitColumnText()
             }
         }
 
-        private void InitDetailHtmlFormat()
-        {
-            var htmlTemplate = this.settings.Common.IsMonospace ? DetailHtmlFormatTemplateMono : DetailHtmlFormatTemplateNormal;
-
-            static string ColorToRGBString(Color color)
-                => $"{color.R},{color.G},{color.B}";
-
-            this.detailHtmlFormatPreparedTemplate = htmlTemplate
-                .Replace("%FONT_FAMILY%", this.themeManager.FontDetail.Name)
-                .Replace("%FONT_SIZE%", this.themeManager.FontDetail.Size.ToString())
-                .Replace("%FONT_COLOR%", ColorToRGBString(this.themeManager.ColorDetail))
-                .Replace("%LINK_COLOR%", ColorToRGBString(this.themeManager.ColorDetailLink))
-                .Replace("%BG_COLOR%", ColorToRGBString(this.themeManager.ColorDetailBackcolor))
-                .Replace("%BG_REPLY_COLOR%", ColorToRGBString(this.themeManager.ColorAtTo));
-        }
-
         private void ListTab_DrawItem(object sender, DrawItemEventArgs e)
         {
             string txt;
@@ -2652,7 +2616,7 @@ private async void SettingStripMenuItem_Click(object sender, EventArgs e)
 
                     try
                     {
-                        this.InitDetailHtmlFormat();
+                        this.detailsHtmlBuilder.Prepare(this.settings.Common, this.themeManager);
                     }
                     catch (Exception ex)
                     {
@@ -4162,9 +4126,6 @@ private void UpdateSelectedPost()
             this.DispSelectedPost();
         }
 
-        public string CreateDetailHtml(string orgdata)
-            => this.detailHtmlFormatPreparedTemplate.Replace("%CONTENT_HTML%", orgdata);
-
         private void DispSelectedPost()
             => this.DispSelectedPost(false);
 
@@ -9006,7 +8967,7 @@ private async Task DoShowUserStatus(string id, bool showInputDialog)
 
         private async Task DoShowUserStatus(TwitterUser user)
         {
-            using var userDialog = new UserInfoDialog(this, this.tw.Api);
+            using var userDialog = new UserInfoDialog(this, this.tw.Api, this.detailsHtmlBuilder);
             var showUserTask = userDialog.ShowUserAsync(user);
             userDialog.ShowDialog(this);
 
diff --git a/OpenTween/TweetDetailsView.cs b/OpenTween/TweetDetailsView.cs
index 4bbe6184d..d0d90970e 100644
--- a/OpenTween/TweetDetailsView.cs
+++ b/OpenTween/TweetDetailsView.cs
@@ -54,6 +54,9 @@ private TweenMain Owner
         private ImageCache IconCache
             => this.iconCache ?? throw this.NotInitializedException();
 
+        private DetailsHtmlBuilder HtmlBuilder
+            => this.detailsHtmlBuilder ?? throw this.NotInitializedException();
+
         /// <summary><see cref="PostClass"/> のダンプを表示するか</summary>
         [Browsable(false)]
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
@@ -86,6 +89,7 @@ public ThemeManager Theme
         private TweenMain? owner;
         private ImageCache? iconCache;
         private ThemeManager? themeManager;
+        private DetailsHtmlBuilder? detailsHtmlBuilder;
 
         public TweetDetailsView()
         {
@@ -102,18 +106,19 @@ public TweetDetailsView()
             this.PostBrowser.AllowWebBrowserDrop = false;  // COMException を回避するため、ActiveX の初期化が終わってから設定する
         }
 
-        public void Initialize(TweenMain owner, ImageCache iconCache, ThemeManager themeManager)
+        public void Initialize(TweenMain owner, ImageCache iconCache, ThemeManager themeManager, DetailsHtmlBuilder detailsHtmlBuilder)
         {
             this.owner = owner;
             this.iconCache = iconCache;
             this.themeManager = themeManager;
+            this.detailsHtmlBuilder = detailsHtmlBuilder;
         }
 
         private Exception NotInitializedException()
             => new InvalidOperationException("Cannot call before initialization");
 
         public void ClearPostBrowser()
-            => this.PostBrowser.DocumentText = this.Owner.CreateDetailHtml("");
+            => this.PostBrowser.DocumentText = this.HtmlBuilder.Build("");
 
         public async Task ShowPostDetails(PostClass post)
         {
@@ -208,14 +213,14 @@ public async Task ShowPostDetails(PostClass post)
                 }
                 sb.Append("-----End PostClass Dump<br>");
 
-                this.PostBrowser.DocumentText = this.Owner.CreateDetailHtml(sb.ToString());
+                this.PostBrowser.DocumentText = this.HtmlBuilder.Build(sb.ToString());
                 return;
             }
 
             using (ControlTransaction.Update(this.PostBrowser))
             {
                 this.PostBrowser.DocumentText =
-                    this.Owner.CreateDetailHtml(post.IsDeleted ? "(DELETED)" : post.Text);
+                    this.HtmlBuilder.Build(post.IsDeleted ? "(DELETED)" : post.Text);
 
                 this.PostBrowser.Document.Window.ScrollTo(0, 0);
             }
@@ -331,7 +336,7 @@ private async Task AppendQuoteTweetAsync(PostClass post)
             var body = post.Text + string.Concat(loadingQuoteHtml) + loadingReplyHtml;
 
             using (ControlTransaction.Update(this.PostBrowser))
-                this.PostBrowser.DocumentText = this.Owner.CreateDetailHtml(body);
+                this.PostBrowser.DocumentText = this.HtmlBuilder.Build(body);
 
             // 引用ツイートを読み込み
             var loadTweetTasks = quoteStatusIds.Select(x => this.CreateQuoteTweetHtml(x, isReply: false)).ToList();
@@ -348,7 +353,7 @@ private async Task AppendQuoteTweetAsync(PostClass post)
             body = post.Text + string.Concat(quoteHtmls);
 
             using (ControlTransaction.Update(this.PostBrowser))
-                this.PostBrowser.DocumentText = this.Owner.CreateDetailHtml(body);
+                this.PostBrowser.DocumentText = this.HtmlBuilder.Build(body);
         }
 
         private async Task<string> CreateQuoteTweetHtml(PostId statusId, bool isReply)
@@ -422,7 +427,7 @@ private async Task DoTranslation(string str)
                     langFrom: null,
                     langTo: SettingManager.Instance.Common.TranslateLanguage);
 
-                this.PostBrowser.DocumentText = this.Owner.CreateDetailHtml(translatedText);
+                this.PostBrowser.DocumentText = this.HtmlBuilder.Build(translatedText);
             }
             catch (WebApiException e)
             {
diff --git a/OpenTween/UserInfoDialog.cs b/OpenTween/UserInfoDialog.cs
index 3a98320d1..e8c06e9cd 100644
--- a/OpenTween/UserInfoDialog.cs
+++ b/OpenTween/UserInfoDialog.cs
@@ -44,6 +44,7 @@
 using OpenTween.Api;
 using OpenTween.Api.DataModel;
 using OpenTween.Connection;
+using OpenTween.Models;
 
 namespace OpenTween
 {
@@ -54,11 +55,13 @@ public partial class UserInfoDialog : OTBaseForm
 
         private readonly TweenMain mainForm;
         private readonly TwitterApi twitterApi;
+        private readonly DetailsHtmlBuilder detailsHtmlBuilder;
 
-        public UserInfoDialog(TweenMain mainForm, TwitterApi twitterApi)
+        public UserInfoDialog(TweenMain mainForm, TwitterApi twitterApi, DetailsHtmlBuilder detailsHtmlBuilder)
         {
             this.mainForm = mainForm;
             this.twitterApi = twitterApi;
+            this.detailsHtmlBuilder = detailsHtmlBuilder;
 
             this.InitializeComponent();
 
@@ -183,7 +186,7 @@ private async Task SetDescriptionAsync(string? descriptionText, TwitterEntities?
                     .Concat(TweetExtractor.ExtractEmojiEntities(descriptionText));
 
                 var html = TweetFormatter.AutoLinkHtml(descriptionText, mergedEntities);
-                html = this.mainForm.CreateDetailHtml(html);
+                html = this.detailsHtmlBuilder.Build(html);
 
                 if (cancellationToken.IsCancellationRequested)
                     return;
@@ -192,7 +195,7 @@ private async Task SetDescriptionAsync(string? descriptionText, TwitterEntities?
             }
             else
             {
-                this.DescriptionBrowser.DocumentText = this.mainForm.CreateDetailHtml("");
+                this.DescriptionBrowser.DocumentText = this.detailsHtmlBuilder.Build("");
             }
         }
 
@@ -263,7 +266,7 @@ private async Task SetRecentStatusAsync(TwitterStatus? status, CancellationToken
                 var mergedEntities = entities.Concat(TweetExtractor.ExtractEmojiEntities(status.FullText));
 
                 var html = TweetFormatter.AutoLinkHtml(status.FullText, mergedEntities);
-                html = this.mainForm.CreateDetailHtml(html +
+                html = this.detailsHtmlBuilder.Build(html +
                     " Posted at " + MyCommon.DateTimeParse(status.CreatedAt).ToLocalTimeString() +
                     " via " + status.Source);
 
@@ -274,7 +277,7 @@ private async Task SetRecentStatusAsync(TwitterStatus? status, CancellationToken
             }
             else
             {
-                this.RecentPostBrowser.DocumentText = this.mainForm.CreateDetailHtml(Properties.Resources.ShowUserInfo2);
+                this.RecentPostBrowser.DocumentText = this.detailsHtmlBuilder.Build(Properties.Resources.ShowUserInfo2);
             }
         }
 

From 9dd3bb74f69e7cd1fcc87b68eb7a4bc3e7ebc193 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 8 Jan 2024 06:17:22 +0900
Subject: [PATCH 03/16] =?UTF-8?q?StatusTextHistory=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/StatusTextHistoryTest.cs           | 115 ++++++++++++++++++
 OpenTween/Models/StatusTextHistory.cs         |  88 ++++++++++++++
 OpenTween/Tween.cs                            |  39 ++----
 3 files changed, 210 insertions(+), 32 deletions(-)
 create mode 100644 OpenTween.Tests/Models/StatusTextHistoryTest.cs
 create mode 100644 OpenTween/Models/StatusTextHistory.cs

diff --git a/OpenTween.Tests/Models/StatusTextHistoryTest.cs b/OpenTween.Tests/Models/StatusTextHistoryTest.cs
new file mode 100644
index 000000000..922522c6a
--- /dev/null
+++ b/OpenTween.Tests/Models/StatusTextHistoryTest.cs
@@ -0,0 +1,115 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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 Xunit;
+
+namespace OpenTween.Models
+{
+    public class StatusTextHistoryTest
+    {
+        [Fact]
+        public void Initialize_Test()
+        {
+            var history = new StatusTextHistory();
+            Assert.Single(history.Items);
+            Assert.Equal(new("", null), history.Items[0]);
+            Assert.Equal(0, history.HistoryIndex);
+        }
+
+        [Fact]
+        public void Back_NoItemsTest()
+        {
+            var history = new StatusTextHistory();
+            history.Back("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            Assert.Single(history.Items);
+            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(0, history.HistoryIndex);
+        }
+
+        [Fact]
+        public void Back_HasItemsTest()
+        {
+            var history = new StatusTextHistory();
+            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            history.AddLast();
+            history.Back("@foo bbb", (new TwitterStatusId("222"), "foo"));
+
+            Assert.Equal(2, history.Items.Count);
+            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(new("@foo bbb", (new TwitterStatusId("222"), "foo")), history.Items[1]);
+            Assert.Equal(0, history.HistoryIndex);
+        }
+
+        [Fact]
+        public void Forward_NoItemsTest()
+        {
+            var history = new StatusTextHistory();
+            history.Forward("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            Assert.Single(history.Items);
+            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(0, history.HistoryIndex);
+        }
+
+        [Fact]
+        public void Forward_HasItemsTest()
+        {
+            var history = new StatusTextHistory();
+            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            history.AddLast();
+            history.Back("@foo bbb", (new TwitterStatusId("222"), "foo"));
+            history.Forward("@hoge aaa 123", (new TwitterStatusId("111"), "hoge"));
+
+            Assert.Equal(2, history.Items.Count);
+            Assert.Equal(new("@hoge aaa 123", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(new("@foo bbb", (new TwitterStatusId("222"), "foo")), history.Items[1]);
+            Assert.Equal(1, history.HistoryIndex);
+        }
+
+        [Fact]
+        public void AddLast_Test()
+        {
+            var history = new StatusTextHistory();
+            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            history.AddLast();
+            Assert.Equal(2, history.Items.Count);
+            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(new("", null), history.Items[1]);
+            Assert.Equal(1, history.HistoryIndex);
+        }
+
+        [Fact]
+        public void Peek_EmptyTest()
+        {
+            var history = new StatusTextHistory();
+            Assert.Null(history.Peek());
+        }
+
+        [Fact]
+        public void Peek_HasItemsTest()
+        {
+            var history = new StatusTextHistory();
+            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            history.AddLast();
+
+            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Peek());
+        }
+    }
+}
diff --git a/OpenTween/Models/StatusTextHistory.cs b/OpenTween/Models/StatusTextHistory.cs
new file mode 100644
index 000000000..ec1d8fe24
--- /dev/null
+++ b/OpenTween/Models/StatusTextHistory.cs
@@ -0,0 +1,88 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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.
+
+#nullable enable
+
+using System.Collections.Generic;
+
+namespace OpenTween.Models
+{
+    public class StatusTextHistory
+    {
+        public readonly record struct HistoryItem(
+            string Status,
+            (PostId StatusId, string ScreenName)? InReplyTo = null
+        );
+
+        internal IReadOnlyList<HistoryItem> Items
+            => this.items;
+
+        internal int HistoryIndex
+            => this.historyIndex;
+
+        private readonly List<HistoryItem> items = new();
+        private int historyIndex = 0;
+
+        public StatusTextHistory()
+            => this.items.Add(new(""));
+
+        public HistoryItem Back(string text, (PostId StatusId, string ScreenName)? inReplyTo)
+        {
+            if (!string.IsNullOrWhiteSpace(text))
+                this.items[this.historyIndex] = new(text, inReplyTo);
+
+            this.historyIndex -= 1;
+            if (this.historyIndex < 0)
+                this.historyIndex = 0;
+
+            return this.items[this.historyIndex];
+        }
+
+        public HistoryItem Forward(string text, (PostId StatusId, string ScreenName)? inReplyTo)
+        {
+            if (!string.IsNullOrWhiteSpace(text))
+                this.items[this.historyIndex] = new(text, inReplyTo);
+
+            this.historyIndex += 1;
+            if (this.historyIndex > this.items.Count - 1)
+                this.historyIndex = this.items.Count - 1;
+
+            return this.items[this.historyIndex];
+        }
+
+        public void SetLastItem(string text, (PostId StatusId, string ScreenName)? inReplyTo)
+            => this.items[this.items.Count - 1] = new(text, inReplyTo);
+
+        public void AddLast()
+        {
+            this.items.Add(new(""));
+            this.historyIndex = this.items.Count - 1;
+        }
+
+        public HistoryItem? Peek()
+        {
+            if (this.items.Count < 2)
+                return null;
+
+            return this.items[this.items.Count - 2];
+        }
+    }
+}
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 7124676b2..7d924e375 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -140,10 +140,7 @@ public partial class TweenMain : OTBaseForm
         private readonly ThumbnailGenerator thumbGenerator;
 
         /// <summary>発言履歴</summary>
-        private readonly List<StatusTextHistory> history = new();
-
-        /// <summary>発言履歴カレントインデックス</summary>
-        private int hisIdx;
+        private readonly StatusTextHistory history = new();
 
         // 発言投稿時のAPI引数（発言編集時に設定。手書きreplyでは設定されない）
 
@@ -239,11 +236,6 @@ internal enum SEARCHTYPE
             PrevSearch,
         }
 
-        private readonly record struct StatusTextHistory(
-            string Status,
-            (PostId StatusId, string ScreenName)? InReplyTo = null
-        );
-
         private readonly HookGlobalHotkey hookGlobalHotkey;
 
         public TweenMain(
@@ -347,8 +339,6 @@ ThumbnailGenerator thumbGenerator
 
             this.recommendedStatusFooter = " [TWNv" + Regex.Replace(MyCommon.FileVersion.Replace(".", ""), "^0*", "") + "]";
 
-            this.history.Add(new StatusTextHistory(""));
-            this.hisIdx = 0;
             this.inReplyTo = null;
 
             // 各種ダイアログ設定
@@ -1098,14 +1088,7 @@ private async void MyList_SelectedIndexChanged(object sender, EventArgs e)
 
         private void StatusTextHistoryBack()
         {
-            if (!string.IsNullOrWhiteSpace(this.StatusText.Text))
-                this.history[this.hisIdx] = new StatusTextHistory(this.StatusText.Text, this.inReplyTo);
-
-            this.hisIdx -= 1;
-            if (this.hisIdx < 0)
-                this.hisIdx = 0;
-
-            var historyItem = this.history[this.hisIdx];
+            var historyItem = this.history.Back(this.StatusText.Text, this.inReplyTo);
             this.inReplyTo = historyItem.InReplyTo;
             this.StatusText.Text = historyItem.Status;
             this.StatusText.SelectionStart = this.StatusText.Text.Length;
@@ -1113,14 +1096,7 @@ private void StatusTextHistoryBack()
 
         private void StatusTextHistoryForward()
         {
-            if (!string.IsNullOrWhiteSpace(this.StatusText.Text))
-                this.history[this.hisIdx] = new StatusTextHistory(this.StatusText.Text, this.inReplyTo);
-
-            this.hisIdx += 1;
-            if (this.hisIdx > this.history.Count - 1)
-                this.hisIdx = this.history.Count - 1;
-
-            var historyItem = this.history[this.hisIdx];
+            var historyItem = this.history.Forward(this.StatusText.Text, this.inReplyTo);
             this.inReplyTo = historyItem.InReplyTo;
             this.StatusText.Text = historyItem.Status;
             this.StatusText.SelectionStart = this.StatusText.Text.Length;
@@ -1164,7 +1140,7 @@ private async void PostButton_Click(object sender, EventArgs e)
                     return;
             }
 
-            this.history[this.history.Count - 1] = new StatusTextHistory(this.StatusText.Text, this.inReplyTo);
+            this.history.SetLastItem(this.StatusText.Text, this.inReplyTo);
 
             if (this.settings.Common.Nicoms)
             {
@@ -1227,8 +1203,7 @@ private async void PostButton_Click(object sender, EventArgs e)
 
             this.inReplyTo = null;
             this.StatusText.Text = "";
-            this.history.Add(new StatusTextHistory(""));
-            this.hisIdx = this.history.Count - 1;
+            this.history.AddLast();
             if (!this.settings.Common.FocusLockToStatusText)
                 this.CurrentListView.Focus();
             this.urlUndoBuffer = null;
@@ -6903,8 +6878,8 @@ private void SetMainWindowTitle()
                     ttl.Append("Ver:").Append(MyCommon.GetReadableVersion());
                     break;
                 case MyCommon.DispTitleEnum.Post:
-                    if (this.history != null && this.history.Count > 1)
-                        ttl.Append(this.history[this.history.Count - 2].Status.Replace("\r\n", " "));
+                    if (this.history.Peek() is { } lastItem)
+                        ttl.Append(lastItem.Status.Replace("\r\n", " "));
                     break;
                 case MyCommon.DispTitleEnum.UnreadRepCount:
                     ttl.AppendFormat(Properties.Resources.SetMainWindowTitleText1, this.statuses.MentionTab.UnreadCount + this.statuses.DirectMessageTab.UnreadCount);

From d8d484c6db8f4b626cda2647fa25331656aad2ae Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 8 Jan 2024 09:28:41 +0900
Subject: [PATCH 04/16] =?UTF-8?q?SetLastItem=E3=81=A8AddLast=E3=83=A1?=
 =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E7=B5=B1=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/Models/StatusTextHistoryTest.cs | 12 ++++--------
 OpenTween/Models/StatusTextHistory.cs           |  7 +++----
 OpenTween/Tween.cs                              |  5 ++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/OpenTween.Tests/Models/StatusTextHistoryTest.cs b/OpenTween.Tests/Models/StatusTextHistoryTest.cs
index 922522c6a..c33fe441b 100644
--- a/OpenTween.Tests/Models/StatusTextHistoryTest.cs
+++ b/OpenTween.Tests/Models/StatusTextHistoryTest.cs
@@ -48,8 +48,7 @@ public void Back_NoItemsTest()
         public void Back_HasItemsTest()
         {
             var history = new StatusTextHistory();
-            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
-            history.AddLast();
+            history.AddLast("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
             history.Back("@foo bbb", (new TwitterStatusId("222"), "foo"));
 
             Assert.Equal(2, history.Items.Count);
@@ -72,8 +71,7 @@ public void Forward_NoItemsTest()
         public void Forward_HasItemsTest()
         {
             var history = new StatusTextHistory();
-            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
-            history.AddLast();
+            history.AddLast("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
             history.Back("@foo bbb", (new TwitterStatusId("222"), "foo"));
             history.Forward("@hoge aaa 123", (new TwitterStatusId("111"), "hoge"));
 
@@ -87,8 +85,7 @@ public void Forward_HasItemsTest()
         public void AddLast_Test()
         {
             var history = new StatusTextHistory();
-            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
-            history.AddLast();
+            history.AddLast("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
             Assert.Equal(2, history.Items.Count);
             Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
             Assert.Equal(new("", null), history.Items[1]);
@@ -106,8 +103,7 @@ public void Peek_EmptyTest()
         public void Peek_HasItemsTest()
         {
             var history = new StatusTextHistory();
-            history.SetLastItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
-            history.AddLast();
+            history.AddLast("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
 
             Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Peek());
         }
diff --git a/OpenTween/Models/StatusTextHistory.cs b/OpenTween/Models/StatusTextHistory.cs
index ec1d8fe24..f84c66d7f 100644
--- a/OpenTween/Models/StatusTextHistory.cs
+++ b/OpenTween/Models/StatusTextHistory.cs
@@ -68,11 +68,10 @@ public HistoryItem Forward(string text, (PostId StatusId, string ScreenName)? in
             return this.items[this.historyIndex];
         }
 
-        public void SetLastItem(string text, (PostId StatusId, string ScreenName)? inReplyTo)
-            => this.items[this.items.Count - 1] = new(text, inReplyTo);
-
-        public void AddLast()
+        public void AddLast(string text, (PostId StatusId, string ScreenName)? inReplyTo)
         {
+            this.items[this.items.Count - 1] = new(text, inReplyTo);
+
             this.items.Add(new(""));
             this.historyIndex = this.items.Count - 1;
         }
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 7d924e375..51974e01a 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1140,8 +1140,6 @@ private async void PostButton_Click(object sender, EventArgs e)
                     return;
             }
 
-            this.history.SetLastItem(this.StatusText.Text, this.inReplyTo);
-
             if (this.settings.Common.Nicoms)
             {
                 this.StatusText.SelectionStart = this.StatusText.Text.Length;
@@ -1201,9 +1199,10 @@ private async void PostButton_Click(object sender, EventArgs e)
                 uploadService = this.ImageSelector.Model.GetService(serviceName);
             }
 
+            this.history.AddLast(this.StatusText.Text, this.inReplyTo);
+
             this.inReplyTo = null;
             this.StatusText.Text = "";
-            this.history.AddLast();
             if (!this.settings.Common.FocusLockToStatusText)
                 this.CurrentListView.Focus();
             this.urlUndoBuffer = null;

From ef3f32a8050a6bea2d208bb32e705dfbd5a615bd Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 8 Jan 2024 09:54:28 +0900
Subject: [PATCH 05/16] =?UTF-8?q?Forward/Back=E3=83=A1=E3=82=BD=E3=83=83?=
 =?UTF-8?q?=E3=83=89=E3=81=8B=E3=82=89=E7=8F=BE=E5=9C=A8=E3=81=AE=E5=B1=A5?=
 =?UTF-8?q?=E6=AD=B4=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E3=82=92=E5=88=86=E9=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/StatusTextHistoryTest.cs           | 30 ++++++++++++-------
 OpenTween/Models/StatusTextHistory.cs         | 25 ++++++++--------
 OpenTween/Tween.cs                            |  6 ++--
 3 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/OpenTween.Tests/Models/StatusTextHistoryTest.cs b/OpenTween.Tests/Models/StatusTextHistoryTest.cs
index c33fe441b..01e240088 100644
--- a/OpenTween.Tests/Models/StatusTextHistoryTest.cs
+++ b/OpenTween.Tests/Models/StatusTextHistoryTest.cs
@@ -35,25 +35,35 @@ public void Initialize_Test()
         }
 
         [Fact]
-        public void Back_NoItemsTest()
+        public void SetCurrentItem_Test()
         {
             var history = new StatusTextHistory();
-            history.Back("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            history.SetCurrentItem("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
             Assert.Single(history.Items);
             Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
             Assert.Equal(0, history.HistoryIndex);
         }
 
+        [Fact]
+        public void Back_NoItemsTest()
+        {
+            var history = new StatusTextHistory();
+            history.Back();
+            Assert.Single(history.Items);
+            Assert.Equal(new("", null), history.Items[0]);
+            Assert.Equal(0, history.HistoryIndex);
+        }
+
         [Fact]
         public void Back_HasItemsTest()
         {
             var history = new StatusTextHistory();
             history.AddLast("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
-            history.Back("@foo bbb", (new TwitterStatusId("222"), "foo"));
+            history.Back();
 
             Assert.Equal(2, history.Items.Count);
             Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
-            Assert.Equal(new("@foo bbb", (new TwitterStatusId("222"), "foo")), history.Items[1]);
+            Assert.Equal(new("", null), history.Items[1]);
             Assert.Equal(0, history.HistoryIndex);
         }
 
@@ -61,9 +71,9 @@ public void Back_HasItemsTest()
         public void Forward_NoItemsTest()
         {
             var history = new StatusTextHistory();
-            history.Forward("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
+            history.Forward();
             Assert.Single(history.Items);
-            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(new("", null), history.Items[0]);
             Assert.Equal(0, history.HistoryIndex);
         }
 
@@ -72,12 +82,12 @@ public void Forward_HasItemsTest()
         {
             var history = new StatusTextHistory();
             history.AddLast("@hoge aaa", (new TwitterStatusId("111"), "hoge"));
-            history.Back("@foo bbb", (new TwitterStatusId("222"), "foo"));
-            history.Forward("@hoge aaa 123", (new TwitterStatusId("111"), "hoge"));
+            history.Back();
+            history.Forward();
 
             Assert.Equal(2, history.Items.Count);
-            Assert.Equal(new("@hoge aaa 123", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
-            Assert.Equal(new("@foo bbb", (new TwitterStatusId("222"), "foo")), history.Items[1]);
+            Assert.Equal(new("@hoge aaa", (new TwitterStatusId("111"), "hoge")), history.Items[0]);
+            Assert.Equal(new("", null), history.Items[1]);
             Assert.Equal(1, history.HistoryIndex);
         }
 
diff --git a/OpenTween/Models/StatusTextHistory.cs b/OpenTween/Models/StatusTextHistory.cs
index f84c66d7f..91cca92a4 100644
--- a/OpenTween/Models/StatusTextHistory.cs
+++ b/OpenTween/Models/StatusTextHistory.cs
@@ -44,36 +44,35 @@ internal int HistoryIndex
         public StatusTextHistory()
             => this.items.Add(new(""));
 
-        public HistoryItem Back(string text, (PostId StatusId, string ScreenName)? inReplyTo)
+        public void SetCurrentItem(string text, (PostId StatusId, string ScreenName)? inReplyTo)
         {
             if (!string.IsNullOrWhiteSpace(text))
                 this.items[this.historyIndex] = new(text, inReplyTo);
+        }
 
-            this.historyIndex -= 1;
-            if (this.historyIndex < 0)
-                this.historyIndex = 0;
+        public HistoryItem Back()
+        {
+            if (this.historyIndex > 0)
+                this.historyIndex--;
 
             return this.items[this.historyIndex];
         }
 
-        public HistoryItem Forward(string text, (PostId StatusId, string ScreenName)? inReplyTo)
+        public HistoryItem Forward()
         {
-            if (!string.IsNullOrWhiteSpace(text))
-                this.items[this.historyIndex] = new(text, inReplyTo);
-
-            this.historyIndex += 1;
-            if (this.historyIndex > this.items.Count - 1)
-                this.historyIndex = this.items.Count - 1;
+            if (this.historyIndex < this.items.Count - 1)
+                this.historyIndex++;
 
             return this.items[this.historyIndex];
         }
 
         public void AddLast(string text, (PostId StatusId, string ScreenName)? inReplyTo)
         {
-            this.items[this.items.Count - 1] = new(text, inReplyTo);
+            this.historyIndex = this.items.Count - 1;
+            this.SetCurrentItem(text, inReplyTo);
 
             this.items.Add(new(""));
-            this.historyIndex = this.items.Count - 1;
+            this.historyIndex++;
         }
 
         public HistoryItem? Peek()
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 51974e01a..f2d9080c7 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -1088,7 +1088,8 @@ private async void MyList_SelectedIndexChanged(object sender, EventArgs e)
 
         private void StatusTextHistoryBack()
         {
-            var historyItem = this.history.Back(this.StatusText.Text, this.inReplyTo);
+            this.history.SetCurrentItem(this.StatusText.Text, this.inReplyTo);
+            var historyItem = this.history.Back();
             this.inReplyTo = historyItem.InReplyTo;
             this.StatusText.Text = historyItem.Status;
             this.StatusText.SelectionStart = this.StatusText.Text.Length;
@@ -1096,7 +1097,8 @@ private void StatusTextHistoryBack()
 
         private void StatusTextHistoryForward()
         {
-            var historyItem = this.history.Forward(this.StatusText.Text, this.inReplyTo);
+            this.history.SetCurrentItem(this.StatusText.Text, this.inReplyTo);
+            var historyItem = this.history.Forward();
             this.inReplyTo = historyItem.InReplyTo;
             this.StatusText.Text = historyItem.Status;
             this.StatusText.SelectionStart = this.StatusText.Text.Length;

From 2e5a033965984f40bae17850fe000a4b32027c78 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 11 Jan 2024 04:42:45 +0900
Subject: [PATCH 06/16] =?UTF-8?q?TweenMain.AddNewTab=E3=83=A1=E3=82=BD?=
 =?UTF-8?q?=E3=83=83=E3=83=89=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B=E3=83=86?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/ListElementTest.cs |  54 ++++++++++++++
 OpenTween.Tests/TweenMainTest.cs   | 115 ++++++++++++++++++++++++++++-
 OpenTween/ListElement.cs           |   2 +-
 3 files changed, 168 insertions(+), 3 deletions(-)
 create mode 100644 OpenTween.Tests/ListElementTest.cs

diff --git a/OpenTween.Tests/ListElementTest.cs b/OpenTween.Tests/ListElementTest.cs
new file mode 100644
index 000000000..cba9f40c5
--- /dev/null
+++ b/OpenTween.Tests/ListElementTest.cs
@@ -0,0 +1,54 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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 Xunit;
+
+namespace OpenTween
+{
+    public class ListElementTest
+    {
+        [Fact]
+        public void ToString_PublicTest()
+        {
+            var list = new ListElement
+            {
+                Id = 12345L,
+                Name = "tetete",
+                Username = "opentween",
+                IsPublic = true,
+            };
+            Assert.Equal("@opentween/tetete [Public]", list.ToString());
+        }
+
+        [Fact]
+        public void ToString_ProtectedTest()
+        {
+            var list = new ListElement
+            {
+                Id = 12345L,
+                Name = "tetete",
+                Username = "opentween",
+                IsPublic = false,
+            };
+            Assert.Equal("@opentween/tetete [Protected]", list.ToString());
+        }
+    }
+}
diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index 8beba3b2c..2b6da7991 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -30,6 +30,7 @@
 using OpenTween.Api.DataModel;
 using OpenTween.Connection;
 using OpenTween.Models;
+using OpenTween.OpenTweenCustomControl;
 using OpenTween.Setting;
 using OpenTween.Thumbnail;
 using Xunit;
@@ -40,7 +41,8 @@ namespace OpenTween
     public class TweenMainTest
     {
         private record TestContext(
-            SettingManager Settings
+            SettingManager Settings,
+            TabInformations TabInfo
         );
 
         private void UsingTweenMain(Action<TweenMain, TestContext> func)
@@ -54,7 +56,7 @@ private void UsingTweenMain(Action<TweenMain, TestContext> func)
             var thumbnailGenerator = new ThumbnailGenerator(new(autoupdate: false));
 
             using var tweenMain = new TweenMain(settings, tabinfo, twitter, imageCache, iconAssets, thumbnailGenerator);
-            var context = new TestContext(settings);
+            var context = new TestContext(settings, tabinfo);
 
             func(tweenMain, context);
         }
@@ -63,6 +65,115 @@ private void UsingTweenMain(Action<TweenMain, TestContext> func)
         public void Initialize_Test()
             => this.UsingTweenMain((_, _) => { });
 
+        [WinFormsFact]
+        public void AddNewTab_FilterTabTest()
+        {
+            this.UsingTweenMain((tweenMain, context) =>
+            {
+                Assert.Equal(4, tweenMain.ListTab.TabPages.Count);
+
+                var tab = new FilterTabModel("hoge");
+                context.TabInfo.AddTab(tab);
+                tweenMain.AddNewTab(tab, startup: false);
+
+                Assert.Equal(5, tweenMain.ListTab.TabPages.Count);
+
+                var tabPage = tweenMain.ListTab.TabPages[4];
+                Assert.Equal("hoge", tabPage.Text);
+                Assert.Single(tabPage.Controls);
+                Assert.IsType<DetailsListView>(tabPage.Controls[0]);
+            });
+        }
+
+        [WinFormsFact]
+        public void AddNewTab_UserTimelineTabTest()
+        {
+            this.UsingTweenMain((tweenMain, context) =>
+            {
+                Assert.Equal(4, tweenMain.ListTab.TabPages.Count);
+
+                var tab = new UserTimelineTabModel("hoge", "twitterapi");
+                context.TabInfo.AddTab(tab);
+                tweenMain.AddNewTab(tab, startup: false);
+
+                Assert.Equal(5, tweenMain.ListTab.TabPages.Count);
+
+                var tabPage = tweenMain.ListTab.TabPages[4];
+                Assert.Equal("hoge", tabPage.Text);
+                Assert.Equal(2, tabPage.Controls.Count);
+                Assert.IsType<DetailsListView>(tabPage.Controls[0]);
+
+                var label = Assert.IsType<Label>(tabPage.Controls[1]);
+                Assert.Equal("twitterapi's Timeline", label.Text);
+            });
+        }
+
+        [WinFormsFact]
+        public void AddNewTab_ListTimelineTabTest()
+        {
+            this.UsingTweenMain((tweenMain, context) =>
+            {
+                Assert.Equal(4, tweenMain.ListTab.TabPages.Count);
+
+                var list = new ListElement
+                {
+                    Id = 12345L,
+                    Name = "tetete",
+                    Username = "opentween",
+                    IsPublic = false,
+                };
+                var tab = new ListTimelineTabModel("hoge", list);
+                context.TabInfo.AddTab(tab);
+                tweenMain.AddNewTab(tab, startup: false);
+
+                Assert.Equal(5, tweenMain.ListTab.TabPages.Count);
+
+                var tabPage = tweenMain.ListTab.TabPages[4];
+                Assert.Equal("hoge", tabPage.Text);
+                Assert.Equal(2, tabPage.Controls.Count);
+                Assert.IsType<DetailsListView>(tabPage.Controls[0]);
+
+                var label = Assert.IsType<Label>(tabPage.Controls[1]);
+                Assert.Equal("@opentween/tetete [Protected]", label.Text);
+            });
+        }
+
+        [WinFormsFact]
+        public void AddNewTab_PublicSearchTabTest()
+        {
+            this.UsingTweenMain((tweenMain, context) =>
+            {
+                Assert.Equal(4, tweenMain.ListTab.TabPages.Count);
+
+                var tab = new PublicSearchTabModel("hoge")
+                {
+                    SearchWords = "#OpenTween",
+                    SearchLang = "ja",
+                };
+                context.TabInfo.AddTab(tab);
+                tweenMain.AddNewTab(tab, startup: false);
+
+                Assert.Equal(5, tweenMain.ListTab.TabPages.Count);
+
+                var tabPage = tweenMain.ListTab.TabPages[4];
+                Assert.Equal("hoge", tabPage.Text);
+                Assert.Equal(2, tabPage.Controls.Count);
+                Assert.IsType<DetailsListView>(tabPage.Controls[0]);
+
+                var panel = Assert.IsType<Panel>(tabPage.Controls[1]);
+                Assert.Equal(4, panel.Controls.Count);
+
+                var comboSearchWord = Assert.IsType<ComboBox>(panel.Controls[0]);
+                Assert.Equal("#OpenTween", comboSearchWord.Text);
+
+                var comboSearchLang = Assert.IsType<ComboBox>(panel.Controls[1]);
+                Assert.Equal("ja", comboSearchLang.Text);
+
+                Assert.IsType<Button>(panel.Controls[2]);
+                Assert.IsType<Label>(panel.Controls[3]);
+            });
+        }
+
         [WinFormsFact]
         public void FormatStatusText_NewLineTest()
         {
diff --git a/OpenTween/ListElement.cs b/OpenTween/ListElement.cs
index b7c9d4da8..71bfe42ab 100644
--- a/OpenTween/ListElement.cs
+++ b/OpenTween/ListElement.cs
@@ -107,6 +107,6 @@ public async Task GetMoreMembers()
                 .ConfigureAwait(false);
 
         public override string ToString()
-            => $"@{this.Username}/{this.Name} [{(this.IsPublic ? "public" : "Protected")}]";
+            => $"@{this.Username}/{this.Name} [{(this.IsPublic ? "Public" : "Protected")}]";
     }
 }

From 70a59b2aa06e132f7cacb24ee7544e88e2eb47df Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 11 Jan 2024 16:38:16 +0900
Subject: [PATCH 07/16] =?UTF-8?q?DetailsListView=E3=81=AB=E5=AF=BE?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=83=86=E3=82=B9=E3=83=88=E3=82=B3=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/DetailsListViewTest.cs | 108 ++++++++++++++++++++++++-
 1 file changed, 105 insertions(+), 3 deletions(-)

diff --git a/OpenTween.Tests/DetailsListViewTest.cs b/OpenTween.Tests/DetailsListViewTest.cs
index d890a1499..3250c7dec 100644
--- a/OpenTween.Tests/DetailsListViewTest.cs
+++ b/OpenTween.Tests/DetailsListViewTest.cs
@@ -20,10 +20,7 @@
 // Boston, MA 02110-1301, USA.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using OpenTween.OpenTweenCustomControl;
 using Xunit;
 
@@ -36,5 +33,110 @@ public void Initialize_Test()
         {
             using var listView = new DetailsListView();
         }
+
+        [WinFormsFact]
+        public void SelectionMark_Test()
+        {
+            using var listView = new DetailsListView();
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new();
+            listView.VirtualMode = true;
+            listView.VirtualListSize = 10;
+            listView.CreateControl();
+
+            listView.SelectionMark = 3;
+            Assert.Equal(3, listView.SelectionMark);
+        }
+
+        [WinFormsFact]
+        public void SelectItems_EmptyTest()
+        {
+            using var listView = new DetailsListView();
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new();
+            listView.VirtualMode = true;
+            listView.VirtualListSize = 10;
+            listView.CreateControl();
+
+            listView.SelectedIndices.Add(1);
+            Assert.Single(listView.SelectedIndices);
+
+            listView.SelectItems(Array.Empty<int>());
+            Assert.Empty(listView.SelectedIndices);
+        }
+
+        [WinFormsFact]
+        public void SelectItems_SingleTest()
+        {
+            using var listView = new DetailsListView();
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new();
+            listView.VirtualMode = true;
+            listView.VirtualListSize = 10;
+            listView.CreateControl();
+
+            listView.SelectedIndices.Add(1);
+            Assert.Single(listView.SelectedIndices);
+
+            listView.SelectItems(new[] { 2 });
+            Assert.Equal(new[] { 2 }, listView.SelectedIndices.Cast<int>());
+        }
+
+        [WinFormsFact]
+        public void SelectItems_Multiple_ClearAndSelectTest()
+        {
+            using var listView = new DetailsListView();
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new();
+            listView.VirtualMode = true;
+            listView.VirtualListSize = 10;
+            listView.CreateControl();
+
+            listView.SelectedIndices.Add(2);
+            listView.SelectedIndices.Add(3);
+            Assert.Equal(2, listView.SelectedIndices.Count);
+
+            // Clear して選択し直した方が早いパターン
+            listView.SelectItems(new[] { 5, 6 });
+            Assert.Equal(new[] { 5, 6 }, listView.SelectedIndices.Cast<int>());
+        }
+
+        [WinFormsFact]
+        public void SelectItems_Multiple_DeselectAndSelectTest()
+        {
+            using var listView = new DetailsListView();
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new();
+            listView.VirtualMode = true;
+            listView.VirtualListSize = 10;
+            listView.CreateControl();
+
+            listView.SelectedIndices.Add(1);
+            listView.SelectedIndices.Add(2);
+            listView.SelectedIndices.Add(3);
+            Assert.Equal(3, listView.SelectedIndices.Count);
+
+            // 選択範囲の差分だけ更新した方が早いパターン
+            listView.SelectItems(new[] { 2, 3, 4 });
+            Assert.Equal(new[] { 2, 3, 4 }, listView.SelectedIndices.Cast<int>());
+        }
+
+        [WinFormsFact]
+        public void SelectItems_OutOfRangeTest()
+        {
+            using var listView = new DetailsListView();
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new();
+            listView.VirtualMode = true;
+            listView.VirtualListSize = 10;
+            listView.CreateControl();
+
+            Assert.Throws<ArgumentOutOfRangeException>(
+                () => listView.SelectItems(new[] { -1 })
+            );
+            Assert.Throws<ArgumentOutOfRangeException>(
+                () => listView.SelectItems(new[] { 10 })
+            );
+        }
     }
 }

From 229ce895089210704209c734e3e5a85839beeddd Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 11 Jan 2024 16:19:49 +0900
Subject: [PATCH 08/16] =?UTF-8?q?TimelineListViewState=E3=81=AB=E5=AF=BE?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=83=86=E3=82=B9=E3=83=88=E3=82=B3=E3=83=BC?=
 =?UTF-8?q?=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/TimelineListViewStateTest.cs | 362 ++++++++++++++++++-
 OpenTween/TimelineListViewState.cs           |  18 +-
 2 files changed, 368 insertions(+), 12 deletions(-)

diff --git a/OpenTween.Tests/TimelineListViewStateTest.cs b/OpenTween.Tests/TimelineListViewStateTest.cs
index eb4d8f4cd..a49d74cbe 100644
--- a/OpenTween.Tests/TimelineListViewStateTest.cs
+++ b/OpenTween.Tests/TimelineListViewStateTest.cs
@@ -20,10 +20,8 @@
 // Boston, MA 02110-1301, USA.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Windows.Forms;
 using OpenTween.Models;
 using OpenTween.OpenTweenCustomControl;
 using Xunit;
@@ -39,5 +37,363 @@ public void Initialize_Test()
             var tab = new PublicSearchTabModel("hoge");
             var listViewState = new TimelineListViewState(listView, tab);
         }
+
+        private void UsingListView(int count, Action<DetailsListView, TabModel> func)
+        {
+            using var listView = new DetailsListView();
+            listView.Columns.Add("col");
+            listView.HeaderStyle = ColumnHeaderStyle.None; // 座標計算の邪魔になるため非表示にする
+
+            listView.RetrieveVirtualItem += (s, e) => e.Item = new($"text {e.ItemIndex}");
+            listView.VirtualMode = true;
+            listView.VirtualListSize = count;
+
+            using var imageList = new ImageList { ImageSize = new(1, 19) };
+            listView.SmallImageList = imageList; // Item の高さは 20px
+            listView.ClientSize = new(100, 100); // 高さは 5 行分
+            listView.CreateControl();
+
+            var tab = new PublicSearchTabModel("hoge");
+            tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+
+            var firstDateTime = new DateTimeUtc(2024, 1, 1, 0, 0, 0);
+            foreach (var i in MyCommon.CountUp(0, count - 1))
+            {
+                var post = new PostClass
+                {
+                    StatusId = new TwitterStatusId(i.ToString()),
+                    CreatedAtForSorting = firstDateTime + TimeSpan.FromSeconds(i),
+                };
+                tab.AddPostQueue(post);
+            }
+            tab.AddSubmit();
+
+            func(listView, tab);
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_IdAsc_Test()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.EnsureVisible(0); // 一番上にスクロール
+
+                // 投稿日時の昇順に並んでいる場合、新着投稿によってスクロール位置がズレることがないため None を返す
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.None,
+                    listViewState.GetScrollLockMode(lockScroll: false)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_IdAsc_BottomTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.EnsureVisible(9); // 一番下までスクロール
+
+                // 最終行が表示されている場合はスクロール位置を一番下に固定する（新着投稿を表示し続ける）
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.FixedToBottom,
+                    listViewState.GetScrollLockMode(lockScroll: false)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_IdAsc_BottomLockScrollTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.EnsureVisible(9); // 一番下までスクロール
+
+                // 最終行が表示されていても lockScroll が true の場合は None を返す（新着投稿にスクロールしない）
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.None,
+                    listViewState.GetScrollLockMode(lockScroll: true)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_IdDesc_TopTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Descending);
+                listView.EnsureVisible(0); // 一番上にスクロール
+
+                // 投稿日時の降順に並んでいて 1 行目が表示されている場合はスクロール位置を一番上に固定する（新着投稿を表示し続ける）
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.FixedToTop,
+                    listViewState.GetScrollLockMode(lockScroll: false)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_IdDesc_TopLockScrollTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Descending);
+                listView.EnsureVisible(0); // 一番上にスクロール
+
+                // 先頭行が表示されていても lockScroll が true の場合は FixedToItem を返す（新着投稿にスクロールしない）
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.FixedToItem,
+                    listViewState.GetScrollLockMode(lockScroll: true)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_IdDesc_BottomTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Descending);
+                listView.EnsureVisible(9); // 一番下にスクロール
+
+                // 先頭行が表示されていない場合は FixedToItem を返す
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.FixedToItem,
+                    listViewState.GetScrollLockMode(lockScroll: false)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetScrollLockMode_TextAsc_Test()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Data, SortOrder.Ascending);
+                listView.EnsureVisible(0); // 一番上にスクロール
+
+                // ComparerMode.Id 以外の場合は常に FixedToItem を返す
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.FixedToItem,
+                    listViewState.GetScrollLockMode(lockScroll: false)
+                );
+            });
+        }
+
+        [WinFormsFact]
+        public void GetListViewScroll_Test()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Descending); // 投稿日時の降順
+                listView.TopItem = listView.Items[2]; // 3 行目が一番上になる位置にスクロールされた状態
+
+                var scrollState = listViewState.GetListViewScroll(lockScroll: false);
+                Assert.Equal(
+                    TimelineListViewState.ScrollLockMode.FixedToItem,
+                    scrollState.ScrollLockMode
+                );
+                Assert.Equal(new TwitterStatusId("7"), scrollState.TopItemStatusId); // 3 行目の StatusId は "7"
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewScroll_FixedToTopTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.TopItem = listView.Items[2]; // 3 行目が一番上になる位置にスクロールされた状態
+
+                var scrollState = new TimelineListViewState.ListViewScroll(
+                    ScrollLockMode: TimelineListViewState.ScrollLockMode.FixedToTop,
+                    TopItemStatusId: null
+                );
+                listViewState.RestoreListViewScroll(scrollState, forceScroll: false);
+
+                // 一番上にスクロールされた状態になる
+                Assert.Equal(0, listView.TopItem.Index);
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewScroll_FixedToBottomTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.TopItem = listView.Items[2]; // 3 行目が一番上になる位置にスクロールされた状態
+
+                var scrollState = new TimelineListViewState.ListViewScroll(
+                    ScrollLockMode: TimelineListViewState.ScrollLockMode.FixedToBottom,
+                    TopItemStatusId: null
+                );
+                listViewState.RestoreListViewScroll(scrollState, forceScroll: false);
+
+                // 一番下にスクロールされた状態になる（一番下に余白が生じるため null になる）
+                Assert.Null(listView.GetItemAt(0, 82)?.Index);
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewScroll_FixedToItemTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.TopItem = listView.Items[2]; // 3 行目が一番上になる位置にスクロールされた状態
+
+                var scrollState = new TimelineListViewState.ListViewScroll(
+                    ScrollLockMode: TimelineListViewState.ScrollLockMode.FixedToItem,
+                    TopItemStatusId: new TwitterStatusId("5")
+                );
+                listViewState.RestoreListViewScroll(scrollState, forceScroll: false);
+
+                // 6 行目が一番上になる位置にスクロールされた状態になる
+                Assert.Equal(5, listView.TopItem.Index);
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewScroll_NoneTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.TopItem = listView.Items[2]; // 3 行目が一番上になる位置にスクロールされた状態
+
+                var scrollState = new TimelineListViewState.ListViewScroll(
+                    ScrollLockMode: TimelineListViewState.ScrollLockMode.None,
+                    TopItemStatusId: new TwitterStatusId("5")
+                );
+                listViewState.RestoreListViewScroll(scrollState, forceScroll: false);
+
+                // ScrollLockMode.None の場合は何もしない
+                Assert.Equal(2, listView.TopItem.Index);
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewScroll_ForceScrollTest()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+                listView.TopItem = listView.Items[2]; // 3 行目が一番上になる位置にスクロールされた状態
+
+                var scrollState = new TimelineListViewState.ListViewScroll(
+                    ScrollLockMode: TimelineListViewState.ScrollLockMode.None,
+                    TopItemStatusId: new TwitterStatusId("5")
+                );
+                listViewState.RestoreListViewScroll(scrollState, forceScroll: true);
+
+                // ScrollLockMode.None でも forceScroll が true の場合は FixedToItem 相当の動作になる
+                Assert.Equal(5, listView.TopItem.Index);
+            });
+        }
+
+        [WinFormsFact]
+        public void GetListViewSelection_EmptyTest()
+        {
+            this.UsingListView(count: 0, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                var selectionState = listViewState.GetListViewSelection();
+                Assert.Empty(selectionState.SelectedStatusIds);
+                Assert.Null(selectionState.SelectionMarkStatusId);
+                Assert.Null(selectionState.FocusedStatusId);
+            });
+        }
+
+        [WinFormsFact]
+        public void GetListViewSelection_Test()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                listView.SelectedIndices.Add(0);
+                listView.SelectedIndices.Add(2);
+                listView.SelectedIndices.Add(3);
+                tab.SelectPosts(new[] { 0, 2, 3 });
+                listView.SelectionMark = 1;
+                listView.FocusedItem = listView.Items[3];
+
+                var selectionState = listViewState.GetListViewSelection();
+                Assert.Equal(new TwitterStatusId[] { new("0"), new("2"), new("3") }, selectionState.SelectedStatusIds);
+                Assert.Equal(new TwitterStatusId("1"), selectionState.SelectionMarkStatusId);
+                Assert.Equal(new TwitterStatusId("3"), selectionState.FocusedStatusId);
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewSelection_Test()
+        {
+            this.UsingListView(count: 10, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                var selectionState = new TimelineListViewState.ListViewSelection(
+                    SelectedStatusIds: new TwitterStatusId[] { new("1"), new("2"), new("3") },
+                    SelectionMarkStatusId: new TwitterStatusId("1"),
+                    FocusedStatusId: new TwitterStatusId("3")
+                );
+                listViewState.RestoreListViewSelection(selectionState);
+
+                Assert.Equal(new[] { 1, 2, 3 }, listView.SelectedIndices.Cast<int>());
+                Assert.Equal(1, listView.SelectionMark);
+                Assert.Equal(3, listView.FocusedItem?.Index);
+            });
+        }
+
+        [WinFormsFact]
+        public void RestoreListViewSelection_EmptyTest()
+        {
+            this.UsingListView(count: 0, (listView, tab) =>
+            {
+                var listViewState = new TimelineListViewState(listView, tab);
+
+                var selectionState = new TimelineListViewState.ListViewSelection(
+                    SelectedStatusIds: Array.Empty<PostId>(),
+                    SelectionMarkStatusId: null,
+                    FocusedStatusId: null
+                );
+                listViewState.RestoreListViewSelection(selectionState);
+
+                Assert.Empty(listView.SelectedIndices);
+                Assert.Equal(-1, listView.SelectionMark);
+                Assert.Null(listView.FocusedItem?.Index);
+            });
+        }
     }
 }
diff --git a/OpenTween/TimelineListViewState.cs b/OpenTween/TimelineListViewState.cs
index 9878d5b66..5625414f8 100644
--- a/OpenTween/TimelineListViewState.cs
+++ b/OpenTween/TimelineListViewState.cs
@@ -78,8 +78,8 @@ public TimelineListViewState(DetailsListView listView, TabModel tab)
 
         public void Save(bool lockScroll)
         {
-            this.savedScrollState = this.SaveListViewScroll(lockScroll);
-            this.savedSelectionState = this.SaveListViewSelection();
+            this.savedScrollState = this.GetListViewScroll(lockScroll);
+            this.savedSelectionState = this.GetListViewSelection();
         }
 
         public void Restore(bool forceScroll = false)
@@ -97,7 +97,7 @@ public void RestoreSelection()
         /// <summary>
         /// <see cref="ListView"/> のスクロール位置に関する情報を <see cref="ListViewScroll"/> として返します
         /// </summary>
-        private ListViewScroll SaveListViewScroll(bool lockScroll)
+        internal ListViewScroll GetListViewScroll(bool lockScroll)
         {
             var lockMode = this.GetScrollLockMode(lockScroll);
             PostId? topItemStatusId = null;
@@ -117,7 +117,7 @@ private ListViewScroll SaveListViewScroll(bool lockScroll)
             };
         }
 
-        private ScrollLockMode GetScrollLockMode(bool lockScroll)
+        internal ScrollLockMode GetScrollLockMode(bool lockScroll)
         {
             if (this.tab.SortMode == ComparerMode.Id)
             {
@@ -159,7 +159,7 @@ private ScrollLockMode GetScrollLockMode(bool lockScroll)
         /// <summary>
         /// <see cref="ListView"/> の選択状態を <see cref="ListViewSelection"/> として返します
         /// </summary>
-        private ListViewSelection SaveListViewSelection()
+        internal ListViewSelection GetListViewSelection()
         {
             if (this.listView.VirtualListSize == 0)
             {
@@ -194,9 +194,9 @@ private ListViewSelection SaveListViewSelection()
         }
 
         /// <summary>
-        /// <see cref="SaveListViewScroll"/> によって保存されたスクロール位置を復元します
+        /// <see cref="GetListViewScroll"/> によって保存されたスクロール位置を復元します
         /// </summary>
-        private void RestoreListViewScroll(ListViewScroll listScroll, bool forceScroll)
+        internal void RestoreListViewScroll(ListViewScroll listScroll, bool forceScroll)
         {
             if (this.listView.VirtualListSize == 0)
                 return;
@@ -236,9 +236,9 @@ private void RestoreListViewScroll(ListViewScroll listScroll, bool forceScroll)
         }
 
         /// <summary>
-        /// <see cref="SaveListViewSelection"/> によって保存された選択状態を復元します
+        /// <see cref="GetListViewSelection"/> によって保存された選択状態を復元します
         /// </summary>
-        private void RestoreListViewSelection(ListViewSelection listSelection)
+        internal void RestoreListViewSelection(ListViewSelection listSelection)
         {
             var invalidateBounds = (Rectangle?)null;
 

From f5c2a59e6dfdc44f9e728ca37e499f856b3f0b3e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 11 Jan 2024 07:20:29 +0900
Subject: [PATCH 09/16] =?UTF-8?q?TweenMain.RefreshTimeline=E3=83=A1?=
 =?UTF-8?q?=E3=82=BD=E3=83=83=E3=83=89=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/Models/TabModelTest.cs        | 82 +++++++++++++++++++
 .../Models/TwitterPostFactoryTest.cs          | 21 +++++
 OpenTween.Tests/TweenMainTest.cs              | 36 ++++++++
 OpenTween/Tween.cs                            |  2 +-
 4 files changed, 140 insertions(+), 1 deletion(-)

diff --git a/OpenTween.Tests/Models/TabModelTest.cs b/OpenTween.Tests/Models/TabModelTest.cs
index f256d15aa..df6cd6263 100644
--- a/OpenTween.Tests/Models/TabModelTest.cs
+++ b/OpenTween.Tests/Models/TabModelTest.cs
@@ -673,6 +673,88 @@ public void OnFilterModified_DetachedTest()
             Assert.False(tab.FilterModified);
         }
 
+        [Fact]
+        public void IndexOf_SingleFoundTest()
+        {
+            var tab = new PublicSearchTabModel("search");
+
+            tab.AddPostQueue(new()
+            {
+                StatusId = new TwitterStatusId("100"),
+                CreatedAtForSorting = new(2023, 1, 1, 0, 0, 0),
+                TextFromApi = "aaa",
+            });
+            tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+            tab.AddSubmit();
+
+            Assert.Equal(0, tab.IndexOf(new TwitterStatusId("100")));
+        }
+
+        [Fact]
+        public void IndexOf_SingleNotFoundTest()
+        {
+            var tab = new PublicSearchTabModel("search");
+
+            tab.AddPostQueue(new()
+            {
+                StatusId = new TwitterStatusId("100"),
+                CreatedAtForSorting = new(2023, 1, 1, 0, 0, 0),
+                TextFromApi = "aaa",
+            });
+            tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+            tab.AddSubmit();
+
+            Assert.Equal(-1, tab.IndexOf(new TwitterStatusId("200")));
+        }
+
+        [Fact]
+        public void IndexOf_MultipleFoundTest()
+        {
+            var tab = new PublicSearchTabModel("search");
+
+            tab.AddPostQueue(new()
+            {
+                StatusId = new TwitterStatusId("100"),
+                CreatedAtForSorting = new(2023, 1, 1, 0, 0, 0),
+                TextFromApi = "aaa",
+            });
+            tab.AddPostQueue(new()
+            {
+                StatusId = new TwitterStatusId("200"),
+                CreatedAtForSorting = new(2023, 1, 1, 0, 0, 1),
+                TextFromApi = "bbb",
+            });
+            tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+            tab.AddSubmit();
+
+            var actual = tab.IndexOf(new[] { new TwitterStatusId("200"), new TwitterStatusId("100") });
+            Assert.Equal(new[] { 1, 0 }, actual);
+        }
+
+        [Fact]
+        public void IndexOf_MultiplePartiallyFoundTest()
+        {
+            var tab = new PublicSearchTabModel("search");
+
+            tab.AddPostQueue(new()
+            {
+                StatusId = new TwitterStatusId("100"),
+                CreatedAtForSorting = new(2023, 1, 1, 0, 0, 0),
+                TextFromApi = "aaa",
+            });
+            tab.AddPostQueue(new()
+            {
+                StatusId = new TwitterStatusId("200"),
+                CreatedAtForSorting = new(2023, 1, 1, 0, 0, 1),
+                TextFromApi = "bbb",
+            });
+            tab.SetSortMode(ComparerMode.Id, SortOrder.Ascending);
+            tab.AddSubmit();
+
+            var actual = tab.IndexOf(new[] { new TwitterStatusId("100"), new TwitterStatusId("999") });
+            Assert.Equal(new[] { 0, -1 }, actual);
+        }
+
         [Fact]
         public void SearchPostsAll_Test()
         {
diff --git a/OpenTween.Tests/Models/TwitterPostFactoryTest.cs b/OpenTween.Tests/Models/TwitterPostFactoryTest.cs
index 88718fd24..6a31f012b 100644
--- a/OpenTween.Tests/Models/TwitterPostFactoryTest.cs
+++ b/OpenTween.Tests/Models/TwitterPostFactoryTest.cs
@@ -286,6 +286,27 @@ public void CreateFromDirectMessageEvent_SenderTest()
             Assert.True(post.IsMe);
         }
 
+        [Fact]
+        public void GetReceivedHashtags_Test()
+        {
+            var factory = new TwitterPostFactory(this.CreateTabinfo());
+            var status = this.CreateStatus();
+            status.FullText = "hoge #OpenTween";
+            status.Entities.Hashtags = new[]
+            {
+                new TwitterEntityHashtag
+                {
+                    Indices = new[] { 5, 15 },
+                    Text = "OpenTween",
+                },
+            };
+
+            _ = factory.CreateFromStatus(status, selfUserId: 20000L, followerIds: EmptyIdSet);
+
+            Assert.Equal(new[] { "#OpenTween" }, factory.GetReceivedHashtags());
+            Assert.Empty(factory.GetReceivedHashtags());
+        }
+
         [Fact]
         public void CreateFromStatus_MediaAltTest()
         {
diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index 2b6da7991..178237d62 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -23,6 +23,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
@@ -55,6 +56,11 @@ private void UsingTweenMain(Action<TweenMain, TestContext> func)
             using var iconAssets = new IconAssetsManager();
             var thumbnailGenerator = new ThumbnailGenerator(new(autoupdate: false));
 
+            // TabInformation.GetInstance() で取得できるようにする
+            var field = typeof(TabInformations).GetField("Instance",
+                BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.SetField);
+            field.SetValue(null, tabinfo);
+
             using var tweenMain = new TweenMain(settings, tabinfo, twitter, imageCache, iconAssets, thumbnailGenerator);
             var context = new TestContext(settings, tabinfo);
 
@@ -174,6 +180,36 @@ public void AddNewTab_PublicSearchTabTest()
             });
         }
 
+        [WinFormsFact]
+        public void RefreshTimeline_Test()
+        {
+            this.UsingTweenMain((tweenMain, context) =>
+            {
+                var tabPage = tweenMain.ListTab.TabPages[0];
+                Assert.Equal("Recent", tabPage.Text);
+
+                var listView = (DetailsListView)tabPage.Controls[0];
+                Assert.Equal(0, listView.VirtualListSize);
+
+                var post = new PostClass
+                {
+                    StatusId = new TwitterStatusId("100"),
+                    Text = "hoge",
+                    UserId = 111L,
+                    ScreenName = "opentween",
+                    CreatedAt = new(2024, 1, 1, 0, 0, 0),
+                };
+                context.TabInfo.AddPost(post);
+                context.TabInfo.DistributePosts();
+                tweenMain.RefreshTimeline();
+
+                Assert.Equal(1, listView.VirtualListSize);
+
+                var listItem = listView.Items[0];
+                Assert.Equal("opentween", listItem.SubItems[4].Text);
+            });
+        }
+
         [WinFormsFact]
         public void FormatStatusText_NewLineTest()
         {
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index f2d9080c7..90832f7cc 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -811,7 +811,7 @@ internal void MarkSettingAtIdModified()
             _ = this.saveConfigDebouncer.Call();
         }
 
-        private void RefreshTimeline()
+        internal void RefreshTimeline()
         {
             var curListView = this.CurrentListView;
 

From 5434b0fab7186624c9c8b44ec68c7895e178ebe8 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 11 Jan 2024 22:56:42 +0900
Subject: [PATCH 10/16] =?UTF-8?q?TweenMain.RemoveSpecifiedTab=E3=81=AB?=
 =?UTF-8?q?=E5=AF=BE=E3=81=99=E3=82=8B=E3=83=86=E3=82=B9=E3=83=88=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/TweenMainTest.cs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index 178237d62..10dc33d41 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -180,6 +180,37 @@ public void AddNewTab_PublicSearchTabTest()
             });
         }
 
+        [WinFormsFact]
+        public void RemoveSpecifiedTab_Test()
+        {
+            this.UsingTweenMain((tweenMain, context) =>
+            {
+                Assert.Equal(4, tweenMain.ListTab.TabPages.Count);
+
+                var tab = new PublicSearchTabModel("hoge")
+                {
+                    SearchWords = "#OpenTween",
+                    SearchLang = "ja",
+                };
+                context.TabInfo.AddTab(tab);
+                tweenMain.AddNewTab(tab, startup: false);
+                Assert.Equal(5, tweenMain.ListTab.TabPages.Count);
+
+                var tabPage = tweenMain.ListTab.TabPages[4];
+                var listView = (DetailsListView)tabPage.Controls[0];
+                var searchPanel = (Panel)tabPage.Controls[1];
+                Assert.Equal("hoge", tabPage.Text);
+
+                tweenMain.RemoveSpecifiedTab("hoge", confirm: false);
+
+                Assert.Equal(4, tweenMain.ListTab.TabPages.Count);
+                Assert.False(context.TabInfo.ContainsTab("hoge"));
+                Assert.True(tabPage.IsDisposed);
+                Assert.True(listView.IsDisposed);
+                Assert.True(searchPanel.IsDisposed);
+            });
+        }
+
         [WinFormsFact]
         public void RefreshTimeline_Test()
         {

From 5e059591be2b498ec3d96934fd841e6be012b3d5 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 12 Jan 2024 01:36:50 +0900
Subject: [PATCH 11/16] =?UTF-8?q?GitHub=20Actions=E3=81=A7=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E3=81=99=E3=82=8Baction=E3=82=92=E3=82=A2=E3=83=83?=
 =?UTF-8?q?=E3=83=97=E3=83=87=E3=83=BC=E3=83=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml   | 6 +++---
 .github/workflows/package.yml | 8 ++++----
 .github/workflows/test.yml    | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 331746e00..5b0cc0c5c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,12 +14,12 @@ jobs:
     runs-on: windows-2022
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1
 
       - name: Set configuration env
         shell: pwsh
@@ -43,7 +43,7 @@ jobs:
           msbuild /target:restore,build "/p:Configuration=$($env:CONFIGURATION)" /verbosity:minimal ${{ inputs.msbuild_args }}
 
       - name: Upload build result
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build
           path: |
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index aeda25940..f55909257 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -20,12 +20,12 @@ jobs:
     needs: [build]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: '${{ github.event.pull_request.head.sha }}'
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1
 
       - name: Set configuration env
         shell: pwsh
@@ -37,7 +37,7 @@ jobs:
           }
 
       - name: Restore build result
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build
 
@@ -50,7 +50,7 @@ jobs:
           .\tools\build-zip-archive.ps1 -BinDir $binDir -DestPath $destPath
 
       - name: Upload build result
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: package
           path: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index dcfad8c23..a7d1d159a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,12 +17,12 @@ jobs:
     needs: [build]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Add msbuild to PATH
-        uses: microsoft/setup-msbuild@v1.1
+        uses: microsoft/setup-msbuild@v1
 
       - name: Set configuration env
         shell: pwsh
@@ -41,7 +41,7 @@ jobs:
             nuget-
 
       - name: Restore build result
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: build
 
@@ -96,7 +96,7 @@ jobs:
             exit $p.ExitCode
           }
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4.0.0-beta.3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

From 49bc798ede699728482340de0262e4ebfc9246f1 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 17 Jan 2024 01:31:00 +0900
Subject: [PATCH 12/16] =?UTF-8?q?AccountCollection=E3=82=AF=E3=83=A9?=
 =?UTF-8?q?=E3=82=B9=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SocialProtocol/AccountCollectionTest.cs   | 142 ++++++++++++++++++
 OpenTween.Tests/TweenMainTest.cs              |   8 +-
 OpenTween/ApplicationContainer.cs             |  25 +--
 OpenTween/ApplicationEvents.cs                |  16 +-
 OpenTween/SocialProtocol/AccountCollection.cs |  91 +++++++++++
 OpenTween/Tween.cs                            |  26 ++--
 6 files changed, 259 insertions(+), 49 deletions(-)
 create mode 100644 OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
 create mode 100644 OpenTween/SocialProtocol/AccountCollection.cs

diff --git a/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs b/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
new file mode 100644
index 000000000..a0b95284c
--- /dev/null
+++ b/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
@@ -0,0 +1,142 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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 Xunit;
+
+namespace OpenTween.SocialProtocol
+{
+    public class AccountCollectionTest
+    {
+        private readonly Random random = new();
+
+        private UserAccount CreateAccountSetting(string key)
+        {
+            return new()
+            {
+                UniqueKey = new(key),
+                TwitterAuthType = APIAuthType.OAuth1,
+                Token = "aaaaa",
+                TokenSecret = "bbbbb",
+                UserId = this.random.Next(),
+                Username = "tetete",
+            };
+        }
+
+        [Fact]
+        public void LoadFromSettings_Test()
+        {
+            using var accounts = new AccountCollection();
+
+            var settingCommon = new SettingCommon
+            {
+                UserAccounts = new()
+                {
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            };
+            accounts.LoadFromSettings(settingCommon);
+
+            Assert.Single(accounts.Items);
+            Assert.Equal(settingCommon.UserAccounts[0].UserId, accounts.Primary.UserId);
+        }
+
+        [Fact]
+        public void LoadFromSettings_RemoveTest()
+        {
+            using var accounts = new AccountCollection();
+
+            var settingCommon1 = new SettingCommon
+            {
+                UserAccounts = new()
+                {
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            };
+            accounts.LoadFromSettings(settingCommon1);
+
+            var accountItem1 = Assert.Single(accounts.Items);
+            Assert.Equal(settingCommon1.UserAccounts[0].UserId, accounts.Primary.UserId);
+
+            var settingCommon2 = new SettingCommon
+            {
+                UserAccounts = new()
+                {
+                    // 00000000-0000-4000-8000-000000000000 は削除
+                },
+                SelectedAccountKey = null,
+            };
+            accounts.LoadFromSettings(settingCommon2);
+
+            // 欠けている ID は削除される
+            Assert.Empty(accounts.Items);
+            Assert.Equal(APIAuthType.None, accounts.Primary.Api.AuthType);
+            Assert.True(accountItem1.IsDisposed);
+        }
+
+        [Fact]
+        public void LoadFromSettings_ReconfigureTest()
+        {
+            using var accounts = new AccountCollection();
+
+            var settingCommon1 = new SettingCommon
+            {
+                UserAccounts = new()
+                {
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            };
+            accounts.LoadFromSettings(settingCommon1);
+
+            var accountItem1 = Assert.Single(accounts.Items);
+            Assert.Equal(settingCommon1.UserAccounts[0].UserId, accounts.Primary.UserId);
+
+            var settingCommon2 = new SettingCommon
+            {
+                UserAccounts = new()
+                {
+                    // 同一の ID だが再認証により UserId が変わっている
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            };
+            accounts.LoadFromSettings(settingCommon2);
+
+            var accountItem2 = Assert.Single(accounts.Items);
+            Assert.Equal(settingCommon2.UserAccounts[0].UserId, accounts.Primary.UserId);
+
+            // 同一の ID は同じインスタンスを使用
+            Assert.Same(accountItem1, accountItem2);
+            Assert.NotEqual(
+                settingCommon1.UserAccounts[0].UserId,
+                accountItem2.UserId
+            );
+            Assert.Equal(
+                settingCommon2.UserAccounts[0].UserId,
+                accountItem2.UserId
+            );
+            Assert.False(accountItem2.IsDisposed);
+        }
+    }
+}
diff --git a/OpenTween.Tests/TweenMainTest.cs b/OpenTween.Tests/TweenMainTest.cs
index 10dc33d41..573670771 100644
--- a/OpenTween.Tests/TweenMainTest.cs
+++ b/OpenTween.Tests/TweenMainTest.cs
@@ -27,12 +27,11 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using OpenTween.Api;
 using OpenTween.Api.DataModel;
-using OpenTween.Connection;
 using OpenTween.Models;
 using OpenTween.OpenTweenCustomControl;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
 using OpenTween.Thumbnail;
 using Xunit;
 using Xunit.Extensions;
@@ -50,8 +49,7 @@ private void UsingTweenMain(Action<TweenMain, TestContext> func)
         {
             var settings = new SettingManager("");
             var tabinfo = new TabInformations();
-            using var twitterApi = new TwitterApi();
-            using var twitter = new Twitter(twitterApi);
+            using var accounts = new AccountCollection();
             using var imageCache = new ImageCache();
             using var iconAssets = new IconAssetsManager();
             var thumbnailGenerator = new ThumbnailGenerator(new(autoupdate: false));
@@ -61,7 +59,7 @@ private void UsingTweenMain(Action<TweenMain, TestContext> func)
                 BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.SetField);
             field.SetValue(null, tabinfo);
 
-            using var tweenMain = new TweenMain(settings, tabinfo, twitter, imageCache, iconAssets, thumbnailGenerator);
+            using var tweenMain = new TweenMain(settings, tabinfo, accounts, imageCache, iconAssets, thumbnailGenerator);
             var context = new TestContext(settings, tabinfo);
 
             func(tweenMain, context);
diff --git a/OpenTween/ApplicationContainer.cs b/OpenTween/ApplicationContainer.cs
index 3a32e95c2..76291616c 100644
--- a/OpenTween/ApplicationContainer.cs
+++ b/OpenTween/ApplicationContainer.cs
@@ -22,9 +22,9 @@
 #nullable enable
 
 using System;
-using OpenTween.Api;
 using OpenTween.Models;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
 using OpenTween.Thumbnail;
 using OpenTween.Thumbnail.Services;
 
@@ -41,11 +41,8 @@ public sealed class ApplicationContainer : IDisposable
         public CultureService CultureService
             => this.cultureServiceLazy.Value;
 
-        public TwitterApi TwitterApi
-            => this.twitterApiLazy.Value;
-
-        public Twitter Twitter
-            => this.twitterLazy.Value;
+        public AccountCollection AccountCollection
+            => this.accountCollectionLazy.Value;
 
         public ImageCache ImageCache
             => this.imageCacheLazy.Value;
@@ -63,8 +60,7 @@ public TweenMain MainForm
             => this.mainFormLazy.Value;
 
         private readonly Lazy<CultureService> cultureServiceLazy;
-        private readonly DisposableLazy<TwitterApi> twitterApiLazy;
-        private readonly DisposableLazy<Twitter> twitterLazy;
+        private readonly DisposableLazy<AccountCollection> accountCollectionLazy;
         private readonly DisposableLazy<ImageCache> imageCacheLazy;
         private readonly DisposableLazy<IconAssetsManager> iconAssetsManagerLazy;
         private readonly DisposableLazy<ImgAzyobuziNet> imgAzyobuziNetLazy;
@@ -77,8 +73,7 @@ public ApplicationContainer(SettingManager settings)
             SettingManager.Instance = settings;
 
             this.cultureServiceLazy = new(this.CreateCultureService);
-            this.twitterApiLazy = new(this.CreateTwitterApi);
-            this.twitterLazy = new(this.CreateTwitter);
+            this.accountCollectionLazy = new(this.CreateAccountCollection);
             this.imageCacheLazy = new(this.CreateImageCache);
             this.iconAssetsManagerLazy = new(this.CreateIconAssetsManager);
             this.imgAzyobuziNetLazy = new(this.CreateImgAzyobuziNet);
@@ -89,12 +84,9 @@ public ApplicationContainer(SettingManager settings)
         private CultureService CreateCultureService()
             => new(this.Settings.Common);
 
-        private TwitterApi CreateTwitterApi()
+        private AccountCollection CreateAccountCollection()
             => new();
 
-        private Twitter CreateTwitter()
-            => new(this.TwitterApi);
-
         private ImageCache CreateImageCache()
             => new();
 
@@ -108,7 +100,7 @@ private ThumbnailGenerator CreateThumbnailGenerator()
             => new(this.ImgAzyobuziNet);
 
         private TweenMain CreateTweenMain()
-            => new(this.Settings, this.TabInfo, this.Twitter, this.ImageCache, this.IconAssetsManager, this.ThumbnailGenerator);
+            => new(this.Settings, this.TabInfo, this.AccountCollection, this.ImageCache, this.IconAssetsManager, this.ThumbnailGenerator);
 
         public void Dispose()
         {
@@ -118,8 +110,7 @@ public void Dispose()
             this.IsDisposed = true;
             this.mainFormLazy.Dispose();
             this.imgAzyobuziNetLazy.Dispose();
-            this.twitterLazy.Dispose();
-            this.twitterApiLazy.Dispose();
+            this.accountCollectionLazy.Dispose();
             this.iconAssetsManagerLazy.Dispose();
             this.imageCacheLazy.Dispose();
         }
diff --git a/OpenTween/ApplicationEvents.cs b/OpenTween/ApplicationEvents.cs
index 04d5a6946..57789b930 100644
--- a/OpenTween/ApplicationEvents.cs
+++ b/OpenTween/ApplicationEvents.cs
@@ -31,6 +31,7 @@
 using System.Windows.Forms;
 using OpenTween.Connection;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
 
 namespace OpenTween
 {
@@ -94,7 +95,7 @@ public static int Main(string[] args)
                     return 1; // 設定が完了しなかったため終了
             }
 
-            SetupTwitter(container.Twitter, settings);
+            SetupAccounts(container.AccountCollection, settings);
 
             Application.Run(container.MainForm);
 
@@ -139,22 +140,15 @@ private static bool ShowSettingsDialog(SettingManager settings, IconAssetsManage
             return true;
         }
 
-        private static void SetupTwitter(Twitter tw, SettingManager settings)
+        private static void SetupAccounts(AccountCollection accounts, SettingManager settings)
         {
-            var account = settings.Common.SelectedAccount;
-            if (account != null)
-                tw.Initialize(account.GetTwitterCredential(), account.Username, account.UserId);
-            else
-                tw.Initialize(new TwitterCredentialNone(), "", 0L);
-
-            tw.RestrictFavCheck = settings.Common.RestrictFavCheck;
-            tw.ReadOwnPost = settings.Common.ReadOwnPost;
+            accounts.LoadFromSettings(settings.Common);
 
             // アクセストークンが有効であるか確認する
             // ここが Twitter API への最初のアクセスになるようにすること
             try
             {
-                tw.VerifyCredentials();
+                accounts.Primary.VerifyCredentials();
             }
             catch (WebApiException ex)
             {
diff --git a/OpenTween/SocialProtocol/AccountCollection.cs b/OpenTween/SocialProtocol/AccountCollection.cs
new file mode 100644
index 000000000..03b15ad04
--- /dev/null
+++ b/OpenTween/SocialProtocol/AccountCollection.cs
@@ -0,0 +1,91 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenTween.SocialProtocol
+{
+    public sealed class AccountCollection : IDisposable
+    {
+        private Dictionary<Guid, Twitter> accounts = new();
+        private Guid? primaryId;
+        private readonly Twitter emptyAccount = new(new());
+
+        public bool IsDisposed { get; private set; }
+
+        public Twitter Primary
+            => this.primaryId != null ? this.accounts[this.primaryId.Value] : this.emptyAccount;
+
+        public Twitter[] Items
+            => this.accounts.Values.ToArray();
+
+        public void LoadFromSettings(SettingCommon settingCommon)
+        {
+            var oldAccounts = this.accounts;
+            var newAccounts = new Dictionary<Guid, Twitter>();
+
+            foreach (var accountSettings in settingCommon.UserAccounts)
+            {
+                var accountKey = accountSettings.UniqueKey;
+                if (!oldAccounts.TryGetValue(accountKey, out var account))
+                    account = new(new());
+
+                var credential = accountSettings.GetTwitterCredential();
+                account.Initialize(credential, accountSettings.Username, accountSettings.UserId);
+
+                account.RestrictFavCheck = settingCommon.RestrictFavCheck;
+                account.ReadOwnPost = settingCommon.ReadOwnPost;
+
+                newAccounts[accountKey] = account;
+            }
+
+            this.accounts = newAccounts;
+            this.primaryId = settingCommon.SelectedAccountKey;
+
+            var removedAccounts = oldAccounts
+                .Where(x => !newAccounts.ContainsKey(x.Key))
+                .Select(x => x.Value);
+
+            this.DisposeAccounts(removedAccounts);
+        }
+
+        public void Dispose()
+        {
+            if (this.IsDisposed)
+                return;
+
+            this.emptyAccount.Dispose();
+            this.DisposeAccounts(this.accounts.Values);
+
+            this.IsDisposed = true;
+        }
+
+        private void DisposeAccounts(IEnumerable<Twitter> accounts)
+        {
+            foreach (var account in accounts)
+                account.Dispose();
+        }
+    }
+}
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 90832f7cc..f5dfca7f6 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -59,6 +59,7 @@
 using OpenTween.Models;
 using OpenTween.OpenTweenCustomControl;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
 using OpenTween.Thumbnail;
 
 namespace OpenTween
@@ -108,8 +109,12 @@ public partial class TweenMain : OTBaseForm
         // 設定ファイル
         private readonly SettingManager settings;
 
-        // twitter解析部
-        private readonly Twitter tw;
+        // ユーザーアカウント
+        private readonly AccountCollection accounts;
+
+#pragma warning disable SA1300
+        private Twitter tw => this.accounts.Primary; // AccountCollection への移行用
+#pragma warning restore SA1300
 
         // Growl呼び出し部
         private readonly GrowlHelper gh = new(ApplicationSettings.ApplicationName);
@@ -241,7 +246,7 @@ internal enum SEARCHTYPE
         public TweenMain(
             SettingManager settingManager,
             TabInformations tabInfo,
-            Twitter twitter,
+            AccountCollection accounts,
             ImageCache imageCache,
             IconAssetsManager iconAssets,
             ThumbnailGenerator thumbGenerator
@@ -249,7 +254,7 @@ ThumbnailGenerator thumbGenerator
         {
             this.settings = settingManager;
             this.statuses = tabInfo;
-            this.tw = twitter;
+            this.accounts = accounts;
             this.iconCache = imageCache;
             this.iconAssets = iconAssets;
             this.thumbGenerator = thumbGenerator;
@@ -2492,18 +2497,7 @@ private async void SettingStripMenuItem_Click(object sender, EventArgs e)
                 {
                     this.settings.ApplySettings();
 
-                    if (MyCommon.IsNullOrEmpty(this.settings.Common.Token))
-                        this.tw.ClearAuthInfo();
-
-                    var account = this.settings.Common.SelectedAccount;
-                    if (account != null)
-                        this.tw.Initialize(account.GetTwitterCredential(), account.Username, account.UserId);
-                    else
-                        this.tw.Initialize(new TwitterCredentialNone(), "", 0L);
-
-                    this.tw.RestrictFavCheck = this.settings.Common.RestrictFavCheck;
-                    this.tw.ReadOwnPost = this.settings.Common.ReadOwnPost;
-
+                    this.accounts.LoadFromSettings(this.settings.Common);
                     this.ImageSelector.Model.InitializeServices(this.tw, this.tw.Configuration);
 
                     try

From ae6d984e8cf02b15ea7581ab500a85a6e84bc328 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 17 Jan 2024 02:24:29 +0900
Subject: [PATCH 13/16] =?UTF-8?q?ISocialAccount=E3=82=A4=E3=83=B3=E3=82=BF?=
 =?UTF-8?q?=E3=83=95=E3=82=A7=E3=83=BC=E3=82=B9=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SocialProtocol/AccountCollectionTest.cs   |  3 +-
 .../Twitter/TwitterAccountTest.cs             | 85 +++++++++++++++++++
 OpenTween/ApplicationEvents.cs                |  3 +-
 OpenTween/SocialProtocol/AccountCollection.cs | 22 ++---
 OpenTween/SocialProtocol/ISocialAccount.cs    | 41 +++++++++
 .../SocialProtocol/Twitter/TwitterAccount.cs  | 75 ++++++++++++++++
 OpenTween/Tween.cs                            |  3 +-
 7 files changed, 216 insertions(+), 16 deletions(-)
 create mode 100644 OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountTest.cs
 create mode 100644 OpenTween/SocialProtocol/ISocialAccount.cs
 create mode 100644 OpenTween/SocialProtocol/Twitter/TwitterAccount.cs

diff --git a/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs b/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
index a0b95284c..63edea727 100644
--- a/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
+++ b/OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs
@@ -20,6 +20,7 @@
 // Boston, MA 02110-1301, USA.
 
 using System;
+using OpenTween.SocialProtocol.Twitter;
 using Xunit;
 
 namespace OpenTween.SocialProtocol
@@ -90,7 +91,7 @@ public void LoadFromSettings_RemoveTest()
 
             // 欠けている ID は削除される
             Assert.Empty(accounts.Items);
-            Assert.Equal(APIAuthType.None, accounts.Primary.Api.AuthType);
+            Assert.Equal(APIAuthType.None, ((TwitterAccount)accounts.Primary).AuthType);
             Assert.True(accountItem1.IsDisposed);
         }
 
diff --git a/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountTest.cs b/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountTest.cs
new file mode 100644
index 000000000..d82079679
--- /dev/null
+++ b/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountTest.cs
@@ -0,0 +1,85 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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 Xunit;
+
+namespace OpenTween.SocialProtocol.Twitter
+{
+    public class TwitterAccountTest
+    {
+        [Fact]
+        public void Initialize_Test()
+        {
+            var accountKey = Guid.NewGuid();
+            using var account = new TwitterAccount(accountKey);
+
+            var accountSettings = new UserAccount
+            {
+                UniqueKey = accountKey,
+                TwitterAuthType = APIAuthType.OAuth1,
+                Token = "aaaaa",
+                TokenSecret = "aaaaa",
+                UserId = 11111L,
+                Username = "tetete",
+            };
+            var settingCommon = new SettingCommon();
+            account.Initialize(accountSettings, settingCommon);
+            Assert.Equal(11111L, account.UserId);
+            Assert.Equal("tetete", account.UserName);
+            Assert.Equal(APIAuthType.OAuth1, account.AuthType);
+            Assert.Same(account.Legacy.Api.Connection, account.Connection);
+        }
+
+        [Fact]
+        public void Initialize_ReconfigureTest()
+        {
+            var accountKey = Guid.NewGuid();
+            using var account = new TwitterAccount(accountKey);
+
+            var accountSettings1 = new UserAccount
+            {
+                UniqueKey = accountKey,
+                TwitterAuthType = APIAuthType.OAuth1,
+                Token = "aaaaa",
+                TokenSecret = "aaaaa",
+                UserId = 11111L,
+                Username = "tetete",
+            };
+            var settingCommon1 = new SettingCommon();
+            account.Initialize(accountSettings1, settingCommon1);
+            Assert.Equal(11111L, account.UserId);
+
+            var accountSettings2 = new UserAccount
+            {
+                UniqueKey = accountKey,
+                TwitterAuthType = APIAuthType.OAuth1,
+                Token = "bbbbb",
+                TokenSecret = "bbbbb",
+                UserId = 22222L,
+                Username = "hoge",
+            };
+            var settingCommon2 = new SettingCommon();
+            account.Initialize(accountSettings2, settingCommon2);
+            Assert.Equal(22222L, account.UserId);
+        }
+    }
+}
diff --git a/OpenTween/ApplicationEvents.cs b/OpenTween/ApplicationEvents.cs
index 57789b930..9eb8b8b40 100644
--- a/OpenTween/ApplicationEvents.cs
+++ b/OpenTween/ApplicationEvents.cs
@@ -32,6 +32,7 @@
 using OpenTween.Connection;
 using OpenTween.Setting;
 using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween
 {
@@ -148,7 +149,7 @@ private static void SetupAccounts(AccountCollection accounts, SettingManager set
             // ここが Twitter API への最初のアクセスになるようにすること
             try
             {
-                accounts.Primary.VerifyCredentials();
+                ((TwitterAccount)accounts.Primary).Legacy.VerifyCredentials();
             }
             catch (WebApiException ex)
             {
diff --git a/OpenTween/SocialProtocol/AccountCollection.cs b/OpenTween/SocialProtocol/AccountCollection.cs
index 03b15ad04..6693bf22d 100644
--- a/OpenTween/SocialProtocol/AccountCollection.cs
+++ b/OpenTween/SocialProtocol/AccountCollection.cs
@@ -24,40 +24,36 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.SocialProtocol
 {
     public sealed class AccountCollection : IDisposable
     {
-        private Dictionary<Guid, Twitter> accounts = new();
+        private Dictionary<Guid, ISocialAccount> accounts = new();
         private Guid? primaryId;
-        private readonly Twitter emptyAccount = new(new());
+        private readonly ISocialAccount emptyAccount = new TwitterAccount(Guid.Empty);
 
         public bool IsDisposed { get; private set; }
 
-        public Twitter Primary
+        public ISocialAccount Primary
             => this.primaryId != null ? this.accounts[this.primaryId.Value] : this.emptyAccount;
 
-        public Twitter[] Items
+        public ISocialAccount[] Items
             => this.accounts.Values.ToArray();
 
         public void LoadFromSettings(SettingCommon settingCommon)
         {
             var oldAccounts = this.accounts;
-            var newAccounts = new Dictionary<Guid, Twitter>();
+            var newAccounts = new Dictionary<Guid, ISocialAccount>();
 
             foreach (var accountSettings in settingCommon.UserAccounts)
             {
                 var accountKey = accountSettings.UniqueKey;
                 if (!oldAccounts.TryGetValue(accountKey, out var account))
-                    account = new(new());
-
-                var credential = accountSettings.GetTwitterCredential();
-                account.Initialize(credential, accountSettings.Username, accountSettings.UserId);
-
-                account.RestrictFavCheck = settingCommon.RestrictFavCheck;
-                account.ReadOwnPost = settingCommon.ReadOwnPost;
+                    account = new TwitterAccount(accountKey);
 
+                account.Initialize(accountSettings, settingCommon);
                 newAccounts[accountKey] = account;
             }
 
@@ -82,7 +78,7 @@ public void Dispose()
             this.IsDisposed = true;
         }
 
-        private void DisposeAccounts(IEnumerable<Twitter> accounts)
+        private void DisposeAccounts(IEnumerable<ISocialAccount> accounts)
         {
             foreach (var account in accounts)
                 account.Dispose();
diff --git a/OpenTween/SocialProtocol/ISocialAccount.cs b/OpenTween/SocialProtocol/ISocialAccount.cs
new file mode 100644
index 000000000..645a5c0bd
--- /dev/null
+++ b/OpenTween/SocialProtocol/ISocialAccount.cs
@@ -0,0 +1,41 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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.
+
+#nullable enable
+
+using System;
+using OpenTween.Connection;
+
+namespace OpenTween.SocialProtocol
+{
+    public interface ISocialAccount : IDisposable
+    {
+        public long UserId { get; }
+
+        public string UserName { get; }
+
+        public IApiConnection Connection { get; }
+
+        public bool IsDisposed { get; }
+
+        public void Initialize(UserAccount accountSettings, SettingCommon settingCommon);
+    }
+}
diff --git a/OpenTween/SocialProtocol/Twitter/TwitterAccount.cs b/OpenTween/SocialProtocol/Twitter/TwitterAccount.cs
new file mode 100644
index 000000000..b2bade424
--- /dev/null
+++ b/OpenTween/SocialProtocol/Twitter/TwitterAccount.cs
@@ -0,0 +1,75 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2024 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.
+
+#nullable enable
+
+using System;
+using System.Diagnostics;
+using OpenTween.Connection;
+
+namespace OpenTween.SocialProtocol.Twitter
+{
+    public class TwitterAccount : ISocialAccount
+    {
+        private readonly OpenTween.Twitter twLegacy = new(new());
+
+        public Guid UniqueKey { get; }
+
+        public bool IsDisposed { get; private set; }
+
+        public OpenTween.Twitter Legacy
+            => this.twLegacy;
+
+        public long UserId
+            => this.Legacy.UserId;
+
+        public string UserName
+            => this.Legacy.Username;
+
+        public APIAuthType AuthType
+            => this.Legacy.Api.AuthType;
+
+        public IApiConnection Connection
+            => this.Legacy.Api.Connection;
+
+        public TwitterAccount(Guid uniqueKey)
+            => this.UniqueKey = uniqueKey;
+
+        public void Initialize(UserAccount accountSettings, SettingCommon settingCommon)
+        {
+            Debug.Assert(accountSettings.UniqueKey == this.UniqueKey, "UniqueKey must be same as current value.");
+
+            var credential = accountSettings.GetTwitterCredential();
+            this.twLegacy.Initialize(credential, accountSettings.Username, accountSettings.UserId);
+            this.twLegacy.RestrictFavCheck = settingCommon.RestrictFavCheck;
+            this.twLegacy.ReadOwnPost = settingCommon.ReadOwnPost;
+        }
+
+        public void Dispose()
+        {
+            if (this.IsDisposed)
+                return;
+
+            this.twLegacy.Dispose();
+            this.IsDisposed = true;
+        }
+    }
+}
diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index f5dfca7f6..93c423cab 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -60,6 +60,7 @@
 using OpenTween.OpenTweenCustomControl;
 using OpenTween.Setting;
 using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 using OpenTween.Thumbnail;
 
 namespace OpenTween
@@ -113,7 +114,7 @@ public partial class TweenMain : OTBaseForm
         private readonly AccountCollection accounts;
 
 #pragma warning disable SA1300
-        private Twitter tw => this.accounts.Primary; // AccountCollection への移行用
+        private Twitter tw => ((TwitterAccount)this.accounts.Primary).Legacy; // AccountCollection への移行用
 #pragma warning restore SA1300
 
         // Growl呼び出し部

From 81ebd6b7873c37138f5e1eb862a41e13fe1f5fb6 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 17 Jan 2024 03:04:53 +0900
Subject: [PATCH 14/16] =?UTF-8?q?TweenMain=E5=86=85=E3=81=AEIServiceAccoun?=
 =?UTF-8?q?t=E3=81=A7=E4=BB=A3=E6=9B=BF=E5=8F=AF=E8=83=BD=E3=81=AA?=
 =?UTF-8?q?=E7=AE=87=E6=89=80=E3=82=92=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenTween/Tween.cs | 58 ++++++++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
index 93c423cab..ea324c85f 100644
--- a/OpenTween/Tween.cs
+++ b/OpenTween/Tween.cs
@@ -114,9 +114,12 @@ public partial class TweenMain : OTBaseForm
         private readonly AccountCollection accounts;
 
 #pragma warning disable SA1300
-        private Twitter tw => ((TwitterAccount)this.accounts.Primary).Legacy; // AccountCollection への移行用
+        private Twitter tw => ((TwitterAccount)this.PrimaryAccount).Legacy; // AccountCollection への移行用
 #pragma warning restore SA1300
 
+        private ISocialAccount PrimaryAccount
+            => this.accounts.Primary;
+
         // Growl呼び出し部
         private readonly GrowlHelper gh = new(ApplicationSettings.ApplicationName);
 
@@ -313,7 +316,7 @@ ThumbnailGenerator thumbGenerator
             imgazyobizinet.Enabled = this.settings.Common.EnableImgAzyobuziNet;
             imgazyobizinet.DisabledInDM = this.settings.Common.ImgAzyobuziNetDisabledInDM;
 
-            Thumbnail.Services.TonTwitterCom.GetApiConnection = () => this.tw.Api.Connection;
+            Thumbnail.Services.TonTwitterCom.GetApiConnection = () => this.PrimaryAccount.Connection;
 
             // 画像投稿サービス
             this.ImageSelector.Model.InitializeServices(this.tw, this.tw.Configuration);
@@ -903,7 +906,8 @@ private void NotifyNewPosts(PostClass[] notifyPosts, string soundFile, int addCo
         {
             if (this.settings.Common.ReadOwnPost)
             {
-                if (notifyPosts != null && notifyPosts.Length > 0 && notifyPosts.All(x => x.UserId == this.tw.UserId))
+                var primaryUserId = this.PrimaryAccount.UserId;
+                if (notifyPosts != null && notifyPosts.Length > 0 && notifyPosts.All(x => x.UserId == primaryUserId))
                     return;
             }
 
@@ -949,7 +953,7 @@ private void NotifyNewPosts(PostClass[] notifyPosts, string soundFile, int addCo
                             GrowlHelper.NotifyType nt;
                             if (this.settings.Common.DispUsername)
                             {
-                                title.Append(this.tw.Username);
+                                title.Append(this.PrimaryAccount.UserName);
                                 title.Append(" - ");
                             }
 
@@ -1007,7 +1011,7 @@ private void NotifyNewPosts(PostClass[] notifyPosts, string soundFile, int addCo
                         ToolTipIcon ntIcon;
                         if (this.settings.Common.DispUsername)
                         {
-                            title.Append(this.tw.Username);
+                            title.Append(this.PrimaryAccount.UserName);
                             title.Append(" - ");
                         }
 
@@ -2232,7 +2236,7 @@ private void ContextMenuOperate_Opening(object sender, CancelEventArgs e)
                 this.StatusOpenMenuItem.Enabled = true;
                 this.ShowRelatedStatusesMenuItem.Enabled = true;  // PublicSearchの時問題出るかも
 
-                if (!post.CanRetweetBy(this.tw.UserId))
+                if (!post.CanRetweetBy(this.PrimaryAccount.UserId))
                 {
                     this.ReTweetStripMenuItem.Enabled = false;
                     this.ReTweetUnofficialStripMenuItem.Enabled = false;
@@ -2261,8 +2265,9 @@ private void ContextMenuOperate_Opening(object sender, CancelEventArgs e)
 
             if (this.ExistCurrentPost && post != null)
             {
-                this.DeleteStripMenuItem.Enabled = post.CanDeleteBy(this.tw.UserId);
-                if (post.RetweetedByUserId == this.tw.UserId)
+                var primaryUserId = this.PrimaryAccount.UserId;
+                this.DeleteStripMenuItem.Enabled = post.CanDeleteBy(primaryUserId);
+                if (post.RetweetedByUserId == primaryUserId)
                     this.DeleteStripMenuItem.Text = Properties.Resources.DeleteMenuText2;
                 else
                     this.DeleteStripMenuItem.Text = Properties.Resources.DeleteMenuText1;
@@ -2282,7 +2287,8 @@ private async Task DoStatusDelete()
                 return;
 
             // 選択されたツイートの中に削除可能なものが一つでもあるか
-            if (!posts.Any(x => x.CanDeleteBy(this.tw.UserId)))
+            var primaryUserId = this.PrimaryAccount.UserId;
+            if (!posts.Any(x => x.CanDeleteBy(primaryUserId)))
                 return;
 
             var ret = MessageBox.Show(
@@ -2303,7 +2309,7 @@ private async Task DoStatusDelete()
                 Exception? lastException = null;
                 foreach (var post in posts)
                 {
-                    if (!post.CanDeleteBy(this.tw.UserId))
+                    if (!post.CanDeleteBy(primaryUserId))
                         continue;
 
                     try
@@ -2314,7 +2320,7 @@ private async Task DoStatusDelete()
                         }
                         else
                         {
-                            if (post.RetweetedByUserId == this.tw.UserId)
+                            if (post.RetweetedByUserId == primaryUserId)
                             {
                                 // 自分が RT したツイート (自分が RT した自分のツイートも含む)
                                 //   => RT を取り消し
@@ -2322,7 +2328,7 @@ private async Task DoStatusDelete()
                             }
                             else
                             {
-                                if (post.UserId == this.tw.UserId)
+                                if (post.UserId == primaryUserId)
                                 {
                                     if (post.RetweetedId != null)
                                     {
@@ -2681,7 +2687,7 @@ private async void SettingStripMenuItem_Click(object sender, EventArgs e)
             this.TopMost = this.settings.Common.AlwaysTop;
             this.SaveConfigsAll(false);
 
-            if (this.tw.UserId != previousUserId)
+            if (this.PrimaryAccount.UserId != previousUserId)
                 await this.DoGetFollowersMenu();
         }
 
@@ -3508,9 +3514,10 @@ internal string FormatStatusText(string statusText, Keys modifierKeys)
                 disableFooter = true;
 
             // 自分宛のリプライの場合は先頭の「@screen_name 」の部分を除去する (in_reply_to_status_id は維持される)
-            if (this.inReplyTo != null && this.inReplyTo.Value.ScreenName == this.tw.Username)
+            var primaryUserName = this.PrimaryAccount.UserName;
+            if (this.inReplyTo != null && this.inReplyTo.Value.ScreenName == primaryUserName)
             {
-                var mentionSelf = $"@{this.tw.Username} ";
+                var mentionSelf = $"@{primaryUserName} ";
                 if (statusText.StartsWith(mentionSelf, StringComparison.OrdinalIgnoreCase))
                 {
                     if (statusText.Length > mentionSelf.Length || this.GetSelectedImageService() != null)
@@ -6031,7 +6038,7 @@ private void MakeReplyText(bool atAll = false)
                 this.inReplyTo = null;
             }
 
-            var selfScreenName = this.tw.Username;
+            var selfScreenName = this.PrimaryAccount.UserName;
             var targetScreenNames = new List<string>();
             foreach (var post in selectedPosts)
             {
@@ -6865,7 +6872,7 @@ private void SetMainWindowTitle()
                 }
             }
 
-            if (this.settings.Common.DispUsername) ttl.Append(this.tw.Username).Append(" - ");
+            if (this.settings.Common.DispUsername) ttl.Append(this.PrimaryAccount.UserName).Append(" - ");
             ttl.Append(ApplicationSettings.ApplicationName);
             ttl.Append("  ");
             switch (this.settings.Common.DispLatestPost)
@@ -7027,7 +7034,7 @@ private void SetNotifyIconText()
             ur.Remove(0, ur.Length);
             if (this.settings.Common.DispUsername)
             {
-                ur.Append(this.tw.Username);
+                ur.Append(this.PrimaryAccount.UserName);
                 ur.Append(" - ");
             }
             ur.Append(ApplicationSettings.ApplicationName);
@@ -7996,8 +8003,9 @@ private async Task DoReTweetOfficial(bool isConfirm)
             if (this.ExistCurrentPost)
             {
                 var selectedPosts = this.CurrentTab.SelectedPosts;
+                var primaryUserId = this.PrimaryAccount.UserId;
 
-                if (selectedPosts.Any(x => !x.CanRetweetBy(this.tw.UserId)))
+                if (selectedPosts.Any(x => !x.CanRetweetBy(primaryUserId)))
                 {
                     if (selectedPosts.Any(x => x.IsProtect))
                         MessageBox.Show("Protected.");
@@ -8338,7 +8346,7 @@ internal async Task ShowFriendship(string id)
 
                 try
                 {
-                    var task = this.tw.Api.FriendshipsShow(this.tw.Username, id);
+                    var task = this.tw.Api.FriendshipsShow(this.PrimaryAccount.UserName, id);
                     var friendship = await dialog.WaitForAsync(this, task);
 
                     isFollowing = friendship.Relationship.Source.Following;
@@ -8388,7 +8396,7 @@ internal async Task ShowFriendship(string[] ids)
 
                     try
                     {
-                        var task = this.tw.Api.FriendshipsShow(this.tw.Username, id);
+                        var task = this.tw.Api.FriendshipsShow(this.PrimaryAccount.UserName, id);
                         var friendship = await dialog.WaitForAsync(this, task);
 
                         isFollowing = friendship.Relationship.Source.Following;
@@ -8448,7 +8456,7 @@ internal async Task ShowFriendship(string[] ids)
         }
 
         private async void OwnStatusMenuItem_Click(object sender, EventArgs e)
-            => await this.DoShowUserStatus(this.tw.Username, false);
+            => await this.DoShowUserStatus(this.PrimaryAccount.UserName, false);
 
         // TwitterIDでない固定文字列を調べる（文字列検証のみ　実際に取得はしない）
         // URLから切り出した文字列を渡す
@@ -8789,7 +8797,7 @@ private void MenuItemOperate_DropDownOpening(object sender, EventArgs e)
                 this.OpenStatusOpMenuItem.Enabled = true;
                 this.ShowRelatedStatusesMenuItem2.Enabled = true;  // PublicSearchの時問題出るかも
 
-                if (!post.CanRetweetBy(this.tw.UserId))
+                if (!post.CanRetweetBy(this.PrimaryAccount.UserId))
                 {
                     this.RtOpMenuItem.Enabled = false;
                     this.RtUnOpMenuItem.Enabled = false;
@@ -8826,7 +8834,7 @@ private void MenuItemOperate_DropDownOpening(object sender, EventArgs e)
 
             if (this.ExistCurrentPost && post != null)
             {
-                this.DelOpMenuItem.Enabled = post.CanDeleteBy(this.tw.UserId);
+                this.DelOpMenuItem.Enabled = post.CanDeleteBy(this.PrimaryAccount.UserId);
             }
         }
 
@@ -9268,7 +9276,7 @@ private void TweenRestartMenuItem_Click(object sender, EventArgs e)
         }
 
         private async void OpenOwnHomeMenuItem_Click(object sender, EventArgs e)
-            => await MyCommon.OpenInBrowserAsync(this, MyCommon.TwitterUrl + this.tw.Username);
+            => await MyCommon.OpenInBrowserAsync(this, MyCommon.TwitterUrl + this.PrimaryAccount.UserName);
 
         private bool ExistCurrentPost
         {

From 2ae6a548acb1be56e900ef57603f84948f9938c8 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sat, 20 Jan 2024 00:15:19 +0900
Subject: [PATCH 15/16] =?UTF-8?q?graphql=E3=82=A8=E3=83=B3=E3=83=89?=
 =?UTF-8?q?=E3=83=9D=E3=82=A4=E3=83=B3=E3=83=88=E3=82=92=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=83=9B=E3=83=BC=E3=83=A0=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=A0=E3=83=A9=E3=82=A4=E3=83=B3=E3=81=AE=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.txt                                 |   1 +
 .../GraphQL/HomeLatestTimelineRequestTest.cs  |  96 +++
 .../Responses/HomeLatestTimeline.json         | 654 ++++++++++++++++++
 .../Api/GraphQL/HomeLatestTimelineRequest.cs  |  81 +++
 OpenTween/Models/HomeTabModel.cs              |   4 +
 OpenTween/Twitter.cs                          |  19 +-
 6 files changed, 854 insertions(+), 1 deletion(-)
 create mode 100644 OpenTween.Tests/Api/GraphQL/HomeLatestTimelineRequestTest.cs
 create mode 100644 OpenTween.Tests/Resources/Responses/HomeLatestTimeline.json
 create mode 100644 OpenTween/Api/GraphQL/HomeLatestTimelineRequest.cs

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a1e4333e8..cfcd90c42 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
 更新履歴
 
 ==== Unreleased
+ * NEW: graphqlエンドポイントを使用したホームタイムラインの取得に対応
 
 ==== Ver 3.11.0(2024/01/07)
  * NEW: Cookie使用時の関連発言表示に対応
diff --git a/OpenTween.Tests/Api/GraphQL/HomeLatestTimelineRequestTest.cs b/OpenTween.Tests/Api/GraphQL/HomeLatestTimelineRequestTest.cs
new file mode 100644
index 000000000..df1fb6efe
--- /dev/null
+++ b/OpenTween.Tests/Api/GraphQL/HomeLatestTimelineRequestTest.cs
@@ -0,0 +1,96 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2023 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.Threading.Tasks;
+using Moq;
+using OpenTween.Connection;
+using Xunit;
+
+namespace OpenTween.Api.GraphQL
+{
+    public class HomeLatestTimelineRequestTest
+    {
+        [Fact]
+        public async Task Send_Test()
+        {
+            using var apiResponse = await TestUtils.CreateApiResponse("Resources/Responses/HomeLatestTimeline.json");
+
+            var mock = new Mock<IApiConnection>();
+            mock.Setup(x =>
+                    x.SendAsync(It.IsAny<IHttpRequest>())
+                )
+                .Callback<IHttpRequest>(x =>
+                {
+                    var request = Assert.IsType<GetRequest>(x);
+                    Assert.Equal(new("https://twitter.com/i/api/graphql/lAKISuk_McyDUlhS2Zmv4A/HomeLatestTimeline"), request.RequestUri);
+                    var query = request.Query!;
+                    Assert.Equal(2, query.Count);
+                    Assert.Equal("""{"includePromotedContent":true,"latestControlAvailable":true,"requestContext":"launch","count":20}""", query["variables"]);
+                    Assert.True(query.ContainsKey("features"));
+                    Assert.Equal("HomeLatestTimeline", request.EndpointName);
+                })
+                .ReturnsAsync(apiResponse);
+
+            var request = new HomeLatestTimelineRequest
+            {
+                Count = 20,
+            };
+
+            var response = await request.Send(mock.Object);
+            Assert.Single(response.Tweets);
+            Assert.Equal("DAABCgABGENe-W5AJxEKAAIWeWboXhcQAAgAAwAAAAEAAA", response.CursorTop);
+            Assert.Equal("DAABCgABGENe-W4__5oKAAIWK_5v3BcQAAgAAwAAAAIAAA", response.CursorBottom);
+
+            mock.VerifyAll();
+        }
+
+        [Fact]
+        public async Task Send_RequestCursor_Test()
+        {
+            using var apiResponse = await TestUtils.CreateApiResponse("Resources/Responses/HomeLatestTimeline.json");
+
+            var mock = new Mock<IApiConnection>();
+            mock.Setup(x =>
+                    x.SendAsync(It.IsAny<IHttpRequest>())
+                )
+                .Callback<IHttpRequest>(x =>
+                {
+                    var request = Assert.IsType<GetRequest>(x);
+                    Assert.Equal(new("https://twitter.com/i/api/graphql/lAKISuk_McyDUlhS2Zmv4A/HomeLatestTimeline"), request.RequestUri);
+                    var query = request.Query!;
+                    Assert.Equal(2, query.Count);
+                    Assert.Equal("""{"includePromotedContent":true,"latestControlAvailable":true,"requestContext":"launch","count":20,"cursor":"aaa"}""", query["variables"]);
+                    Assert.True(query.ContainsKey("features"));
+                    Assert.Equal("HomeLatestTimeline", request.EndpointName);
+                })
+                .ReturnsAsync(apiResponse);
+
+            var request = new HomeLatestTimelineRequest
+            {
+                Count = 20,
+                Cursor = "aaa",
+            };
+
+            await request.Send(mock.Object);
+            mock.VerifyAll();
+        }
+    }
+}
diff --git a/OpenTween.Tests/Resources/Responses/HomeLatestTimeline.json b/OpenTween.Tests/Resources/Responses/HomeLatestTimeline.json
new file mode 100644
index 000000000..ff7991c9a
--- /dev/null
+++ b/OpenTween.Tests/Resources/Responses/HomeLatestTimeline.json
@@ -0,0 +1,654 @@
+{
+  "data": {
+    "home": {
+      "home_timeline_urt": {
+        "instructions": [
+          {
+            "type": "TimelineAddEntries",
+            "entries": [
+              {
+                "entryId": "tweet-1619438689213419520",
+                "sortIndex": "1748345505739440127",
+                "content": {
+                  "entryType": "TimelineTimelineItem",
+                  "__typename": "TimelineTimelineItem",
+                  "itemContent": {
+                    "itemType": "TimelineTweet",
+                    "__typename": "TimelineTweet",
+                    "tweet_results": {
+                      "result": {
+                        "__typename": "Tweet",
+                        "rest_id": "1619438689213419520",
+                        "core": {
+                          "user_results": {
+                            "result": {
+                              "__typename": "User",
+                              "id": "VXNlcjo3NzE4NzExMjQ=",
+                              "rest_id": "771871124",
+                              "affiliates_highlighted_label": {
+                                "label": {
+                                  "badge": {
+                                    "url": "https://pbs.twimg.com/semantic_core_img/1428827730364096519/4ZXpTBhS?format=png&name=orig"
+                                  },
+                                  "description": "Automated",
+                                  "longDescription": {
+                                    "text": "Automated by @opentween",
+                                    "entities": [
+                                      {
+                                        "fromIndex": 13,
+                                        "toIndex": 23,
+                                        "ref": {
+                                          "type": "TimelineRichTextMention",
+                                          "screen_name": "opentween",
+                                          "mention_results": {
+                                            "result": {
+                                              "__typename": "User",
+                                              "legacy": {
+                                                "screen_name": "opentween"
+                                              },
+                                              "rest_id": "514241801"
+                                            }
+                                          }
+                                        }
+                                      }
+                                    ]
+                                  },
+                                  "userLabelType": "AutomatedLabel"
+                                }
+                              },
+                              "has_graduated_access": true,
+                              "is_blue_verified": false,
+                              "profile_image_shape": "Circle",
+                              "legacy": {
+                                "following": true,
+                                "can_dm": false,
+                                "can_media_tag": true,
+                                "created_at": "Tue Aug 21 17:03:01 +0000 2012",
+                                "default_profile": true,
+                                "default_profile_image": true,
+                                "description": "最新の開発版OpenTweenは https://t.co/a0mUFAT58Y から試せます",
+                                "entities": {
+                                  "description": {
+                                    "urls": [
+                                      {
+                                        "display_url": "ci.appveyor.com/project/upsilo…",
+                                        "expanded_url": "https://ci.appveyor.com/project/upsilon/opentween/build/artifacts?branch=master",
+                                        "url": "https://t.co/a0mUFAT58Y",
+                                        "indices": [
+                                          17,
+                                          40
+                                        ]
+                                      }
+                                    ]
+                                  }
+                                },
+                                "fast_followers_count": 0,
+                                "favourites_count": 0,
+                                "followers_count": 40,
+                                "friends_count": 0,
+                                "has_custom_timelines": false,
+                                "is_translator": false,
+                                "listed_count": 0,
+                                "location": "",
+                                "media_count": 0,
+                                "name": "OpenTween 新着コミット",
+                                "normal_followers_count": 40,
+                                "pinned_tweet_ids_str": [],
+                                "possibly_sensitive": false,
+                                "profile_image_url_https": "https://abs.twimg.com/sticky/default_profile_images/default_profile_normal.png",
+                                "profile_interstitial_type": "",
+                                "screen_name": "OpenTweenCommit",
+                                "statuses_count": 1991,
+                                "translator_type": "none",
+                                "verified": false,
+                                "want_retweets": true,
+                                "withheld_in_countries": []
+                              }
+                            }
+                          }
+                        },
+                        "card": {
+                          "rest_id": "https://t.co/TBwXmNGlWs",
+                          "legacy": {
+                            "binding_values": [
+                              {
+                                "key": "photo_image_full_size_large",
+                                "value": {
+                                  "image_value": {
+                                    "height": 419,
+                                    "width": 800,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=800x419"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "thumbnail_image",
+                                "value": {
+                                  "image_value": {
+                                    "height": 200,
+                                    "width": 400,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=400x400"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "domain",
+                                "value": {
+                                  "string_value": "github.com",
+                                  "type": "STRING"
+                                }
+                              },
+                              {
+                                "key": "thumbnail_image_large",
+                                "value": {
+                                  "image_value": {
+                                    "height": 300,
+                                    "width": 600,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=600x600"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "summary_photo_image_small",
+                                "value": {
+                                  "image_value": {
+                                    "height": 202,
+                                    "width": 386,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=386x202"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "thumbnail_image_original",
+                                "value": {
+                                  "image_value": {
+                                    "height": 600,
+                                    "width": 1200,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=orig"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "site",
+                                "value": {
+                                  "scribe_key": "publisher_id",
+                                  "type": "USER",
+                                  "user_value": {
+                                    "id_str": "13334762",
+                                    "path": []
+                                  }
+                                }
+                              },
+                              {
+                                "key": "photo_image_full_size_small",
+                                "value": {
+                                  "image_value": {
+                                    "height": 202,
+                                    "width": 386,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=386x202"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "summary_photo_image_large",
+                                "value": {
+                                  "image_value": {
+                                    "height": 419,
+                                    "width": 800,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=800x419"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "thumbnail_image_small",
+                                "value": {
+                                  "image_value": {
+                                    "height": 72,
+                                    "width": 144,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=144x144"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "thumbnail_image_x_large",
+                                "value": {
+                                  "image_value": {
+                                    "height": 600,
+                                    "width": 1200,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=png&name=2048x2048_2_exp"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "photo_image_full_size_original",
+                                "value": {
+                                  "image_value": {
+                                    "height": 600,
+                                    "width": 1200,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=orig"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "vanity_url",
+                                "value": {
+                                  "scribe_key": "vanity_url",
+                                  "string_value": "github.com",
+                                  "type": "STRING"
+                                }
+                              },
+                              {
+                                "key": "photo_image_full_size",
+                                "value": {
+                                  "image_value": {
+                                    "height": 314,
+                                    "width": 600,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=600x314"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "thumbnail_image_color",
+                                "value": {
+                                  "image_color_value": {
+                                    "palette": [
+                                      {
+                                        "rgb": {
+                                          "blue": 255,
+                                          "green": 255,
+                                          "red": 255
+                                        },
+                                        "percentage": 92.66
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 1,
+                                          "green": 135,
+                                          "red": 23
+                                        },
+                                        "percentage": 3.14
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 120,
+                                          "green": 115,
+                                          "red": 111
+                                        },
+                                        "percentage": 2.31
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 105,
+                                          "green": 184,
+                                          "red": 118
+                                        },
+                                        "percentage": 1.7
+                                      }
+                                    ]
+                                  },
+                                  "type": "IMAGE_COLOR"
+                                }
+                              },
+                              {
+                                "key": "title",
+                                "value": {
+                                  "string_value": "バージョン v3.4.1-dev 開発開始 · opentween/OpenTween@41ae9b4",
+                                  "type": "STRING"
+                                }
+                              },
+                              {
+                                "key": "summary_photo_image_color",
+                                "value": {
+                                  "image_color_value": {
+                                    "palette": [
+                                      {
+                                        "rgb": {
+                                          "blue": 255,
+                                          "green": 255,
+                                          "red": 255
+                                        },
+                                        "percentage": 92.66
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 1,
+                                          "green": 135,
+                                          "red": 23
+                                        },
+                                        "percentage": 3.14
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 120,
+                                          "green": 115,
+                                          "red": 111
+                                        },
+                                        "percentage": 2.31
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 105,
+                                          "green": 184,
+                                          "red": 118
+                                        },
+                                        "percentage": 1.7
+                                      }
+                                    ]
+                                  },
+                                  "type": "IMAGE_COLOR"
+                                }
+                              },
+                              {
+                                "key": "summary_photo_image_x_large",
+                                "value": {
+                                  "image_value": {
+                                    "height": 600,
+                                    "width": 1200,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=png&name=2048x2048_2_exp"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "summary_photo_image",
+                                "value": {
+                                  "image_value": {
+                                    "height": 314,
+                                    "width": 600,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=600x314"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "photo_image_full_size_color",
+                                "value": {
+                                  "image_color_value": {
+                                    "palette": [
+                                      {
+                                        "rgb": {
+                                          "blue": 255,
+                                          "green": 255,
+                                          "red": 255
+                                        },
+                                        "percentage": 92.66
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 1,
+                                          "green": 135,
+                                          "red": 23
+                                        },
+                                        "percentage": 3.14
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 120,
+                                          "green": 115,
+                                          "red": 111
+                                        },
+                                        "percentage": 2.31
+                                      },
+                                      {
+                                        "rgb": {
+                                          "blue": 105,
+                                          "green": 184,
+                                          "red": 118
+                                        },
+                                        "percentage": 1.7
+                                      }
+                                    ]
+                                  },
+                                  "type": "IMAGE_COLOR"
+                                }
+                              },
+                              {
+                                "key": "photo_image_full_size_x_large",
+                                "value": {
+                                  "image_value": {
+                                    "height": 600,
+                                    "width": 1200,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=png&name=2048x2048_2_exp"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              },
+                              {
+                                "key": "card_url",
+                                "value": {
+                                  "scribe_key": "card_url",
+                                  "string_value": "https://t.co/TBwXmNGlWs",
+                                  "type": "STRING"
+                                }
+                              },
+                              {
+                                "key": "summary_photo_image_original",
+                                "value": {
+                                  "image_value": {
+                                    "height": 600,
+                                    "width": 1200,
+                                    "url": "https://pbs.twimg.com/card_img/1747139186337964032/Uh3I5jzF?format=jpg&name=orig"
+                                  },
+                                  "type": "IMAGE"
+                                }
+                              }
+                            ],
+                            "card_platform": {
+                              "platform": {
+                                "audience": {
+                                  "name": "production"
+                                },
+                                "device": {
+                                  "name": "Swift",
+                                  "version": "12"
+                                }
+                              }
+                            },
+                            "name": "summary_large_image",
+                            "url": "https://t.co/TBwXmNGlWs",
+                            "user_refs_results": [
+                              {
+                                "result": {
+                                  "__typename": "User",
+                                  "id": "VXNlcjoxMzMzNDc2Mg==",
+                                  "rest_id": "13334762",
+                                  "affiliates_highlighted_label": {},
+                                  "has_graduated_access": true,
+                                  "is_blue_verified": true,
+                                  "profile_image_shape": "Square",
+                                  "legacy": {
+                                    "can_dm": false,
+                                    "can_media_tag": true,
+                                    "created_at": "Mon Feb 11 04:41:50 +0000 2008",
+                                    "default_profile": false,
+                                    "default_profile_image": false,
+                                    "description": "The AI-powered developer platform to build, scale, and deliver secure software.",
+                                    "entities": {
+                                      "description": {
+                                        "urls": []
+                                      },
+                                      "url": {
+                                        "urls": [
+                                          {
+                                            "display_url": "github.com",
+                                            "expanded_url": "http://github.com",
+                                            "url": "https://t.co/bbJgfyzcJR",
+                                            "indices": [
+                                              0,
+                                              23
+                                            ]
+                                          }
+                                        ]
+                                      }
+                                    },
+                                    "fast_followers_count": 0,
+                                    "favourites_count": 8192,
+                                    "followers_count": 2550121,
+                                    "friends_count": 336,
+                                    "has_custom_timelines": true,
+                                    "is_translator": false,
+                                    "listed_count": 18221,
+                                    "location": "San Francisco, CA",
+                                    "media_count": 2228,
+                                    "name": "GitHub",
+                                    "normal_followers_count": 2550121,
+                                    "pinned_tweet_ids_str": [],
+                                    "possibly_sensitive": false,
+                                    "profile_banner_url": "https://pbs.twimg.com/profile_banners/13334762/1692114901",
+                                    "profile_image_url_https": "https://pbs.twimg.com/profile_images/1633247750010830848/8zfRrYjA_normal.png",
+                                    "profile_interstitial_type": "",
+                                    "screen_name": "github",
+                                    "statuses_count": 8812,
+                                    "translator_type": "none",
+                                    "url": "https://t.co/bbJgfyzcJR",
+                                    "verified": false,
+                                    "verified_type": "Business",
+                                    "want_retweets": false,
+                                    "withheld_in_countries": []
+                                  }
+                                }
+                              }
+                            ]
+                          }
+                        },
+                        "unmention_data": {},
+                        "unified_card": {
+                          "card_fetch_state": "NoCard"
+                        },
+                        "edit_control": {
+                          "edit_tweet_ids": [
+                            "1619438689213419520"
+                          ],
+                          "editable_until_msecs": "1674941045000",
+                          "is_edit_eligible": true,
+                          "edits_remaining": "5"
+                        },
+                        "is_translatable": true,
+                        "views": {
+                          "count": "263",
+                          "state": "EnabledWithCount"
+                        },
+                        "source": "<a href=\"https://ifttt.com\" rel=\"nofollow\">IFTTT</a>",
+                        "legacy": {
+                          "bookmark_count": 0,
+                          "bookmarked": false,
+                          "created_at": "Sat Jan 28 20:54:05 +0000 2023",
+                          "conversation_id_str": "1619438689213419520",
+                          "display_text_range": [
+                            0,
+                            50
+                          ],
+                          "entities": {
+                            "hashtags": [],
+                            "symbols": [],
+                            "timestamps": [],
+                            "urls": [
+                              {
+                                "display_url": "github.com/opentween/Open…",
+                                "expanded_url": "https://github.com/opentween/OpenTween/commit/41ae9b439d3477baf7fb582b12faab9f6979761f",
+                                "url": "https://t.co/TBwXmNGlWs",
+                                "indices": [
+                                  27,
+                                  50
+                                ]
+                              }
+                            ],
+                            "user_mentions": []
+                          },
+                          "favorite_count": 1,
+                          "favorited": false,
+                          "full_text": "バージョン v3.4.1-dev 開発開始\n     https://t.co/TBwXmNGlWs",
+                          "is_quote_status": false,
+                          "lang": "ja",
+                          "possibly_sensitive": false,
+                          "possibly_sensitive_editable": true,
+                          "quote_count": 0,
+                          "reply_count": 0,
+                          "retweet_count": 1,
+                          "retweeted": false,
+                          "user_id_str": "771871124",
+                          "id_str": "1619438689213419520"
+                        }
+                      }
+                    },
+                    "tweetDisplayType": "Tweet"
+                  },
+                  "clientEventInfo": {
+                    "component": "following_in_network",
+                    "element": "tweet",
+                    "details": {
+                      "timelinesDetails": {
+                        "injectionType": "FollowingInNetwork",
+                        "controllerData": "DAACDAABDAABCgABAQAABEoCAAEKAAIAAAAAAAEBAAoACTxaHRTrD0CCCAALAAAAAQ8ADAMAAAALAQACSgQAAAEAAQEKAA6nR6O27vdKZwoAEPS7WmhJVraiAAAAAA=="
+                      }
+                    }
+                  }
+                }
+              },
+              {
+                "entryId": "cursor-top-1748345505739440129",
+                "sortIndex": "1748345505739440129",
+                "content": {
+                  "entryType": "TimelineTimelineCursor",
+                  "__typename": "TimelineTimelineCursor",
+                  "value": "DAABCgABGENe-W5AJxEKAAIWeWboXhcQAAgAAwAAAAEAAA",
+                  "cursorType": "Top"
+                }
+              },
+              {
+                "entryId": "cursor-bottom-1748345505739440028",
+                "sortIndex": "1748345505739440028",
+                "content": {
+                  "entryType": "TimelineTimelineCursor",
+                  "__typename": "TimelineTimelineCursor",
+                  "value": "DAABCgABGENe-W4__5oKAAIWK_5v3BcQAAgAAwAAAAIAAA",
+                  "cursorType": "Bottom"
+                }
+              }
+            ]
+          }
+        ],
+        "responseObjects": {
+          "feedbackActions": [
+            {
+              "key": "-1938325421",
+              "value": {
+                "feedbackType": "Dismiss",
+                "prompt": "See less often",
+                "feedbackUrl": "/1.1/onboarding/fatigue.json?flow_name=premium-plus-upsell-prompt&fatigue_group_name=PremiumPlusUpsellFatigueGroup&action_name=dismiss&scribe_name=dismiss&display_location=home_latest&served_time_secs=1705673025&injection_type=inline_message",
+                "hasUndoAction": false
+              }
+            },
+            {
+              "key": "575125400",
+              "value": {
+                "feedbackType": "SeeFewer",
+                "prompt": "See less often",
+                "confirmation": "OK. You won’t see these as much.",
+                "encodedFeedbackRequest": "LBUEHBUeOQwAAAA=",
+                "hasUndoAction": true,
+                "icon": "Frown"
+              }
+            }
+          ]
+        },
+        "metadata": {
+          "scribeConfig": {
+            "page": "following"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/OpenTween/Api/GraphQL/HomeLatestTimelineRequest.cs b/OpenTween/Api/GraphQL/HomeLatestTimelineRequest.cs
new file mode 100644
index 000000000..d11c0ca77
--- /dev/null
+++ b/OpenTween/Api/GraphQL/HomeLatestTimelineRequest.cs
@@ -0,0 +1,81 @@
+// OpenTween - Client of Twitter
+// Copyright (c) 2023 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.
+
+#nullable enable
+
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System.Xml.XPath;
+using OpenTween.Connection;
+
+namespace OpenTween.Api.GraphQL
+{
+    public class HomeLatestTimelineRequest
+    {
+        public static readonly string EndpointName = "HomeLatestTimeline";
+
+        private static readonly Uri EndpointUri = new("https://twitter.com/i/api/graphql/lAKISuk_McyDUlhS2Zmv4A/HomeLatestTimeline");
+
+        public int Count { get; set; } = 20;
+
+        public string? Cursor { get; set; }
+
+        public Dictionary<string, string> CreateParameters()
+        {
+            return new()
+            {
+                ["variables"] = "{" +
+                    $@"""includePromotedContent"":true,""latestControlAvailable"":true,""requestContext"":""launch""," +
+                    $@"""count"":{this.Count}" +
+                    (this.Cursor != null ? $@",""cursor"":""{JsonUtils.EscapeJsonString(this.Cursor)}""" : "") +
+                    "}",
+                ["features"] = """
+                    {"responsive_web_graphql_exclude_directive_enabled":true,"verified_phone_label_enabled":false,"creator_subscriptions_tweet_preview_api_enabled":true,"responsive_web_graphql_timeline_navigation_enabled":true,"responsive_web_graphql_skip_user_profile_image_extensions_enabled":false,"c9s_tweet_anatomy_moderator_badge_enabled":true,"tweetypie_unmention_optimization_enabled":true,"responsive_web_edit_tweet_api_enabled":true,"graphql_is_translatable_rweb_tweet_is_translatable_enabled":true,"view_counts_everywhere_api_enabled":true,"longform_notetweets_consumption_enabled":true,"responsive_web_twitter_article_tweet_consumption_enabled":true,"tweet_awards_web_tipping_enabled":false,"freedom_of_speech_not_reach_fetch_enabled":true,"standardized_nudges_misinfo":true,"tweet_with_visibility_results_prefer_gql_limited_actions_policy_enabled":true,"rweb_video_timestamps_enabled":true,"longform_notetweets_rich_text_read_enabled":true,"longform_notetweets_inline_media_enabled":true,"responsive_web_media_download_video_enabled":false,"responsive_web_enhance_cards_enabled":false}
+                    """,
+            };
+        }
+
+        public async Task<TimelineResponse> Send(IApiConnection apiConnection)
+        {
+            var request = new GetRequest
+            {
+                RequestUri = EndpointUri,
+                Query = this.CreateParameters(),
+                EndpointName = EndpointName,
+            };
+
+            using var response = await apiConnection.SendAsync(request)
+                .ConfigureAwait(false);
+
+            var rootElm = await response.ReadAsJsonXml()
+                .ConfigureAwait(false);
+
+            ErrorResponse.ThrowIfError(rootElm);
+
+            var tweets = TimelineTweet.ExtractTimelineTweets(rootElm);
+            var cursorTop = rootElm.XPathSelectElement("//content[__typename[text()='TimelineTimelineCursor']][cursorType[text()='Top']]/value")?.Value;
+            var cursorBottom = rootElm.XPathSelectElement("//content[__typename[text()='TimelineTimelineCursor']][cursorType[text()='Bottom']]/value")?.Value;
+
+            return new(tweets, cursorTop, cursorBottom);
+        }
+    }
+}
diff --git a/OpenTween/Models/HomeTabModel.cs b/OpenTween/Models/HomeTabModel.cs
index 9d1f6fa0a..dac76ac4e 100644
--- a/OpenTween/Models/HomeTabModel.cs
+++ b/OpenTween/Models/HomeTabModel.cs
@@ -45,6 +45,10 @@ public override MyCommon.TabUsageType TabType
 
         public PostId? OldestId { get; set; }
 
+        public string? CursorTop { get; set; }
+
+        public string? CursorBottom { get; set; }
+
         public int TweetsPerHour => this.tweetsPerHour;
 
         // 流速計測用
diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 63ba0066c..4e1030f55 100644
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -595,7 +595,24 @@ public async Task GetHomeTimelineApi(bool read, HomeTabModel tab, bool more, boo
             var count = GetApiResultCount(MyCommon.WORKERTYPE.Timeline, more, startup);
 
             TwitterStatus[] statuses;
-            if (SettingManager.Instance.Common.EnableTwitterV2Api)
+            if (this.Api.AuthType == APIAuthType.TwitterComCookie)
+            {
+                var request = new HomeLatestTimelineRequest
+                {
+                    Count = count,
+                    Cursor = more ? tab.CursorBottom : tab.CursorTop,
+                };
+                var response = await request.Send(this.Api.Connection)
+                    .ConfigureAwait(false);
+
+                statuses = response.ToTwitterStatuses();
+
+                tab.CursorBottom = response.CursorBottom;
+
+                if (!more)
+                    tab.CursorTop = response.CursorTop;
+            }
+            else if (SettingManager.Instance.Common.EnableTwitterV2Api)
             {
                 var request = new GetTimelineRequest(this.UserId)
                 {

From 41da70557d896b87de20141291fea16ca1392633 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sat, 20 Jan 2024 00:28:29 +0900
Subject: [PATCH 16/16] =?UTF-8?q?OpenTween=20v3.12.0=20=E3=83=AA=E3=83=AA?=
 =?UTF-8?q?=E3=83=BC=E3=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.txt                              | 2 +-
 OpenTween/Properties/AssemblyInfo.cs       | 2 +-
 OpenTween/Properties/Resources.Designer.cs | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cfcd90c42..b8f640b80 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,6 @@
 更新履歴
 
-==== Unreleased
+==== Ver 3.12.0(2024/01/20)
  * NEW: graphqlエンドポイントを使用したホームタイムラインの取得に対応
 
 ==== Ver 3.11.0(2024/01/07)
diff --git a/OpenTween/Properties/AssemblyInfo.cs b/OpenTween/Properties/AssemblyInfo.cs
index 8721b00d9..976abfe17 100644
--- a/OpenTween/Properties/AssemblyInfo.cs
+++ b/OpenTween/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 // 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です
 [assembly: Guid("2d0ae0ba-adac-49a2-9b10-26fd69e695bf")]
 
-[assembly: AssemblyVersion("3.11.0.1")]
+[assembly: AssemblyVersion("3.12.0.0")]
 
 [assembly: InternalsVisibleTo("OpenTween.Tests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // for Moq
diff --git a/OpenTween/Properties/Resources.Designer.cs b/OpenTween/Properties/Resources.Designer.cs
index 7615947b6..32f7a5628 100644
--- a/OpenTween/Properties/Resources.Designer.cs
+++ b/OpenTween/Properties/Resources.Designer.cs
@@ -580,7 +580,8 @@ internal static string ChangeIconToolStripMenuItem_Confirm {
         /// <summary>
         ///   更新履歴
         ///
-        ///==== Unreleased
+        ///==== Ver 3.12.0(2024/01/20)
+        /// * NEW: graphqlエンドポイントを使用したホームタイムラインの取得に対応
         ///
         ///==== Ver 3.11.0(2024/01/07)
         /// * NEW: Cookie使用時の関連発言表示に対応
@@ -596,8 +597,7 @@ internal static string ChangeIconToolStripMenuItem_Confirm {
         ///
         ///==== Ver 3.9.0(2023/12/03)
         /// * NEW: graphqlエンドポイントに対するレートリミットの表示に対応
-        /// * CHG: タイムライン更新時に全件ではなく新着投稿のみ差分を取得する動作に変更
-        /// * FIX: 設定したタイムアウト時間を [残りの文字列は切り詰められました]&quot;; に類似しているローカライズされた文字列を検索します。
+        /// * CHG: タ [残りの文字列は切り詰められました]&quot;; に類似しているローカライズされた文字列を検索します。
         /// </summary>
         internal static string ChangeLog {
             get {