Merge pull request #315 from opentween/post-unread-state

起動時の初回読込と新規タブの初回読込で既読状態にする条件を揃える
opentween · Feb 6, 2024 · e1d598c · e1d598c
2 parents 241cc09 + 0dd7ff5
commit e1d598c
Show file tree

Hide file tree

Showing 16 changed files with 135 additions and 157 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,7 @@
 
 ==== Unreleased
  * CHG: 設定画面でのアカウント一覧の表示形式を変更
+ * CHG: 新規タブの初回に読み込まれた発言を既読状態にする（起動時の初回の読み込みと同じ動作となる）
 
 ==== Ver 3.13.0(2024/01/27)
  * NEW: Cookie使用時のReplyタブの更新に対応（/statuses/mentions_timeline.json 廃止に伴う対応）

diff --git a/OpenTween/Models/DirectMessagesTabModel.cs b/OpenTween/Models/DirectMessagesTabModel.cs
@@ -53,21 +53,20 @@ public DirectMessagesTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report(string.Format(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText8, backward ? -1 : 1));
 
-            await tw.GetDirectMessageEvents(read, this, backward)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetDirectMessageEvents(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText11);
         }
     }

diff --git a/OpenTween/Models/FavoritesTabModel.cs b/OpenTween/Models/FavoritesTabModel.cs
@@ -57,21 +57,20 @@ public FavoritesTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText19);
 
-            await tw.GetFavoritesApi(read, this, backward)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetFavoritesApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText20);
         }
     }

diff --git a/OpenTween/Models/FilterTabModel.cs b/OpenTween/Models/FilterTabModel.cs
@@ -171,11 +171,11 @@ public PostFilterRule[] FilterArray
             }
         }
 
-        public override Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
             var homeTab = TabInformations.GetInstance().HomeTab;
 
-            return homeTab.RefreshAsync(tw, backward, startup, progress);
+            return homeTab.RefreshAsync(tw, backward, progress);
         }
     }
 }
diff --git a/OpenTween/Models/HomeTabModel.cs b/OpenTween/Models/HomeTabModel.cs
@@ -71,17 +71,13 @@ public override void AddPostQueue(PostClass post)
             this.UpdateTimelineSpeed(post.CreatedAt);
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report(string.Format(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText5, backward ? -1 : 1));
 
-            await tw.GetHomeTimelineApi(read, this, backward, startup)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetHomeTimelineApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             // 新着時未読クリア
@@ -90,6 +86,9 @@ await tw.GetHomeTimelineApi(read, this, backward, startup)
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText1);
         }
 

diff --git a/OpenTween/Models/ListTimelineTabModel.cs b/OpenTween/Models/ListTimelineTabModel.cs
@@ -55,24 +55,23 @@ public ListTimelineTabModel(string tabName, ListElement list)
             this.ListInfo = list;
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
             if (this.ListInfo == null || this.ListInfo.Id == 0)
                 return;
 
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report("List refreshing...");
 
-            await tw.GetListStatus(read, this, backward, startup)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetListStatus(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report("List refreshed");
         }
     }

diff --git a/OpenTween/Models/LocalSearchTabModel.cs b/OpenTween/Models/LocalSearchTabModel.cs
@@ -41,7 +41,7 @@ public LocalSearchTabModel(string tabName)
         {
         }
 
-        public override Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
             => Task.CompletedTask; // 何もしない
     }
 }
diff --git a/OpenTween/Models/MentionsTabModel.cs b/OpenTween/Models/MentionsTabModel.cs
@@ -57,21 +57,20 @@ public MentionsTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report(string.Format(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText4, backward ? -1 : 1));
 
-            await tw.GetMentionsTimelineApi(read, this, backward, startup)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetMentionsTimelineApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report(Properties.Resources.GetTimelineWorker_RunWorkerCompletedText9);
         }
     }

diff --git a/OpenTween/Models/MuteTabModel.cs b/OpenTween/Models/MuteTabModel.cs
@@ -48,7 +48,7 @@ public override void AddPostQueue(PostClass post)
         {
         }
 
-        public override Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
             => Task.CompletedTask; // 何もしない
     }
 }
diff --git a/OpenTween/Models/PublicSearchTabModel.cs b/OpenTween/Models/PublicSearchTabModel.cs
@@ -77,24 +77,23 @@ public PublicSearchTabModel(string tabName)
         {
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
             if (MyCommon.IsNullOrEmpty(this.SearchWords))
                 return;
 
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report("Search refreshing...");
 
-            await tw.GetSearch(read, this, backward)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetSearch(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report("Search refreshed");
         }
 
@@ -107,6 +106,7 @@ public void ResetFetchIds()
             this.OldestId = null;
             this.CursorTop = null;
             this.CursorBottom = null;
+            this.IsFirstLoadCompleted = false;
         }
     }
 }
diff --git a/OpenTween/Models/RelatedPostsTabModel.cs b/OpenTween/Models/RelatedPostsTabModel.cs
@@ -51,24 +51,23 @@ public RelatedPostsTabModel(string tabName, PostClass targetPost)
             this.TargetPost = targetPost;
         }
 
-        public Task RefreshAsync(Twitter tw, bool startup, IProgress<string> progress)
-            => this.RefreshAsync(tw, false, startup, progress);
+        public Task RefreshAsync(Twitter tw, IProgress<string> progress)
+            => this.RefreshAsync(tw, false, progress);
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             try
             {
                 progress.Report("Related refreshing...");
 
-                await tw.GetRelatedResult(read, this)
+                var firstLoad = !this.IsFirstLoadCompleted;
+
+                await tw.GetRelatedResult(this, firstLoad)
                     .ConfigureAwait(false);
 
+                if (firstLoad)
+                    this.IsFirstLoadCompleted = true;
+
                 progress.Report("Related refreshed");
             }
             finally

