SourceAccountIdによるタブ単位のアカウントの切り替えに対応

OpenTween.Tests/Models/TabInformationTest.cs

@@ -71,6 +71,18 @@ public void AddTab_DuplicateTest()
             Assert.False(ret);
         }
 
+        [Fact]
+        public void AddTab_FirstTabTest()
+        {
+            var tabinfo = new TabInformations();
+            var tab = new PublicSearchTabModel("hoge");
+
+            tabinfo.AddTab(tab);
+
+            Assert.Equal("hoge", tabinfo.SelectedTabName);
+            Assert.Same(tab, tabinfo.SelectedTab);
+        }
+
         [Fact]
         public void RemoveTab_InnerStorageTabTest()
         {

OpenTween.Tests/SocialProtocol/AccountCollectionTest.cs

@@ -20,6 +20,7 @@
 // Boston, MA 02110-1301, USA.
 
 using System;
+using OpenTween.Models;
 using OpenTween.SocialProtocol.Twitter;
 using Xunit;
 
@@ -139,5 +140,65 @@ public void LoadFromSettings_ReconfigureTest()
             );
             Assert.False(accountItem2.IsDisposed);
         }
+
+        [Fact]
+        public void GetAccountForTab_DefaultTest()
+        {
+            using var accounts = new AccountCollection();
+            accounts.LoadFromSettings(new()
+            {
+                UserAccounts = new()
+                {
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            });
+
+            var tabWithoutAccountId = new PublicSearchTabModel("hoge");
+
+            // SourceAccountId が null のタブに対しては Primary のアカウントを返す
+            var actual = accounts.GetAccountForTab(tabWithoutAccountId);
+            Assert.Equal(new("00000000-0000-4000-8000-000000000000"), actual?.UniqueKey);
+        }
+
+        [Fact]
+        public void GetAccountForTab_SpecifiedAccountTest()
+        {
+            using var accounts = new AccountCollection();
+            accounts.LoadFromSettings(new()
+            {
+                UserAccounts = new()
+                {
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                    this.CreateAccountSetting("00000000-0000-4000-8000-111111111111"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            });
+
+            var tabWithAccountId = new RelatedPostsTabModel("hoge", new("00000000-0000-4000-8000-111111111111"), new());
+
+            // SourceAccountId が設定されているタブに対しては対応するアカウントを返す
+            var actual = accounts.GetAccountForTab(tabWithAccountId);
+            Assert.Equal(new("00000000-0000-4000-8000-111111111111"), actual?.UniqueKey);
+        }
+
+        [Fact]
+        public void GetAccountForTab_NotExistsTest()
+        {
+            using var accounts = new AccountCollection();
+            accounts.LoadFromSettings(new()
+            {
+                UserAccounts = new()
+                {
+                    this.CreateAccountSetting("00000000-0000-4000-8000-000000000000"),
+                },
+                SelectedAccountKey = new("00000000-0000-4000-8000-000000000000"),
+            });
+
+            var tabWithAccountId = new RelatedPostsTabModel("hoge", new("00000000-0000-4000-8000-999999999999"), new());
+
+            // SourceAccountId に存在しない ID が設定されていた場合は null を返す
+            Assert.Null(accounts.GetAccountForTab(tabWithAccountId));
+        }
     }
 }

OpenTween/ApplicationEvents.cs

@@ -28,6 +28,7 @@
 #nullable enable
 
 using System;
+using System.Linq;
 using System.Windows.Forms;
 using OpenTween.Connection;
 using OpenTween.Setting;

OpenTween/Models/DirectMessagesTabModel.cs

@@ -33,6 +33,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -53,13 +55,16 @@ public DirectMessagesTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             progress.Report(string.Format(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText8, backward ? -1 : 1));
 
             var firstLoad = !this.IsFirstLoadCompleted;
 
-            await tw.GetDirectMessageEvents(this, backward, firstLoad)
+            await twAccount.Legacy.GetDirectMessageEvents(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();

OpenTween/Models/FavoritesTabModel.cs

@@ -33,6 +33,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -57,13 +59,16 @@ public FavoritesTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             progress.Report(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText19);
 
             var firstLoad = !this.IsFirstLoadCompleted;
 
-            await tw.GetFavoritesApi(this, backward, firstLoad)
+            await twAccount.Legacy.GetFavoritesApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();

OpenTween/Models/FilterTabModel.cs

@@ -33,6 +33,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using OpenTween.SocialProtocol;
 
 namespace OpenTween.Models
 {
@@ -168,11 +169,11 @@ public PostFilterRule[] FilterArray
             }
         }
 
-        public override Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
             var homeTab = TabInformations.GetInstance().HomeTab;
 
-            return homeTab.RefreshAsync(tw, backward, progress);
+            return homeTab.RefreshAsync(account, backward, progress);
         }
     }
 }

