osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FIX: count new and unread respects muted categories (#10131)

Browse Source 
* FIX: count new and unread respects muted categories

countCategoryByState function should take categories muted by the user into consideration
This commit is contained in:
Krzysztof Kotlarek
2020-07-16 12:24:51 +10:00
committed by GitHub
parent 8ceb7f490f
commit d9475b70c7
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/app/models/topic-tracking-state.js
+10 -5
View File
@@ -408,26 +408,31 @@ const TopicTrackingState = EmberObject.extend({
return new Set(result);
},
countCategoryByState(fn, categoryId, tagId) {
countCategoryByState(type, categoryId, tagId) {
const subcategoryIds = this.getSubCategoryIds(categoryId);
const mutedCategoryIds =
this.currentUser && this.currentUser.muted_category_ids;
return _.chain(this.states)
.filter(fn)
.filter(type === "new" ? isNew : isUnread)
.filter(
topic =>
topic.archetype !== "private_message" &&
!topic.deleted &&
(!categoryId || subcategoryIds.has(topic.category_id)) &&
(!tagId || (topic.tags && topic.tags.indexOf(tagId) > -1))
(!tagId || (topic.tags && topic.tags.indexOf(tagId) > -1)) &&
(type !== "new" ||
!mutedCategoryIds ||
mutedCategoryIds.indexOf(topic.category_id) === -1)
)
.value().length;
},
countNew(categoryId, tagId) {
return this.countCategoryByState(isNew, categoryId, tagId);
return this.countCategoryByState("new", categoryId, tagId);
},
countUnread(categoryId, tagId) {
return this.countCategoryByState(isUnread, categoryId, tagId);
return this.countCategoryByState("unread", categoryId, tagId);
},
countTags(tags) {