diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequest.kt b/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequest.kt index dd3cbe45b141..f7fa856e2b0a 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequest.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequest.kt @@ -39,7 +39,7 @@ class GHPullRequest(id: String, val headRefOid: String, val headRepository: GHRepository?, override val reactions: GHReactable.ReactionConnection) - : GHPullRequestShort(id, url, number, title, state, isDraft, author, createdAt, updatedAt, isReadByViewer, + : GHPullRequestShort(id, url, number, title, state, isDraft, author, createdAt, updatedAt, assignees, labels, reviewRequests, reviewThreads, reviews, mergeable, viewerCanUpdate, viewerCanReact, viewerDidAuthor, reactions) { diff --git a/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestShort.kt b/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestShort.kt index 4977bfc6af9e..5dd2d25482c2 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestShort.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/api/data/pullrequest/GHPullRequestShort.kt @@ -20,7 +20,6 @@ open class GHPullRequestShort(id: String, val author: GHActor?, val createdAt: Date, val updatedAt: Date, - val isReadByViewer: Boolean, @JsonProperty("assignees") assignees: GraphQLNodesDTO, @JsonProperty("labels") labels: GraphQLNodesDTO, @JsonProperty("reviewRequests") reviewRequests: GraphQLNodesDTO, @@ -66,7 +65,6 @@ open class GHPullRequestShort(id: String, if (author != other.author) return false if (createdAt != other.createdAt) return false if (updatedAt != other.updatedAt) return false - if (isReadByViewer != other.isReadByViewer) return false if (mergeable != other.mergeable) return false if (viewerCanUpdate != other.viewerCanUpdate) return false if (viewerDidAuthor != other.viewerDidAuthor) return false @@ -90,7 +88,6 @@ open class GHPullRequestShort(id: String, result = 31 * result + (author?.hashCode() ?: 0) result = 31 * result + createdAt.hashCode() result = 31 * result + updatedAt.hashCode() - result = 31 * result + isReadByViewer.hashCode() result = 31 * result + mergeable.hashCode() result = 31 * result + viewerCanUpdate.hashCode() result = 31 * result + viewerDidAuthor.hashCode() diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/service/GHPRPersistentInteractionState.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/service/GHPRPersistentInteractionState.kt index 9fad2fef4b8f..470b0d22afb7 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/service/GHPRPersistentInteractionState.kt +++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/service/GHPRPersistentInteractionState.kt @@ -27,7 +27,7 @@ class GHPRPersistentInteractionState : SerializablePersistentStateComponent= pr.updatedAt) || pr.isReadByViewer + val isSeen = (lastSeen != null && Date(lastSeen) >= pr.updatedAt) // TODO: Revise this check when adding a new-in-timeline line. // Cleanup state entries for PRs that have updates