Use the new Merge scheme for Patch

`merges` field has moved one level up, from `revisions` to `patch` itself

Signed-off-by: xphoniex <dj.2dixx@gmail.com>
This commit is contained in:
xphoniex
2023-05-29 12:14:17 +00:00
parent 39874d8d51
commit 824c719313
2 changed files with 29 additions and 13 deletions
+7 -5
View File
@@ -158,11 +158,13 @@
type: "review",
inner: [rev.id, review.author.id, review],
})),
...rev.merges.map<TimelineMerge>(inner => ({
timestamp: inner.timestamp,
type: "merge",
inner,
})),
...patch.merges
.filter(merge => merge.revision === rev.id)
.map<TimelineMerge>(inner => ({
timestamp: inner.timestamp,
type: "merge",
inner,
})),
...rev.discussions
.filter(comment => !comment.replyTo)
.map<TimelineThread>(thread => ({