Skip to content

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

FEATURE: Instantly mark nested topics as read on enter (#40176)

Mark VanLandinghamb6393a820d27
diff --git a/app/controllers/nested_topics_controller.rb b/app/controllers/nested_topics_controller.rb
index 81ecfcc8a2c..efb9da4fe50 100644
--- a/app/controllers/nested_topics_controller.rb
+++ b/app/controllers/nested_topics_controller.rb
@@ -222,11 +222,37 @@ class NestedTopicsController < ApplicationController
user_id = current_user&.id
ip = request.remote_ip
- TopicsController.defer_track_visit(topic_id, user_id) if should_track_visit?
+ if should_track_visit?
+ TopicsController.defer_track_visit(topic_id, user_id)
+ self.class.defer_mark_caught_up(topic_id, user_id) if @topic.nested_view?
+ end
TopicsController.defer_topic_view(topic_id, ip, user_id)
end
+ # Screen-tracking only advances last_read for posts the viewport renders,
+ # so collapsed/hidden replies leave a nested topic stuck unread in the
+ # sidebar. Treat the visit itself as catching up.
+ def self.defer_mark_caught_up(topic_id, user_id)
+ Scheduler::Defer.later "Nested Topic Catch Up" do
+ user = User.find_by(id: user_id)
+ topic = Topic.find_by(id: topic_id)
+ next if user.blank? || topic.blank?
+ next unless topic.nested_view?
+
+ highest =
+ if user.whisperer?
+ [topic.highest_staff_post_number.to_i, topic.highest_post_number.to_i].max
+ else
+ topic.highest_post_number.to_i
+ end
+ next if highest < 1
+
+ TopicUser.update_last_read(user, topic_id, highest, 0, 0)
+ Notification.mark_posts_read(user, topic_id, (1..highest).to_a)
+ end
+ end
+
def should_track_visit?
!!((!request.format.json? || params[:track_visit]) && current_user)
end
diff --git a/spec/requests/nested_topics_controller_spec.rb b/spec/requests/nested_topics_controller_spec.rb
index d6770ae9d49..0f825dd0bb3 100644
--- a/spec/requests/nested_topics_controller_spec.rb
+++ b/spec/requests/nested_topics_controller_spec.rb
@@ -1293,6 +1293,58 @@ RSpec.describe NestedTopicsController, type: :request do
expect(TopicUser.count).to eq(topic_user_count)
end
+
+ describe "catching up on visit" do
+ fab!(:reader) { Fabricate(:user, refresh_auto_groups: true) }
+
+ before do
+ Fabricate(:nested_topic, topic: topic)
+ topic.update!(highest_post_number: 2, highest_staff_post_number: 2)
+ end
+
+ it "advances last_read_post_number to highest_post_number for a nested topic" do
+ sign_in(reader)
+ get show_url(topic), params: { track_visit: true }
+ expect(response.status).to eq(200)
+
+ Scheduler::Defer.do_all_work
+
+ topic_user = TopicUser.find_by(topic: topic, user: reader)
+ expect(topic_user.last_read_post_number).to eq(2)
+ end
+
+ it "marks the topic's unread notifications as read" do
+ reply_notification =
+ Fabricate(
+ :replied_notification,
+ user: reader,
+ topic: topic,
+ post: root_reply,
+ read: false,
+ )
+
+ sign_in(reader)
+ get show_url(topic), params: { track_visit: true }
+ expect(response.status).to eq(200)
+
+ Scheduler::Defer.do_all_work
+
+ expect(reply_notification.reload.read).to eq(true)
+ end
+
+ it "does nothing for non-nested topics opened via /n/" do
+ flat_topic = Fabricate(:topic, user: user)
+ Fabricate(:post, topic: flat_topic, user: user, post_number: 1)
+ flat_topic.update!(highest_post_number: 1, highest_staff_post_number: 1)
+
+ sign_in(reader)
+ get show_url(flat_topic), params: { track_visit: true }
+ Scheduler::Defer.do_all_work
+
+ topic_user = TopicUser.find_by(topic: flat_topic, user: reader)
+ expect(topic_user&.last_read_post_number).to be_blank
+ end
+ end
end
describe "GET activity" do