Support for multiple mailing lists

Author: dutow

Makefile

@@ -1,7 +1,7 @@
 ENGINE  ?= $(shell command -v podman >/dev/null 2>&1 && echo podman || echo docker)
 COMPOSE ?= $(ENGINE) compose --env-file .env.development -f compose.dev.yml
 
-.PHONY: dev dev-detach down shell console test imap logs db-migrate db-reset db-import stats psql sim-email-once sim-email-stream
+.PHONY: dev dev-detach down shell console test imap logs db-migrate db-reset db-import mbox-import stats psql sim-email-once sim-email-stream
 
 dev: ## Start dev stack (foreground)
 	$(COMPOSE) up --build
@@ -44,12 +44,26 @@ db-reset: ## Drop and setup (create/migrate/seed) - stops web if running, restar
 
 db-import: ## Drop dev DB and import a public dump (env: DUMP=/path/to/public-YYYY-MM.sql.gz)
 	@if [ -z "$(DUMP)" ]; then echo "Set DUMP=/path/to/public-YYYY-MM.sql.gz"; exit 1; fi
+	@if [ -z "$(PDUMP)" ]; then echo "Set PDUMP=/path/to/private-schema-YYYY-MM.sql.gz"; exit 1; fi
 	$(COMPOSE) exec -T db bash -lc 'psql -U $${POSTGRES_USER:-hackorum} -d postgres -c "DROP DATABASE IF EXISTS $${POSTGRES_DB:-hackorum_development};" -c "CREATE DATABASE $${POSTGRES_DB:-hackorum_development};"'
 	@if echo "$(DUMP)" | grep -qE '\.gz$$'; then \
 	  gzip -cd "$(DUMP)" | $(COMPOSE) exec -T db bash -lc 'psql -U $${POSTGRES_USER:-hackorum} -d $${POSTGRES_DB:-hackorum_development}'; \
 	else \
 	  cat "$(DUMP)" | $(COMPOSE) exec -T db bash -lc 'psql -U $${POSTGRES_USER:-hackorum} -d $${POSTGRES_DB:-hackorum_development}'; \
 	fi
+	@if echo "$(PDUMP)" | grep -qE '\.gz$$'; then \
+	  gzip -cd "$(PDUMP)" | $(COMPOSE) exec -T db bash -lc 'psql -U $${POSTGRES_USER:-hackorum} -d $${POSTGRES_DB:-hackorum_development}'; \
+	else \
+	  cat "$(PDUMP)" | $(COMPOSE) exec -T db bash -lc 'psql -U $${POSTGRES_USER:-hackorum} -d $${POSTGRES_DB:-hackorum_development}'; \
+	fi
+
+mbox-import: ## Import mbox files (env: LIST=id MBOX_DIR=/path MBOX_FILES="*.mbox" ARGS="--update-body")
+	@if [ -z "$(LIST)" ]; then echo "Set LIST=<mailing-list-identifier>"; exit 1; fi
+	@if [ -z "$(MBOX_DIR)" ]; then echo "Set MBOX_DIR=/path/to/mbox/directory"; exit 1; fi
+	@if [ -z "$(MBOX_FILES)" ]; then echo "Set MBOX_FILES='*.mbox' or specific filenames"; exit 1; fi
+	$(COMPOSE) run --rm \
+		-v $(MBOX_DIR):/import:ro,z \
+		web bash -c 'ruby script/mbox_import.rb --list $(LIST) $(ARGS) $(addprefix /import/,$(MBOX_FILES))'
 
 stats: ## Rebuild stats (env: GRANULARITY=all|daily|weekly|monthly)
 	$(COMPOSE) exec web bundle exec ruby script/build_stats.rb $${GRANULARITY:-all}

app/assets/stylesheets/components/topics.css

@@ -1020,3 +1020,26 @@ a.topic-icon {
   margin: var(--spacing-8);
   text-align: center;
 }
+
+.mailing-list-badges {
+  display: inline-flex;
+  gap: 4px;
+  margin-right: 6px;
+  vertical-align: middle;
+}
+
+.mailing-list-badge {
+  display: inline-block;
+  padding: 1px 6px;
+  font-size: 0.7rem;
+  border-radius: 3px;
+  background: var(--color-primary-3);
+  color: var(--color-text-muted);
+  white-space: nowrap;
+  line-height: 1.4;
+}
+
+.message-lists {
+  display: inline-flex;
+  gap: 4px;
+}

app/controllers/admin/mailing_lists_controller.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+class Admin::MailingListsController < Admin::BaseController
+  before_action :set_mailing_list, only: [:edit, :update]
+
+  def active_admin_section
+    :mailing_lists
+  end
+
+  def index
+    @mailing_lists = MailingList
+      .select(
+        "mailing_lists.*",
+        "(SELECT COUNT(*) FROM message_mailing_lists WHERE message_mailing_lists.mailing_list_id = mailing_lists.id) AS messages_count",
+        "(SELECT COUNT(*) FROM topic_mailing_lists WHERE topic_mailing_lists.mailing_list_id = mailing_lists.id) AS topics_count"
+      )
+      .order(:display_name)
+
+    @topic_list_distribution = TopicMailingList.connection.select_rows(<<~SQL).to_h { |c, t| [c.to_i, t.to_i] }
+      SELECT lists_count, COUNT(*) AS topic_count
+      FROM (SELECT COUNT(*) AS lists_count FROM topic_mailing_lists GROUP BY topic_id) counts
+      GROUP BY lists_count ORDER BY lists_count
+    SQL
+  end
+
+  def new
+    @mailing_list = MailingList.new
+  end
+
+  def create
+    @mailing_list = MailingList.new(mailing_list_params)
+    if @mailing_list.save
+      redirect_to admin_mailing_lists_path, notice: "Mailing list created"
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  def edit
+  end
+
+  def update
+    if @mailing_list.update(mailing_list_params)
+      redirect_to admin_mailing_lists_path, notice: "Mailing list updated"
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def set_mailing_list
+    @mailing_list = MailingList.find(params[:id])
+  end
+
+  def mailing_list_params
+    params.require(:mailing_list).permit(:identifier, :display_name, :email, :description)
+  end
+end

