Added activities for starred threads

When starred threads receive new messages, users now get a similar
notification as mentioned notes.

And related to this, sending a message to a thread (or creating a new
thread) results in automatically subscribing to the thread.

Author: dutow

app/controllers/activities_controller.rb

@@ -7,7 +7,7 @@ def index
     @search_query = params[:q].to_s.strip
     @activities = base_scope
                     .then { |scope| apply_query(scope) }
-                    .includes(subject: [:topic, :message])
+                    .includes(subject: [:topic, { message: :sender }])
                     .order(created_at: :desc)
                     .limit(100)
     mark_shown_as_read!(@activities)
@@ -28,8 +28,13 @@ def base_scope
   def apply_query(scope)
     return scope if @search_query.blank?
 
-    scope.joins("INNER JOIN notes ON notes.id = activities.subject_id AND activities.subject_type = 'Note'")
-         .where("notes.body ILIKE ?", "%#{@search_query}%")
+    note_query = scope.joins("INNER JOIN notes ON notes.id = activities.subject_id AND activities.subject_type = 'Note'")
+                      .where("notes.body ILIKE ?", "%#{@search_query}%")
+
+    message_query = scope.joins("INNER JOIN messages ON messages.id = activities.subject_id AND activities.subject_type = 'Message'")
+                         .where("messages.body ILIKE ? OR messages.subject ILIKE ?", "%#{@search_query}%", "%#{@search_query}%")
+
+    Activity.from("(#{note_query.to_sql} UNION #{message_query.to_sql}) AS activities")
   end
 
   def mark_shown_as_read!(activities)

app/helpers/activities_helper.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ActivitiesHelper
+  def activity_type_label(activity)
+    case activity.activity_type
+    when "topic_message_received"
+      subject = activity.subject
+      if subject.is_a?(Message)
+        "New message from #{subject.sender.name}"
+      else
+        "Topic message received"
+      end
+    else
+      activity.activity_type.humanize
+    end
+  end
+end

app/models/alias.rb

@@ -9,6 +9,8 @@ class Alias < ApplicationRecord
   validates :email, presence: true
   validates :name, uniqueness: { scope: :email }
 
