Merge pull request #2482 from github/fixes/2481-PullRequest.timelineI…

…tems Use PullRequest.timelineItems instead of PullRequest.timeline
github · Mar 19, 2020 · 7884364 · 7884364
2 parents ab1e2b1 + d66aac3
commit 7884364
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs b/src/GitHub.InlineReviews/Services/PullRequestSessionService.cs
@@ -306,6 +306,7 @@ public virtual Task<PullRequestDetailModel> ReadPullRequestDetail(HostAddress ad
         async Task<PullRequestDetailModel> ReadPullRequestDetailWithResolved(HostAddress address, string owner,
             string name, int number, bool refresh)
         {
+            var itemTypes = new[] { PullRequestTimelineItemsItemType.IssueComment, PullRequestTimelineItemsItemType.PullRequestCommit };
 
             if (readPullRequestWithResolved == null)
             {
@@ -384,22 +385,22 @@ async Task<PullRequestDetailModel> ReadPullRequestDetailWithResolved(HostAddress
                                 AvatarUrl = review.Author.AvatarUrl(null)
                             }
                         }).ToList(),
-                        Timeline = pr.Timeline(null, null, null, null, null).AllPages().Select(item => item.Switch<object>(when =>
-                            when.Commit(commit => new CommitModel
+                        Timeline = pr.TimelineItems(null, null, null, null, itemTypes, null, null).AllPages().Select(item => item.Switch<object>(when =>
+                            when.PullRequestCommit(commit => new CommitModel
                             {
-                                AbbreviatedOid = commit.AbbreviatedOid,
+                                AbbreviatedOid = commit.Commit.AbbreviatedOid,
                                 Author = new CommitActorModel
                                 {
-                                    Name = commit.Author.Name,
-                                    Email = commit.Author.Email,
-                                    User = commit.Author.User != null ? new ActorModel
+                                    Name = commit.Commit.Author.Name,
+                                    Email = commit.Commit.Author.Email,
+                                    User = commit.Commit.Author.User != null ? new ActorModel
                                     {
-                                        Login = commit.Author.User.Login,
-                                        AvatarUrl = commit.Author.User.AvatarUrl(null),
+                                        Login = commit.Commit.Author.User.Login,
+                                        AvatarUrl = commit.Commit.Author.User.AvatarUrl(null),
                                     } : null
                                 },
-                                MessageHeadline = commit.MessageHeadline,
-                                Oid = commit.Oid,
+                                MessageHeadline = commit.Commit.MessageHeadline,
+                                Oid = commit.Commit.Oid,
                             }).IssueComment(comment => new CommentModel
                             {
                                 Author = new ActorModel
@@ -491,6 +492,8 @@ async Task<PullRequestDetailModel> ReadPullRequestDetailWithResolved(HostAddress
         async Task<PullRequestDetailModel> ReadPullRequestDetailWithoutResolved(HostAddress address, string owner,
             string name, int number, bool refresh)
         {
+            var itemTypes = new[] { PullRequestTimelineItemsItemType.IssueComment, PullRequestTimelineItemsItemType.PullRequestCommit };
+
             if (readPullRequestWithoutResolved == null)
             {
                 readPullRequestWithoutResolved = new Query()
@@ -563,21 +566,21 @@ async Task<PullRequestDetailModel> ReadPullRequestDetailWithoutResolved(HostAddr
                                 Url = comment.Url,
                             }).ToList(),
                         }).ToList(),
-                        Timeline = pr.Timeline(null, null, null, null, null).AllPages().Select(item => item.Switch<object>(when =>
-                            when.Commit(commit => new CommitModel
+                        Timeline = pr.TimelineItems(null, null, null, null, itemTypes, null, null).AllPages().Select(item => item.Switch<object>(when =>
+                            when.PullRequestCommit(commit => new CommitModel
                             {
-                                AbbreviatedOid = commit.AbbreviatedOid,
+                                AbbreviatedOid = commit.Commit.AbbreviatedOid,
                                 Author = new CommitActorModel {
-                                    Name = commit.Author.Name,
-                                    Email = commit.Author.Email,
-                                    User = commit.Author.User != null ? new ActorModel
+                                    Name = commit.Commit.Author.Name,
+                                    Email = commit.Commit.Author.Email,
+                                    User = commit.Commit.Author.User != null ? new ActorModel
                                     {
-                                        Login = commit.Author.User.Login,
-                                        AvatarUrl = commit.Author.User.AvatarUrl(null),
+                                        Login = commit.Commit.Author.User.Login,
+                                        AvatarUrl = commit.Commit.Author.User.AvatarUrl(null),
                                     } : null
                                 },
-                                MessageHeadline = commit.MessageHeadline,
-                                Oid = commit.Oid,
+                                MessageHeadline = commit.Commit.MessageHeadline,
+                                Oid = commit.Commit.Oid,
                             }).IssueComment(comment => new CommentModel
                             {
                                 Author = new ActorModel