app/controllers/topics_controller.rb

@@ -9,11 +9,13 @@ def index
     apply_cursor_pagination(base_query)
     preload_topic_participants
     preload_commitfest_summaries
+    preload_topic_mailing_lists
     @new_topics_count = 0
     @page_cache_key = topics_page_cache_key
 
     load_visible_tags if user_signed_in?
     load_saved_searches
+    @all_mailing_lists = MailingList.order(:display_name)
 
     respond_to do |format|
       format.html
@@ -70,6 +72,17 @@ def show
     build_participants_sidebar_data(messages_scope)
     build_thread_outline(@messages)
     load_commitfest_sidebar
+
+    @topic_mailing_lists = @topic.mailing_lists.to_a
+    @topic_is_multi_list = @topic_mailing_lists.size > 1
+
+    if @topic_is_multi_list
+      msg_ids = @messages.map(&:id)
+      mml_records = MessageMailingList.where(message_id: msg_ids).includes(:mailing_list)
+      @message_mailing_lists_map = mml_records.group_by(&:message_id)
+                                               .transform_values { |mmls| mmls.map(&:mailing_list) }
+    end
+
     if user_signed_in?
       load_notes
       load_star_state
@@ -301,9 +314,11 @@ def search
 
     preload_topic_participants
     preload_commitfest_summaries
+    preload_topic_mailing_lists
     preload_participation_flags if user_signed_in?
     load_visible_tags if user_signed_in?
     load_saved_searches
+    @all_mailing_lists = MailingList.order(:display_name)
 
     respond_to do |format|
       format.html
@@ -365,6 +380,7 @@ def user_state_frame
     preload_commitfest_summaries
     preload_star_counts
     preload_topic_participants
+    preload_topic_mailing_lists
 
     respond_to do |format|
       format.turbo_stream
@@ -670,6 +686,17 @@ def load_saved_searches
     end
   end
 
+  def preload_topic_mailing_lists
+    topic_ids = @topics.map(&:id)
+    return if topic_ids.empty?
+
+    @topic_mailing_lists_map = TopicMailingList
+      .where(topic_id: topic_ids)
+      .includes(:mailing_list)
+      .group_by(&:topic_id)
+      .transform_values { |tmls| tmls.map(&:mailing_list) }
+  end
+
   def preload_topic_participants
     topic_ids = @topics.map(&:id)
     return if topic_ids.empty?

app/helpers/topics_helper.rb

@@ -227,6 +227,16 @@ def team_readers_icon_html(topic:, readers:)
     end
   end
 
+  def mailing_list_badges_html(mailing_lists)
+    return "".html_safe if mailing_lists.blank?
+
+    badges = mailing_lists.map do |ml|
+      tag.span(ml.display_name, class: "mailing-list-badge", title: ml.identifier)
+    end
+
+    tag.span(class: "mailing-list-badges") { safe_join(badges) }
+  end
+
   def topic_title_link(topic)
     if user_signed_in? && current_user.open_threads_at_first_unread?
       topic_path(topic, anchor: "first-unread")

app/models/mailing_list.rb

@@ -0,0 +1,9 @@
+class MailingList < ApplicationRecord
+  has_many :message_mailing_lists, dependent: :destroy
+  has_many :messages, through: :message_mailing_lists
+  has_many :topic_mailing_lists, dependent: :destroy
+  has_many :topics, through: :topic_mailing_lists
+
+  validates :identifier, presence: true, uniqueness: true
+  validates :display_name, presence: true
+end

app/models/message.rb

@@ -10,6 +10,8 @@ class Message < ApplicationRecord
   has_many :mentions
   has_many :mentioned_aliases, through: :mentions, source: :alias
   has_many :notes
+  has_many :message_mailing_lists, dependent: :destroy
+  has_many :mailing_lists, through: :message_mailing_lists
 
   validates :subject, presence: true
   # Body may be blank for some historical imports; allow blank but keep presence on subject.

app/models/message_mailing_list.rb

@@ -0,0 +1,15 @@
+class MessageMailingList < ApplicationRecord
+  belongs_to :message
+  belongs_to :mailing_list
+
+  after_create :ensure_topic_mailing_list
+
+  private
+
+  def ensure_topic_mailing_list
+    TopicMailingList.find_or_create_by!(
+      topic_id: message.topic_id,
+      mailing_list_id: mailing_list_id
+    )
+  end
+end

app/models/topic.rb

@@ -29,6 +29,8 @@ class Topic < ApplicationRecord
   has_many :topics_merged_into_this, class_name: "Topic", foreign_key: :merged_into_topic_id
   has_one :topic_merge_as_source, class_name: "TopicMerge", foreign_key: :source_topic_id
   has_many :topic_merges_as_target, class_name: "TopicMerge", foreign_key: :target_topic_id
+  has_many :topic_mailing_lists, dependent: :destroy
+  has_many :mailing_lists, through: :topic_mailing_lists
 
   scope :active, -> { where(merged_into_topic_id: nil) }
   scope :merged, -> { where.not(merged_into_topic_id: nil) }

app/models/topic_mailing_list.rb

@@ -0,0 +1,4 @@
+class TopicMailingList < ApplicationRecord
+  belongs_to :topic
+  belongs_to :mailing_list
+end