+  after_commit :auto_star_recent_topics, if: :saved_change_to_user_id?
+
 
   scope :by_email, ->(email) {
     where("lower(trim(email)) = lower(trim(?))", email)
@@ -92,4 +94,22 @@ def contributor_badge
     end
   end
 
+  private
+
+  def auto_star_recent_topics
+    return unless user_id.present?
+
+    one_year_ago = 1.year.ago
+
+    topic_ids = Message.joins("INNER JOIN topics ON topics.id = messages.topic_id")
+                       .where(messages: { sender_id: id })
+                       .where("topics.updated_at >= ?", one_year_ago)
+                       .distinct
+                       .pluck(:topic_id)
+
+    topic_ids.each do |topic_id|
+      TopicStar.find_or_create_by(user_id: user_id, topic_id: topic_id)
+    rescue ActiveRecord::RecordNotUnique
+    end
+  end
 end

app/services/email_ingestor.rb

@@ -51,6 +51,8 @@ def ingest_raw(raw_message, fallback_threading: false)
 
     handle_attachments(m, msg)
 
+    MessageActivityBuilder.new(msg).process!
+
     msg
   end
 

app/services/message_activity_builder.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+class MessageActivityBuilder
+  def initialize(message)
+    @message = message
+  end
+
+  def process!
+    ActiveRecord::Base.transaction do
+      auto_star_topic_for_sender
+      fan_out_to_starring_users
+    end
+  end
+
+  private
+
+  def auto_star_topic_for_sender
+    sender_user = @message.sender.user
+    return unless sender_user
+
+    TopicStar.find_or_create_by(user: sender_user, topic: @message.topic)
+  rescue ActiveRecord::RecordNotUnique
+    # Race condition - another process already created the star
+  end
+
+  def fan_out_to_starring_users
+    starring_user_ids = @message.topic.topic_stars.pluck(:user_id)
+    return if starring_user_ids.empty?
+
+    sender_user_id = @message.sender.user_id
+    payload = build_payload
+
+    starring_user_ids.each do |user_id|
+      read_at = (user_id == sender_user_id) ? Time.current : nil
+
+      Activity.create!(
+        user_id: user_id,
+        activity_type: "topic_message_received",
+        subject: @message,
+        payload: payload,
+        read_at: read_at,
+        hidden: false
+      )
+    end
+  end
+
+  def build_payload
+    {
+      topic_id: @message.topic_id,
+      message_id: @message.id
+    }
+  end
+end

app/views/activities/index.html.slim

@@ -12,26 +12,33 @@
 - if @activities.any?
   .activities-list
     - @activities.each do |activity|
-      - note = activity.subject if activity.subject_type == "Note"
+      - subject = activity.subject
       .activity-card class=("is-unread" if activity.read_at.nil?)
         .activity-meta
-          span.activity-type = activity.activity_type.humanize
+          span.activity-type = activity_type_label(activity)
           span.activity-time title=absolute_time_display(activity.created_at) = smart_time_display(activity.created_at)
           - if activity.read_at.nil?
             span.activity-unread-badge Unread
 
-        - if note
+        - if subject.is_a?(Note)
           .activity-body
             .activity-title
-              = link_to(note.topic.title, topic_path(note.topic, anchor: note.message_id ? message_dom_id(note.message) : "thread-notes"))
-            .activity-snippet = truncate(note.body, length: 160)
-            - if note.note_tags.any?
+              = link_to(subject.topic.title, topic_path(subject.topic, anchor: subject.message_id ? message_dom_id(subject.message) : "thread-notes"))
+            .activity-snippet = truncate(subject.body, length: 160)
+            - if subject.note_tags.any?
               .activity-tags
-                - note.note_tags.each do |tag|
+                - subject.note_tags.each do |tag|
                   span.note-tag ##{tag.tag}
-            - if current_user.id == note.author_id
+            - if current_user.id == subject.author_id
               .activity-actions
-                = button_to "Delete note", note_path(note), method: :delete, class: "note-delete-button", form: { data: { turbo_confirm: "Delete this note?" } }
+                = button_to "Delete note", note_path(subject), method: :delete, class: "note-delete-button", form: { data: { turbo_confirm: "Delete this note?" } }
+        - elsif subject.is_a?(Message)
+          .activity-body
+            .activity-title
+              = link_to(subject.topic.title, topic_path(subject.topic, anchor: message_dom_id(subject)))
+            .activity-snippet
+              strong> = subject.subject
+              = truncate(subject.body, length: 140)
         - else
           .activity-body
             span.activity-missing Content not available anymore.

db/migrate/20260110175026_auto_star_topics_for_existing_users.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class AutoStarTopicsForExistingUsers < ActiveRecord::Migration[8.0]
+  def up
+    one_year_ago = 1.year.ago
+
+    execute <<-SQL
+      INSERT INTO topic_stars (user_id, topic_id, created_at, updated_at)
+      SELECT DISTINCT
+        aliases.user_id,
+        messages.topic_id,
+        NOW(),
+        NOW()
+      FROM messages
+      INNER JOIN aliases ON aliases.id = messages.sender_id
+      INNER JOIN topics ON topics.id = messages.topic_id
+      WHERE aliases.user_id IS NOT NULL
+        AND topics.updated_at >= '#{one_year_ago.to_fs(:db)}'
+        AND NOT EXISTS (
+          SELECT 1 FROM topic_stars
+          WHERE topic_stars.user_id = aliases.user_id
+            AND topic_stars.topic_id = messages.topic_id
+        )
+    SQL
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -971,4 +971,131 @@ def mark_aware_until(user:, topic:, message:, timestamp:)
 
 # Leave some threads entirely new/unaware (e.g., past_topic, moderate_topic_2, contrib_topic)
 
+# Topic stars and message notifications
+puts "Creating topic stars and message notification activities..."
+
+TopicStar.create!(user: alice_user, topic: patch_topic)
+TopicStar.create!(user: bob_user, topic: patch_topic)
+TopicStar.create!(user: carol_user, topic: patch_topic)
+
+TopicStar.create!(user: alice_user, topic: rfc_topic)
+TopicStar.create!(user: carol_user, topic: rfc_topic)
+
+TopicStar.create!(user: bob_user, topic: discussion_topic)
+TopicStar.create!(user: carol_user, topic: discussion_topic)
+TopicStar.create!(user: dave_user, topic: discussion_topic)
+
+TopicStar.create!(user: alice_user, topic: recent_topic)
+TopicStar.create!(user: dave_user, topic: recent_topic)
+
+Activity.create!(
+  user: alice_user,
+  activity_type: "topic_message_received",
+  subject: msg2,
+  payload: { topic_id: patch_topic.id, message_id: msg2.id },
+  read_at: nil,
+  created_at: msg2.created_at,
+  updated_at: msg2.created_at
+)
+
+Activity.create!(
+  user: bob_user,
+  activity_type: "topic_message_received",
+  subject: msg3,
+  payload: { topic_id: patch_topic.id, message_id: msg3.id },
+  read_at: timestamp_now,
+  created_at: msg3.created_at,
+  updated_at: msg3.created_at
+)
+
+Activity.create!(
+  user: carol_user,
+  activity_type: "topic_message_received",
+  subject: msg3,
+  payload: { topic_id: patch_topic.id, message_id: msg3.id },
+  read_at: nil,
+  created_at: msg3.created_at,
+  updated_at: msg3.created_at
+)
+
+Activity.create!(
+  user: alice_user,
+  activity_type: "topic_message_received",
+  subject: rfc_msg2,
+  payload: { topic_id: rfc_topic.id, message_id: rfc_msg2.id },
+  read_at: timestamp_now,
+  created_at: rfc_msg2.created_at,
+  updated_at: rfc_msg2.created_at
+)
+
+Activity.create!(
+  user: carol_user,
+  activity_type: "topic_message_received",
+  subject: rfc_msg2,
+  payload: { topic_id: rfc_topic.id, message_id: rfc_msg2.id },
+  read_at: nil,
+  created_at: rfc_msg2.created_at,
+  updated_at: rfc_msg2.created_at
+)
+
+Activity.create!(
+  user: bob_user,
+  activity_type: "topic_message_received",
+  subject: disc_msg3,
+  payload: { topic_id: discussion_topic.id, message_id: disc_msg3.id },
+  read_at: nil,
+  created_at: disc_msg3.created_at,
+  updated_at: disc_msg3.created_at
+)
+
+Activity.create!(
+  user: carol_user,
+  activity_type: "topic_message_received",
+  subject: disc_msg4,
+  payload: { topic_id: discussion_topic.id, message_id: disc_msg4.id },
+  read_at: timestamp_now,
+  created_at: disc_msg4.created_at,
+  updated_at: disc_msg4.created_at
+)
+
+Activity.create!(
+  user: dave_user,
+  activity_type: "topic_message_received",
+  subject: disc_msg4,
+  payload: { topic_id: discussion_topic.id, message_id: disc_msg4.id },
+  read_at: nil,
+  created_at: disc_msg4.created_at,
+  updated_at: disc_msg4.created_at
+)
+
+recent_reply = create_message(
+  topic: recent_topic,
+  sender: carol_alias,
+  subject: "Re: #{recent_topic.title}",
+  body: "Fresh reply to demonstrate starred topic notifications.",
+  created_at: now - 2.hours,
+  reply_to: recent_msg1,
+  message_id_suffix: "recent-3"
+)
+
+Activity.create!(
+  user: alice_user,
+  activity_type: "topic_message_received",
+  subject: recent_reply,
+  payload: { topic_id: recent_topic.id, message_id: recent_reply.id },
+  read_at: nil,
+  created_at: recent_reply.created_at,
+  updated_at: recent_reply.created_at
+)
+
+Activity.create!(
+  user: dave_user,
+  activity_type: "topic_message_received",
+  subject: recent_reply,
+  payload: { topic_id: recent_topic.id, message_id: recent_reply.id },
+  read_at: nil,
+  created_at: recent_reply.created_at,
+  updated_at: recent_reply.created_at
+)
+
 puts "Development seed data loaded."

db/seeds.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :activity do
+    association :user
+    association :subject, factory: :note
+    activity_type { "note_created" }
+    payload { {} }
+    hidden { false }
+    read_at { nil }
+
+    trait :read do
+      read_at { 1.hour.ago }
+    end
+
+    trait :hidden do
+      hidden { true }
+    end
+
+    trait :for_message do
+      association :subject, factory: :message
+      activity_type { "topic_message_received" }
+      payload do
+        {
+          topic_id: subject.topic_id,
+          message_id: subject.id
+        }
+      end
+    end
+  end
+end