Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix discussion unreadCount could be higher than commentCount #2195

Merged
merged 2 commits into from
Jun 20, 2020
Merged

Fix discussion unreadCount could be higher than commentCount #2195

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eccc25c
Fix discussion unreadCount being higher than commentCount
w-4 Jun 11, 2020
c02c25a
Add comment explaining changes
askvortsov1 Jun 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion js/src/common/models/Discussion.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ Object.assign(Discussion.prototype, {
const user = app.session.user;

if (user && user.markedAllAsReadAt() < this.lastPostedAt()) {
return Math.max(0, this.lastPostNumber() - (this.lastReadPostNumber() || 0));
const unreadCount = Math.max(0, this.lastPostNumber() - (this.lastReadPostNumber() || 0));
// If posts have been deleted, it's possible that the unread count could exceed the
// actual post count. As such, we take the min of the two to ensure this isn't an issue.
return Math.min(unreadCount, this.commentCount());
}

return 0;
Expand Down