OpenTween/Models/HomeTabModel.cs

@@ -35,6 +35,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -71,13 +73,16 @@ public override void AddPostQueue(PostClass post)
             this.UpdateTimelineSpeed(post.CreatedAt);
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             progress.Report(string.Format(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText5, backward ? -1 : 1));
 
             var firstLoad = !this.IsFirstLoadCompleted;
 
-            await tw.GetHomeTimelineApi(this, backward, firstLoad)
+            await twAccount.Legacy.GetHomeTimelineApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             // 新着時未読クリア

OpenTween/Models/ListTimelineTabModel.cs

@@ -33,6 +33,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -55,16 +57,19 @@ public ListTimelineTabModel(string tabName, ListElement list)
             this.ListInfo = list;
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             if (this.ListInfo == null || this.ListInfo.Id == 0)
                 return;
 
             progress.Report("List refreshing...");
 
             var firstLoad = !this.IsFirstLoadCompleted;
 
-            await tw.GetListStatus(this, backward, firstLoad)
+            await twAccount.Legacy.GetListStatus(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();

OpenTween/Models/LocalSearchTabModel.cs

@@ -26,6 +26,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using OpenTween.SocialProtocol;
 
 namespace OpenTween.Models
 {
@@ -41,7 +42,7 @@ public LocalSearchTabModel(string tabName)
         {
         }
 
-        public override Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
             => Task.CompletedTask; // 何もしない
     }
 }

OpenTween/Models/MentionsTabModel.cs

@@ -33,6 +33,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -57,13 +59,16 @@ public MentionsTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             progress.Report(string.Format(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText4, backward ? -1 : 1));
 
             var firstLoad = !this.IsFirstLoadCompleted;
 
-            await tw.GetMentionsTimelineApi(this, backward, firstLoad)
+            await twAccount.Legacy.GetMentionsTimelineApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();

OpenTween/Models/MuteTabModel.cs

@@ -26,6 +26,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using OpenTween.SocialProtocol;
 
 namespace OpenTween.Models
 {
@@ -48,7 +49,7 @@ public override void AddPostQueue(PostClass post)
         {
         }
 
-        public override Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
             => Task.CompletedTask; // 何もしない
     }
 }

OpenTween/Models/PublicSearchTabModel.cs

@@ -33,6 +33,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -77,16 +79,19 @@ public PublicSearchTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             if (MyCommon.IsNullOrEmpty(this.SearchWords))
                 return;
 
             progress.Report("Search refreshing...");
 
             var firstLoad = !this.IsFirstLoadCompleted;
 
-            await tw.GetSearch(this, backward, firstLoad)
+            await twAccount.Legacy.GetSearch(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();

OpenTween/Models/RelatedPostsTabModel.cs

@@ -33,6 +33,8 @@
 using System.Text;
 using System.Threading.Tasks;
 using OpenTween.Setting;
+using OpenTween.SocialProtocol;
+using OpenTween.SocialProtocol.Twitter;
 
 namespace OpenTween.Models
 {
@@ -43,26 +45,29 @@ public override MyCommon.TabUsageType TabType
 
         public override bool IsPermanentTabType => false;
 
+        public override Guid? SourceAccountId { get; }
+
         public PostClass TargetPost { get; }
 
-        public RelatedPostsTabModel(string tabName, PostClass targetPost)
+        public RelatedPostsTabModel(string tabName, Guid accountId, PostClass targetPost)
             : base(tabName)
         {
+            this.SourceAccountId = accountId;
             this.TargetPost = targetPost;
         }
 
-        public Task RefreshAsync(Twitter tw, IProgress<string> progress)
-            => this.RefreshAsync(tw, false, progress);
-
-        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
+        public override async Task RefreshAsync(ISocialAccount account, bool backward, IProgress<string> progress)
         {
+            if (account is not TwitterAccount twAccount)
+                throw new ArgumentException($"Invalid account type: {account.GetType()}", nameof(account));
+
             try
             {
                 progress.Report("Related refreshing...");
 
                 var firstLoad = !this.IsFirstLoadCompleted;
 
-                await tw.GetRelatedResult(this, firstLoad)
+                await twAccount.Legacy.GetRelatedResult(this, firstLoad)
                     .ConfigureAwait(false);
 
                 if (firstLoad)

OpenTween/Models/TabInformations.cs

@@ -133,9 +133,14 @@ public bool AddTab(TabModel tab)
                 if (this.Tabs.Contains(tab.TabName))
                     return false;
 
+                var isFirstTab = this.Tabs.Count == 0;
+
                 this.tabs.Add(tab);
                 tab.SetSortMode(this.SortMode, this.SortOrder);
 
+                if (isFirstTab)
+                    this.SelectTab(tab.TabName);
+
                 return true;
             }
         }