IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Differentiate notification type for directly vs indirectly watched topic (#19433)

Browse Source 
When user is watching category or tag (watching or watching first post) notifications are moved to other tab.

To achieve that and distinguish between post create to directly watched topics and indirectly watched topics, new notification type called `watching_category_or_tag` was introduced.
This commit is contained in:
Krzysztof Kotlarek
2022-12-14 10:22:26 +11:00
committed by GitHub
parent 4c20b54899
commit aa3a9b6fea
9 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/requests/api/schemas/json/site_response.json
View File

@@ -35,6 +35,9 @@
"posted": {
"type": "integer"
},
"watching_category_or_tag": {
"type": "integer"
},
"moved_post": {
"type": "integer"
},
@@ -124,6 +127,7 @@
"invited_to_private_message",
"invitee_accepted",
"posted",
"watching_category_or_tag",
"moved_post",
"linked",
"granted_badge",

12
spec/services/post_alerter_spec.rb
View File

@@ -1395,10 +1395,10 @@ RSpec.describe PostAlerter do
whispered_post = Fabricate(:post, user: Fabricate(:admin), topic: topic, post_type: Post.types[:whisper])
expect {
PostAlerter.post_created(whispered_post)
}.to add_notification(admin, :posted)
}.to add_notification(admin, :watching_category_or_tag)
expect {
PostAlerter.post_created(whispered_post)
}.not_to add_notification(user, :posted)
}.not_to add_notification(user, :watching_category_or_tag)
end
it "notifies a staged user about a private post, but only if the user has access" do
@@ -1424,8 +1424,8 @@ RSpec.describe PostAlerter do
expect {
PostAlerter.post_created(post)
}.to add_notification(staged_member, :posted)
.and not_add_notification(staged_non_member, :posted)
}.to add_notification(staged_member, :watching_category_or_tag)
.and not_add_notification(staged_non_member, :watching_category_or_tag)
end
it "does not update existing unread notification" do
@@ -1622,7 +1622,7 @@ RSpec.describe PostAlerter do
end
context "with :watching notification level" do
include_examples "tag user with notification level", :watching, :posted
include_examples "tag user with notification level", :watching, :watching_category_or_tag
end
context "with :watching_first_post notification level" do
@@ -2089,7 +2089,7 @@ RSpec.describe PostAlerter do
notification = Notification.last
expect(notification.user).to eq(user)
expect(notification.notification_type).to eq(Notification.types[:posted])
expect(notification.notification_type).to eq(Notification.types[:watching_category_or_tag])
expect(notification.topic).to eq(post.topic)
expect(notification.post_number).to eq(1)
end