Skip to content

A platform for community discussion. Free, open, simple.

FIX: Stop publishing whisper posts to the `/latest` MessageBus channel (#38867)

Régis Hanold28962664a6f
diff --git a/app/jobs/regular/post_update_topic_tracking_state.rb b/app/jobs/regular/post_update_topic_tracking_state.rb
index c308df571a6..912a742a70c 100644
--- a/app/jobs/regular/post_update_topic_tracking_state.rb
+++ b/app/jobs/regular/post_update_topic_tracking_state.rb
@@ -19,7 +19,7 @@ module Jobs
TopicTrackingState.publish_muted(post.topic)
TopicTrackingState.publish_unread(post)
end
- TopicTrackingState.publish_latest(post.topic, post.whisper?)
+ TopicTrackingState.publish_latest(post.topic) unless post.whisper?
end
end
end
diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb
index 65a15bade3c..c0ebd689b6c 100644
--- a/app/models/topic_tracking_state.rb
+++ b/app/models/topic_tracking_state.rb
@@ -61,7 +61,7 @@ class TopicTrackingState
publish_read(topic.id, 1, topic.user)
end
- def self.publish_latest(topic, whisper = false)
+ def self.publish_latest(topic)
return unless topic.regular?
payload = {
@@ -72,15 +72,10 @@ class TopicTrackingState
payload[:tags] = topic.tags.pluck(:id).map { |id| { id: id } } if include_tags_in_report?
- message = { topic_id: topic.id, message_type: LATEST_MESSAGE_TYPE, payload: payload }
+ message = { topic_id: topic.id, message_type: LATEST_MESSAGE_TYPE, payload: }
- group_ids =
- if whisper
- [Group::AUTO_GROUPS[:staff], *SiteSetting.whispers_allowed_groups_map].flatten
- else
- secure_category_group_ids(topic)
- end
- MessageBus.publish(LATEST_MESSAGE_BUS_CHANNEL, message.as_json, group_ids: group_ids)
+ group_ids = secure_category_group_ids(topic)
+ MessageBus.publish(LATEST_MESSAGE_BUS_CHANNEL, message.as_json, group_ids:)
end
def self.unread_channel_key(user_id)
diff --git a/spec/models/topic_tracking_state_spec.rb b/spec/models/topic_tracking_state_spec.rb
index a549775bfa3..feed1aecce9 100644
--- a/spec/models/topic_tracking_state_spec.rb
+++ b/spec/models/topic_tracking_state_spec.rb
@@ -141,19 +141,15 @@ RSpec.describe TopicTrackingState do
)
end
- it "publishes whisper post to staff users and members of whisperers group" do
- whisperers_group = Fabricate(:group)
- Fabricate(:user, groups: [whisperers_group])
- Fabricate(:topic_user_watching, topic: topic, user: user)
- SiteSetting.whispers_allowed_groups = "#{whisperers_group.id}"
+ it "does not publish whisper posts to /latest" do
post.update!(post_type: Post.types[:whisper])
- message =
- MessageBus
- .track_publish("/latest") { TopicTrackingState.publish_latest(post.topic, true) }
- .first
+ messages =
+ MessageBus.track_publish("/latest") do
+ Jobs::PostUpdateTopicTrackingState.new.execute(post_id: post.id)
+ end
- expect(message.group_ids).to contain_exactly(whisperers_group.id, Group::AUTO_GROUPS[:staff])
+ expect(messages).to be_empty
end
end