diff --git a/OpenTween/Models/TabModel.cs b/OpenTween/Models/TabModel.cs
@@ -55,6 +55,8 @@ public abstract class TabModel
 
         public SortOrder SortOrder { get; private set; }
 
+        public bool IsFirstLoadCompleted { get; protected set; } = false;
+
         public abstract MyCommon.TabUsageType TabType { get; }
 
         public virtual ConcurrentDictionary<PostId, PostClass> Posts
@@ -128,7 +130,7 @@ public int UpdateCount
         protected TabModel(string tabName)
             => this.TabName = tabName;
 
-        public abstract Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress);
+        public abstract Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress);
 
         private readonly record struct TemporaryId(
             PostId StatusId,

diff --git a/OpenTween/Models/UserTimelineTabModel.cs b/OpenTween/Models/UserTimelineTabModel.cs
@@ -57,24 +57,23 @@ public UserTimelineTabModel(string tabName, string screenName)
             this.ScreenName = screenName;
         }
 
-        public override async Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
+        public override async Task RefreshAsync(Twitter tw, bool backward, IProgress<string> progress)
         {
             if (MyCommon.IsNullOrEmpty(this.ScreenName))
                 return;
 
-            bool read;
-            if (!SettingManager.Instance.Common.UnreadManage)
-                read = true;
-            else
-                read = startup && SettingManager.Instance.Common.Read;
-
             progress.Report("UserTimeline refreshing...");
 
-            await tw.GetUserTimelineApi(read, this, backward)
+            var firstLoad = !this.IsFirstLoadCompleted;
+
+            await tw.GetUserTimelineApi(this, backward, firstLoad)
                 .ConfigureAwait(false);
 
             TabInformations.GetInstance().DistributePosts();
 
+            if (firstLoad)
+                this.IsFirstLoadCompleted = true;
+
             progress.Report("UserTimeline refreshed");
         }
     }

diff --git a/OpenTween/Tween.cs b/OpenTween/Tween.cs
@@ -1302,7 +1302,7 @@ private async Task RefreshTabAsync(TabModel tab, bool backward)
             try
             {
                 this.RefreshTasktrayIcon();
-                await Task.Run(() => tab.RefreshAsync(this.tw, backward, this.initial, this.workerProgress));
+                await Task.Run(() => tab.RefreshAsync(this.tw, backward, this.workerProgress));
                 tab.IncrementUpdateCount();
             }
             catch (WebApiException ex)
@@ -1730,12 +1730,6 @@ private async Task RetweetAsyncInternal(IProgress<string> p, CancellationToken c
             if (!CheckAccountValid())
                 throw new WebApiException("Auth error. Check your account");
 
-            bool read;
-            if (!this.settings.Common.UnreadManage)
-                read = true;
-            else
-                read = this.initial && this.settings.Common.Read;
-
             p.Report("Posting...");
 
             var posts = new List<PostClass>();
@@ -1744,7 +1738,7 @@ await Task.Run(async () =>
             {
                 foreach (var statusId in statusIds)
                 {
-                    var post = await this.tw.PostRetweet(statusId, read).ConfigureAwait(false);
+                    var post = await this.tw.PostRetweet(statusId).ConfigureAwait(false);
                     if (post != null) posts.Add(post);
                 }
             });
@@ -5217,7 +5211,7 @@ private async Task GoInReplyToPostTree()
             {
                 try
                 {
-                    var post = await this.tw.GetStatusApi(false, currentPost.StatusId.ToTwitterStatusId());
+                    var post = await this.tw.GetStatusApi(currentPost.StatusId.ToTwitterStatusId());
 
                     currentPost = currentPost with
                     {
@@ -5265,9 +5259,8 @@ from post in tab.Posts.Values
                 {
                     await Task.Run(async () =>
                     {
-                        var post = await this.tw.GetStatusApi(false, currentPost.InReplyToStatusId.ToTwitterStatusId())
+                        var post = await this.tw.GetStatusApi(currentPost.InReplyToStatusId.ToTwitterStatusId())
                             .ConfigureAwait(false);
-                        post.IsRead = true;
 
                         this.statuses.AddPost(post);
                         this.statuses.DistributePosts();
@@ -9182,7 +9175,7 @@ public async Task OpenRelatedTab(PostId statusId)
             {
                 try
                 {
-                    post = await this.tw.GetStatusApi(false, statusId.ToTwitterStatusId());
+                    post = await this.tw.GetStatusApi(statusId.ToTwitterStatusId());
                 }
                 catch (WebApiException ex)
                 {

diff --git a/OpenTween/TweetDetailsView.cs b/OpenTween/TweetDetailsView.cs
@@ -363,15 +363,14 @@ private async Task<string> CreateQuoteTweetHtml(PostId statusId, bool isReply)
             {
                 try
                 {
-                    post = await this.Owner.TwitterInstance.GetStatusApi(false, statusId.ToTwitterStatusId())
+                    post = await this.Owner.TwitterInstance.GetStatusApi(statusId.ToTwitterStatusId())
                         .ConfigureAwait(false);
                 }
                 catch (WebApiException ex)
                 {
                     return FormatQuoteTweetHtml(statusId, WebUtility.HtmlEncode($"Err:{ex.Message}(GetStatus)"), isReply);
                 }
 
-                post.IsRead = true;
                 if (!TabInformations.GetInstance().AddQuoteTweet(post))
                     return FormatQuoteTweetHtml(statusId, "This Tweet is unavailable.", isReply);
             }