bible270 1.1.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7014361816b071aaacc54d569f247ff116cc2c5c0f49ea4490e46a2e62375f4
-  data.tar.gz: d61942b56c9409563d03e8b76e2f3dea0ba6a73d0119e4d0dade38bdcb177ec2
+  metadata.gz: 90443d781de608736a3f9fdb35b68b9a85d24d2b2b4f56c3980f54975d239949
+  data.tar.gz: cb3dede7983920cf33aaf31b4d6070ec142874063702071512ad60aa387d8899
 SHA512:
-  metadata.gz: ee0357bfb87e84ab59b359ba11a274c380834587008263b7229e3d8f3edd04c02a1211045ebabec90545c4384c0404d872913c1caa2461609ec09aa4339bce88
-  data.tar.gz: 2e413b639bdccfbc194a44a7e30051d5c304ed2205625c3b3c79749da20f463178c538b6b9db43233843d783e2bfb91fce2e43121f55b7ff798a55798564a1a7
+  metadata.gz: '02703879de6569e5f254de78bd32e4b9c911ca4daef9ca3bc4942ad1816baec285582f10bb1b4d9080d97dfd7588d9c343234cf0a5f2596f82fdfe758113f5a6'
+  data.tar.gz: 8e219a377d05acbe62ccea4bc39cf25a1b902bf98cc42495b82c53dbc9282104c14fb3abc55eed09ea910a84cd0e9b05c5063d8836b2eac3798f504fe914653d

data/CHANGELOG.md

@@ -4,11 +4,34 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 
 ## Unreleased Changes
 
+### Added
+
+- let readers choose reflection emails for every new reflection and reply, only replies to their reflections and mentions of them, or none; administrators can manage the same setting, pending migrations are explained instead of silently hiding it, and existing preferences retain their previous behavior
+- suggest up to five unambiguous reader handles only while a signed-in writer types `@`, with keyboard and touch selection and no change to server-authoritative mention resolution
+- add Bible.com as the first-listed and default reader/admin Scripture source for every offered translation, using chapter links and WLC Hebrew or THGNT Greek when `HEB/GRK` is selected; existing reader choices are preserved
+- add `ALLGRK — LXX OT and Greek NT` immediately after `HEB/GRK`, using Blue Letter Bible's mGNT/LXX routing or Bible.com's GRCBRENT Old Testament and THGNT New Testament
+
+### Fixed
+
+- refresh stale `Reader` column information after an in-process database migration so newly available reflection email controls do not remain hidden until the web process restarts
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.1.7...main)**
+
+## [1.1.7] - 2026-08-27
+
+### Fixed
+
+- silently recover checkoffs from expired or rotated sessions: refresh remembered sessions and CSRF tokens before resumed interactions, handle remaining stale-token races without a flash or Rails 422 page, and retry the intended checkoff once with a fresh token
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.1.6...v1.1.7)**
+
+## [1.1.6] - 2026-08-25
+
 ### Changed
 
 - show administrators a quiet, linked completed-day count on Community reader rows while keeping progress hidden—and its aggregate query skipped—for ordinary readers and visitors; the link stays unadorned at rest and uses the site’s gold hover and keyboard-focus treatment
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.1.5...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.1.5...v1.1.6)**
 
 ## [1.1.5] - 2026-08-25
 
@@ -552,6 +575,7 @@ This is the initial public release.
 
 * Email sign-in requires working Action Mailer delivery in the host application. Set `config.mailer_from`; delivery is inline by default, or set `email_sign_in_deliver_later` when a queue backend is available.
 
+[1.1.7]: https://github.com/avonderluft/bible270/releases/tag/v1.1.7
 [1.1.6]: https://github.com/avonderluft/bible270/releases/tag/v1.1.6
 [1.1.5]: https://github.com/avonderluft/bible270/releases/tag/v1.1.5
 [1.1.4]: https://github.com/avonderluft/bible270/releases/tag/v1.1.4

data/README.md

@@ -282,9 +282,15 @@ The Reflections page lists conversations by their latest approved reply, support
 filters, and paginates older threads. Signed-in readers see which conversations became active since
 their previous visit. Reflection and reply drafts are retained for up to 30 days in that browser and
 cleared after a successful post. On a shared device, clearing browser storage also removes saved drafts.
+Typing `@` in the composer offers up to five unambiguous reader handles; manual mentions continue to
+work without JavaScript.
 
-After upgrading, copy and run migration `20260101000017`, which stores each reader's last visit to the
-Reflections page:
+When `config.mention_notifications` is enabled, each reader can request email for every new reflection
+and reply, only replies to their reflections and mentions of them, or none. Administrators can change
+the same preference from the reader's Admin page. Migration
+`20260101000018` adds the broad opt-in without changing any existing reader's choice. Migration
+`20260101000017` stores each reader's last visit to the Reflections page. After upgrading, install and
+run the current migrations:
 
 ```bash
 bin/rails bible270:install:migrations
@@ -398,7 +404,7 @@ Bible270.configure do |config|
   config.allow_reader_start_date = true
 
   config.daily_reminders = false             # schedule reminders:send every 15 minutes
-  config.mention_notifications = true         # replies and @mentions; readers may opt out
+  config.mention_notifications = true         # reflection/reply emails; readers choose the scope
   config.mailer_host = "example.com"          # links in reminder/notice email
 
   config.parent_controller = "ActionController::Base"   # or "::ApplicationController"
@@ -456,10 +462,14 @@ config.favicon = false                      # none; the host's favicon applies
 It's emitted by the engine's layout, so if you point `config.layout` at your own layout, add
 `<%= b270_favicon_tag %>` to its `<head>`.
 
-References link to Bible Gateway by default. Readers choose Bible Gateway or Blue Letter Bible from
-their profile, and an admin can set the same source for any reader. The `HEB/GRK` option always uses
-Blue Letter Bible: WLC for Old Testament, Psalms, and Proverbs readings, and mGNT for New Testament
-readings. Scripture links share one dedicated browser tab so moving among the day's passages does not
+References link to Bible.com by default. Readers choose Bible.com, Bible Gateway, or Blue Letter Bible
+from their profile, and an admin can set the same source for any reader. With `HEB/GRK`,
+Bible Gateway is unavailable: Blue Letter Bible uses WLC for Old Testament, Psalms, and Proverbs and
+mGNT for New Testament, while Bible.com uses WLC and THGNT respectively. The `ALLGRK — LXX OT and
+Greek NT` option also excludes Bible Gateway: Blue Letter Bible uses its mGNT/LXX route for every
+track, while Bible.com uses GRCBRENT for the Old Testament and THGNT for the New Testament. Bible.com
+links open the whole chapter rather than its individual-verse introduction page. Scripture links share one
+dedicated browser tab so moving among the day's passages does not
 leave a trail of open tabs; Ctrl-click, Cmd-click, middle-click, and the browser's context menu still
 open additional tabs when a reader wants to compare passages.
 
@@ -487,7 +497,8 @@ GET    /day/:day                 days#show       readings, who's finished, refle
 POST   /day/:day/toggle/:track   checkoffs#toggle
 POST   /day/:day/comments        comments#create
 DELETE /comments/:id             comments#destroy
-GET    /community                readers#index   leaderboard
+GET    /community                readers#index   reader directory
+GET    /mention-suggestions      readers#mention_suggestions (signed-in JSON)
 GET    /readers/:id              readers#show
 GET    /sign_in                  sessions#new    email form + provider list
 POST   /sign_in/email            sessions#email_link

data/app/controllers/bible270/admin_controller.rb

@@ -13,7 +13,8 @@ module Bible270
 
     before_action :require_admin!
     before_action :load_reader,
-                  only: %i[show destroy update_start update_profile remove_avatar complete_through toggle_day]
+                  only: %i[show destroy update_start update_profile update_notifications remove_avatar complete_through
+                           toggle_day]
     before_action :load_comment, only: %i[hide_comment unhide_comment destroy_comment]
 
     # ---- enrolment --------------------------------------------------------
@@ -69,6 +70,7 @@ module Bible270
     end
 
     def show
+      @comment_notifications_available = comment_notifications_available_for?(@reader)
       @days_completed = @reader.days_completed
       @comments = @reader.comments.order(created_at: :desc).limit(50)
     end
@@ -194,6 +196,24 @@ module Bible270
       end
     end
 
+    def update_notifications
+      unless Bible270.config.mention_notifications
+        return redirect_to admin_reader_path(@reader), alert: 'Reflection emails are disabled for this installation.'
+      end
+      unless comment_notifications_available_for?(@reader)
+        return redirect_to admin_reader_path(@reader),
+                           alert: 'Run the pending Bible270 database migration before changing reflection emails.'
+      end
+
+      level = params[:comment_notifications].to_s
+      unless Reader::COMMENT_NOTIFICATION_LEVELS.include?(level)
+        return redirect_to admin_reader_path(@reader), alert: 'Choose a reflection email setting from the list.'
+      end
+
+      @reader.update_comment_notification_level!(level)
+      redirect_to admin_reader_path(@reader), notice: 'Reflection email setting updated.'
+    end
+
     def remove_avatar
       @reader.remove_avatar!
       redirect_to admin_reader_path(@reader), notice: "Removed #{@reader.display_name}'s picture."
@@ -247,6 +267,13 @@ module Bible270
 
   private
 
+    def comment_notifications_available_for?(reader)
+      return false unless Bible270.config.mention_notifications && Reader.comment_notification_columns?
+
+      reader.reload unless reader.has_attribute?(:notify_on_all_comments)
+      true
+    end
+
     def require_admin!
       return if Bible270.config.admin_configured? && Bible270.config.admin?(current_reader)
 

data/app/controllers/bible270/application_controller.rb

@@ -104,14 +104,28 @@ module Bible270
     end
 
     # A suspended mobile tab can outlive its Rails session cookie. The page still
-    # contains the old session's CSRF token, so Rails rejects its next form before
-    # current_reader has a chance to restore the session from the remember cookie.
-    # Never execute that unverified request; return to a fresh page for a safe retry.
-    def recover_from_stale_page(error)
-      Rails.logger.info("[bible270] refreshing a page after #{error.class}")
-      redirect_back fallback_location: root_path, allow_other_host: false,
-                    alert: 'This page had been open for a while, so it was refreshed. Please try again.',
-                    status: :see_other
+    # contains the old session's CSRF token, so Rails would normally raise before
+    # current_reader could restore the session from the remember cookie. Redirect
+    # directly from Rails' forgery callback; rescue_from remains a fallback for an
+    # authenticity exception raised anywhere else in the request.
+    def handle_unverified_request
+      recover_from_stale_page
+    end
+
+    def recover_from_stale_page(error = nil)
+      reason = error ? error.class : 'an unverified request'
+      Rails.logger.info("[bible270] silently refreshing a page after #{reason}")
+
+      if stale_turbo_checkoff?
+        response.set_header('X-Bible270-Refresh-Session', 'true')
+        head :conflict
+      else
+        redirect_back fallback_location: root_path, allow_other_host: false, status: :see_other
+      end
+    end
+
+    def stale_turbo_checkoff?
+      controller_name == 'checkoffs' && action_name == 'toggle' && request.format.turbo_stream?
     end
 
     # Guard participation (checking off / commenting). Viewing is always open.

data/app/controllers/bible270/profiles_controller.rb

@@ -14,9 +14,9 @@ module Bible270
 
     def update
       @comment_notifications_available = comment_notifications_available?
-      @notify_on_mention = requested_comment_notifications
+      @comment_notification_level = requested_comment_notification_level
       @daily_reminders_available = daily_reminders_available?
-      problems = []
+      problems = [comment_notification_problem].compact
       problems << 'both a first and last name' unless current_reader.update_names(params[:first_name],
                                                                                   params[:last_name])
       if params[:bible_version].present? && !current_reader.update_bible_version(params[:bible_version])
@@ -35,7 +35,7 @@ module Bible270
       end
 
       if problems.empty?
-        current_reader.update!(notify_on_mention: @notify_on_mention) if @comment_notifications_available
+        current_reader.update_comment_notification_level!(@comment_notification_level) if @comment_notifications_available
         if @daily_reminders_available
           current_reader.update!(daily_reminders: requested_daily_reminders,
                                  daily_reminder_time: requested_daily_reminder_time)
@@ -59,17 +59,27 @@ module Bible270
 
     def load_comment_notification_state
       @comment_notifications_available = comment_notifications_available?
-      @notify_on_mention = current_reader.wants_comment_notifications?
+      @comment_notification_level = current_reader.comment_notification_level
     end
 
     def comment_notifications_available?
-      Bible270.config.mention_notifications && current_reader.has_attribute?(:notify_on_mention)
+      return false unless Bible270.config.mention_notifications && Reader.comment_notification_columns?
+
+      current_reader.reload unless current_reader.has_attribute?(:notify_on_all_comments)
+      true
+    end
+
+    def requested_comment_notification_level
+      return current_reader.comment_notification_level unless params.key?(:comment_notifications)
+
+      params[:comment_notifications].to_s
     end
 
-    def requested_comment_notifications
-      return current_reader.wants_comment_notifications? unless params.key?(:notify_on_mention)
+    def comment_notification_problem
+      return unless @comment_notifications_available
+      return if Reader::COMMENT_NOTIFICATION_LEVELS.include?(@comment_notification_level)
 
-      params[:notify_on_mention] == '1'
+      'a reflection email preference from the list'
     end
 
     def load_daily_reminder_state

data/app/controllers/bible270/readers_controller.rb

@@ -35,5 +35,12 @@ module Bible270
       @days_completed = @reader.days_completed
       @recent_comments = @reader.comments.recent.limit(20)
     end
+
+    def mention_suggestions
+      return head :unauthorized unless signed_in?
+
+      response.headers['Cache-Control'] = 'private, no-store'
+      render json: { suggestions: Reader.mention_suggestions(params[:q], except: current_reader) }
+    end
   end
 end

data/app/helpers/bible270/plan_helper.rb

@@ -115,7 +115,9 @@ module Bible270
       return '#' if reference.blank?
 
       selected_version = version || b270_bible_version
-      if selected_version != Translations::ORIGINAL_LANGUAGES && current_reader&.blue_letter_bible?
+      source = current_reader&.passage_source.presence || Reader::DEFAULT_PASSAGE_SOURCE
+      return Translations.passage_url(reference, selected_version, bible_com: true) if source == 'bible_com'
+      if source == 'blue_letter_bible' || Translations.original_languages?(selected_version)
         return Translations.passage_url(reference, selected_version, blue_letter: true)
       end
 
@@ -125,8 +127,8 @@ module Bible270
     # The named target and noopener are the secure no-JavaScript fallback.
     # Interaction UI retains one opener-backed tab handle on desktop. iOS Safari
     # cannot foreground a reused background tab, so it closes and replaces that
-    # script-opened tab on each click. The two fixed providers are intentionally
-    # trusted for this enhanced path.
+    # script-opened tab on each click. The three fixed providers are trusted for
+    # this enhanced path.
     def b270_passage_link(reference, **options)
       data = options.fetch(:data, {}).merge(b270_passage_link: true)
       options.merge!(data: data, target: PASSAGE_LINK_TARGET, rel: 'noopener')
@@ -138,8 +140,8 @@ module Bible270
     # used for each track rather than repeating the combined preference code.
     def b270_version_tag(version = nil, track: nil)
       label = version || b270_bible_version
-      if label == Translations::ORIGINAL_LANGUAGES && track
-        label = track.to_s == 'nt' ? 'Greek' : 'Hebrew'
+      if Translations.original_languages?(label) && track
+        label = label == Translations::ALL_GREEK || track.to_s == 'nt' ? 'Greek' : 'Hebrew'
       end
 
       content_tag :span, "(#{label})", class: 'b270-version'

data/app/mailers/bible270/notice_mailer.rb

@@ -36,6 +36,18 @@ module Bible270
       deliver_comment_notice("#{@app_name}: #{@author.display_name} replied on day #{@comment.day}")
     end
 
+    def comment_posted(comment_id:, reader_id:)
+      return message.perform_deliveries = false unless prepare_comment_notice(comment_id, reader_id)
+      return message.perform_deliveries = false unless @reader.wants_all_comment_notifications?
+      return message.perform_deliveries = false if @comment.reader_id == @reader.id
+
+      kind = @comment.reply? ? 'reply' : 'reflection'
+      @heading = "#{@author.display_name} posted a #{kind}"
+      @introduction = "#{@author.display_name} posted a #{kind} on day #{@comment.day}."
+      @reason = 'You are getting this because you asked to be emailed about every new reflection and reply.'
+      deliver_comment_notice("#{@app_name}: #{@author.display_name} posted a #{kind} on day #{@comment.day}")
+    end
+
     def daily_reminder(reader_id:, day:, on: Bible270.today)
       @reader = Reader.find_by(id: reader_id)
       return message.perform_deliveries = false unless Bible270.config.daily_reminders?

data/app/models/bible270/comment.rb

@@ -155,11 +155,13 @@ module Bible270
     end
 
     def notify_comment_readers
-      return unless Bible270.config.mention_notifications
+      return unless Bible270.config.mention_notifications && approved?
 
       replied_to = reply_notification_reader
       deliver_comment_notice(replied_to, :replied) if replied_to
-      notify_mentioned_readers(except: [replied_to&.id].compact)
+      directly_notified = [reader_id, replied_to&.id].compact
+      directly_notified.concat(notify_mentioned_readers(except: directly_notified))
+      notify_all_comment_readers(except: directly_notified)
     end
 
     def notify_newly_mentioned_readers
@@ -171,13 +173,20 @@ module Bible270
     end
 
     def notify_mentioned_readers(except: [])
-      return unless Bible270.config.mention_notifications
+      return [] unless Bible270.config.mention_notifications
 
-      Reader.mentioned_in(body).each do |mentioned|
+      Reader.mentioned_in(body).each_with_object([]) do |mentioned, notified|
         next if mentioned.id == reader_id
         next if except.include?(mentioned.id)
 
         deliver_comment_notice(mentioned, :mentioned)
+        notified << mentioned.id
+      end
+    end
+
+    def notify_all_comment_readers(except: [])
+      Reader.all_comment_notification_recipients.where.not(id: except).find_each do |recipient|
+        deliver_comment_notice(recipient, :comment_posted)
       end
     end
 

data/app/models/bible270/reader.rb

@@ -25,12 +25,15 @@ module Bible270
     # transaction rolls back.
     after_create_commit :notify_of_registration
 
-    PASSAGE_SOURCES = %w[bible_gateway blue_letter_bible].freeze
-    DEFAULT_PASSAGE_SOURCE = 'bible_gateway'
+    PASSAGE_SOURCES = %w[bible_com bible_gateway blue_letter_bible].freeze
+    DEFAULT_PASSAGE_SOURCE = 'bible_com'
     DAILY_REMINDER_TIME_FORMAT = %r{\A(?:[01]\d|2[0-3]):[0-5]\d\z}
     DAILY_REMINDER_MINUTES = %w[00 15 30 45].freeze
     DAILY_REMINDER_COLUMNS = %w[daily_reminders daily_reminder_time last_daily_reminder_sent_on].freeze
     REFLECTIONS_SEEN_COLUMN = 'reflections_seen_at'
+    COMMENT_NOTIFICATION_LEVELS = %w[all personal none].freeze
+    COMMENT_NOTIFICATION_COLUMNS = %w[notify_on_mention notify_on_all_comments].freeze
+    MENTION_SUGGESTION_LIMIT = 5
 
     validates :display_name, presence: true
     validates :uid, uniqueness: { scope: :provider }, allow_nil: true
@@ -233,6 +236,7 @@ module Bible270
 
     def bible_gateway? = passage_source == 'bible_gateway'
     def blue_letter_bible? = passage_source == 'blue_letter_bible'
+    def bible_com? = passage_source == 'bible_com'
 
     # Readers are listed by first name, matching how they are shown — the display
     # name is "First Last", so sorting on it needs only case folding. Surname
@@ -244,11 +248,76 @@ module Bible270
 
     # ---- mentions ----------------------------------------------------------
 
-    # Older copied databases may briefly lack the preference column while their
+    # Older copied databases may briefly lack preference columns while their
     # migrations are being reconciled. Preserve the historical opted-in behavior
-    # until the column is available rather than breaking reflection delivery.
+    # until the original column is available rather than breaking reflection delivery.
     def wants_comment_notifications?
-      !has_attribute?(:notify_on_mention) || self[:notify_on_mention] != false
+      wants_all_comment_notifications? || !has_attribute?(:notify_on_mention) || self[:notify_on_mention] != false
+    end
+
+    def wants_all_comment_notifications?
+      has_attribute?(:notify_on_all_comments) && self[:notify_on_all_comments] == true
+    end
+
+    def comment_notification_level
+      return 'all' if wants_all_comment_notifications?
+
+      wants_comment_notifications? ? 'personal' : 'none'
+    end
+
+    def update_comment_notification_level!(level)
+      raise ArgumentError, 'unknown reflection email preference' unless COMMENT_NOTIFICATION_LEVELS.include?(level)
+
+      update!(notify_on_mention: level != 'none', notify_on_all_comments: level == 'all')
+    end
+
+    def self.comment_notification_columns?
+      return true if (COMMENT_NOTIFICATION_COLUMNS - column_names).empty?
+
+      # A migration commonly runs in a one-off process while the web process keeps
+      # its old schema cache. Refresh once before reporting that the migration is
+      # still pending, so the controls appear without requiring an application restart.
+      reset_column_information
+      (COMMENT_NOTIFICATION_COLUMNS - column_names).empty?
+    rescue ActiveRecord::StatementInvalid
+      false
+    end
+
+    def self.all_comment_notification_recipients
+      return none unless comment_notification_columns?
+
+      where(notify_on_all_comments: true).where.not(email: [nil, ''])
+    end
+
+    # Small, deterministic suggestions for the reflection composer. Full-handle
+    # collisions are omitted because the server must never guess which reader a
+    # mention intended.
+    def self.mention_suggestions(query, except: nil)
+      needle = Mentions.normalize(query.to_s.first(61))
+      candidates = where.not(first_name: [nil, '']).where.not(last_name: [nil, ''])
+      candidates = candidates.where.not(id: except.id) if except
+      unique = candidates.to_a.group_by { |reader| canonical_mention_handle(reader) }
+        .select { |handle, readers| handle.present? && readers.one? }
+
+      ranked = unique.filter_map do |handle, readers|
+        reader = readers.first
+        surname = Mentions.normalize(reader.last_name)
+        rank = if needle.empty? || handle.start_with?(needle)
+                 0
+               elsif surname.start_with?(needle)
+                 1
+               end
+        next unless rank
+
+        [{ name: reader.display_name, handle: "@#{handle}" }, rank, handle, reader.id]
+      end
+      ranked.sort_by { |_, rank, handle, id| [rank, handle, id] }
+        .first(MENTION_SUGGESTION_LIMIT)
+        .map(&:first)
+    end
+
+    def self.canonical_mention_handle(reader)
+      Mentions.handles_for(reader.first_name, reader.last_name).last
     end
 
     # The readers a piece of text mentions. A handle matching more than one reader

data/app/views/bible270/admin/show.html.erb

@@ -46,6 +46,30 @@
   <% end %>
 </div>
 
+<div class="b270-panel">
+  <h2 class="b270-subhead">Email notifications</h2>
+  <% unless Bible270.config.mention_notifications %>
+    <p class="b270-hint">Reflection emails are disabled for this installation.</p>
+  <% else %>
+    <% unless @comment_notifications_available %>
+      <p class="b270-flash alert" style="margin:0">
+        Run the pending Bible270 database migration before changing reflection emails.
+      </p>
+    <% else %>
+      <% if @reader.email.blank? %>
+        <p class="b270-hint">This reader does not currently have an email address.</p>
+      <% end %>
+      <%= form_with url: admin_reader_notifications_path(@reader), method: :patch,
+                    class: "b270-emailform" do %>
+        <%= render "bible270/shared/comment_notification_choices",
+              level: @reader.comment_notification_level,
+              personal_label: "Only replies to their reflections and mentions of them" %>
+        <%= submit_tag 'Save', class: 'b270-btn' %>
+      <% end %>
+    <% end %>
+  <% end %>
+</div>
+
 <div class="b270-panel">
   <h2 class="b270-subhead">Where they are in the plan</h2>
   <%= form_with url: admin_reader_start_path(@reader), method: :patch, class: "b270-startform" do %>

data/app/views/bible270/comments/_form.html.erb

@@ -18,7 +18,18 @@
     </p>
   <% end %>
   <%= f.hidden_field :parent_id %>
-  <%= f.text_area :body, placeholder: comment.parent_id.present? ? "Write your reply…" : "Share a reflection on today's reading…" %>
+  <div class="b270-mention-composer" data-b270-mention-composer
+       data-suggestions-url="<%= mention_suggestions_path %>">
+    <%= f.label :body, (posting_reply ? "Reply" : "Reflection"), class: "b270-sr-only" %>
+    <%= f.text_area :body,
+          placeholder: posting_reply ? "Write your reply…" : "Share a reflection on today's reading…",
+          role: "combobox", autocomplete: "off",
+          aria: { autocomplete: "list", expanded: "false", haspopup: "listbox",
+                  controls: "b270-mention-options" } %>
+    <div class="b270-mention-options" id="b270-mention-options" role="listbox"
+         data-b270-mention-options hidden></div>
+    <p class="b270-sr-only" data-b270-mention-status aria-live="polite"></p>
+  </div>
   <p class="b270-draft-status" data-b270-draft-status aria-live="polite"></p>
   <div class="row">
     <%= f.select :track,

data/app/views/bible270/days/_reading.html.erb

@@ -22,7 +22,7 @@
               <% if signed_in? %>
                 <%= button_to toggle_checkoff_part_path(day, track, index), class: "b270-toggle",
                       params: { checked: part_done ? "0" : "1" },
-                      form: { data: { turbo_stream: true, b270_submit: true,
+                      form: { data: { turbo_stream: true, b270_submit: true, b270_checkoff: true,
                                       b270_pending: "Saving reading…",
                                       b270_success: (part_done ? "Reading marked unread." : "Reading marked read."),
                                       b270_failure: "Couldn’t update that reading. Try again." } },
@@ -46,7 +46,7 @@
       <% if signed_in? %>
         <%= button_to toggle_checkoff_part_path(day, track, 0), class: "b270-toggle",
               params: { checked: done ? "0" : "1" },
-              form: { data: { turbo_stream: true, b270_submit: true,
+              form: { data: { turbo_stream: true, b270_submit: true, b270_checkoff: true,
                               b270_pending: "Saving reading…",
                               b270_success: (done ? "Reading marked unread." : "Reading marked read."),
                               b270_failure: "Couldn’t update that reading. Try again." } },

data/app/views/bible270/days/show.html.erb

@@ -27,6 +27,7 @@
         <%= render "bible270/comments/form", day: @day, comment: @new_comment %>
       </div>
       <%= render "bible270/shared/comment_drafts" %>
+      <%= render "bible270/shared/mention_typeahead" %>
     <% end %>
   </div>
 </div>

data/app/views/bible270/profiles/edit.html.erb

@@ -38,14 +38,13 @@
     <%= render "bible270/shared/passage_source", reader: current_reader %>
 
     <% if @comment_notifications_available %>
-      <div class="b270-field">
-        <span>Email notifications</span>
-        <label class="b270-reminder-optin">
-          <%= hidden_field_tag :notify_on_mention, "0", id: nil %>
-          <%= check_box_tag :notify_on_mention, "1", @notify_on_mention %>
-          <span>Email me about replies and mentions</span>
-        </label>
-      </div>
+      <%= render "bible270/shared/comment_notification_choices",
+            level: @comment_notification_level,
+            personal_label: "Only replies to my reflections and mentions of me" %>
+    <% elsif Bible270.config.mention_notifications %>
+      <p class="b270-flash alert" style="margin:0">
+        Reflection email settings are temporarily unavailable while this installation finishes a database update.
+      </p>
     <% end %>
 
     <% if @daily_reminders_available %>

data/app/views/bible270/shared/_comment_notification_choices.html.erb

@@ -0,0 +1,17 @@
+<fieldset class="b270-field b270-notification-field">
+  <legend>Reflection emails</legend>
+  <div class="b270-notification-choices">
+    <label class="b270-notification-choice">
+      <%= radio_button_tag :comment_notifications, "all", level == "all" %>
+      <span>Every new reflection and reply</span>
+    </label>
+    <label class="b270-notification-choice">
+      <%= radio_button_tag :comment_notifications, "personal", level == "personal" %>
+      <span><%= personal_label %></span>
+    </label>
+    <label class="b270-notification-choice">
+      <%= radio_button_tag :comment_notifications, "none", level == "none" %>
+      <span>None</span>
+    </label>
+  </div>
+</fieldset>

data/app/views/bible270/shared/_interaction_ui.html.erb

@@ -132,11 +132,39 @@
       announce(form.dataset.b270Pending || "Saving…", "pending");
     });
 
+    function staleSessionResponse(fetchResponse) {
+      if (!fetchResponse) return false;
+      if (fetchResponse.statusCode === 422) return true;
+
+      return fetchResponse.statusCode === 409 &&
+        fetchResponse.response.headers.get("X-Bible270-Refresh-Session") === "true";
+    }
+
+    document.addEventListener("turbo:before-fetch-response", (event) => {
+      const target = event.target;
+      const form = target.closest && target.closest("form[data-b270-checkoff='true']");
+      const response = event.detail.fetchResponse;
+      if (!form || !staleSessionResponse(response)) return;
+
+      event.preventDefault();
+      if (form.dataset.b270RetriedAfterStaleSession === "true") {
+        window.location.reload();
+        return;
+      }
+
+      form.dataset.b270RetriedAfterStaleSession = "true";
+      resetForm(form);
+      refreshSession().then(() => form.requestSubmit()).catch(() => window.location.reload());
+    });
+
     document.addEventListener("turbo:submit-end", (event) => {
       const form = event.target;
       if (!form.matches("form[data-b270-submit='true']")) return;
 
       resetForm(form);
+      if (form.dataset.b270RetriedAfterStaleSession === "true" &&
+          staleSessionResponse(event.detail.fetchResponse)) return;
+
       if (event.detail.success) {
         announce(form.dataset.b270Success || "Saved.", "success");
       } else {

data/app/views/bible270/shared/_mention_typeahead.html.erb

@@ -0,0 +1,177 @@
+<script nonce="<%= content_security_policy_nonce %>">
+  (() => {
+    if (window.Bible270MentionTypeahead) {
+      window.Bible270MentionTypeahead.reset();
+      return;
+    }
+
+    const cache = new Map();
+
+    function activeToken(textarea) {
+      if (textarea.selectionStart !== textarea.selectionEnd) return null;
+
+      const cursor = textarea.selectionStart;
+      const before = textarea.value.slice(0, cursor);
+      const match = before.match(/(?:^|[^\p{L}\p{N}_@])@([\p{L}\p{N}.'-]{0,61})$/u);
+      if (!match) return null;
+
+      return { start: cursor - match[1].length - 1, end: cursor, query: match[1] };
+    }
+
+    function close(composer, state) {
+      const textarea = composer.querySelector("textarea");
+      const options = composer.querySelector("[data-b270-mention-options]");
+      const status = composer.querySelector("[data-b270-mention-status]");
+      options.hidden = true;
+      options.replaceChildren();
+      textarea.setAttribute("aria-expanded", "false");
+      textarea.removeAttribute("aria-activedescendant");
+      status.textContent = "";
+      state.items = [];
+      state.active = -1;
+      state.token = null;
+    }
+
+    function selectActive(composer, state, index) {
+      if (!state.items.length) return;
+
+      state.active = (index + state.items.length) % state.items.length;
+      const textarea = composer.querySelector("textarea");
+      composer.querySelectorAll("[role='option']").forEach((option, optionIndex) => {
+        const selected = optionIndex === state.active;
+        option.setAttribute("aria-selected", selected ? "true" : "false");
+        if (selected) textarea.setAttribute("aria-activedescendant", option.id);
+      });
+    }
+
+    function insert(composer, state, item) {
+      const textarea = composer.querySelector("textarea");
+      const token = activeToken(textarea) || state.token;
+      if (!token) return close(composer, state);
+
+      const after = textarea.value.slice(token.end);
+      const separator = after === "" || /^[\p{L}\p{N}@]/u.test(after) ? " " : "";
+      textarea.value = `${textarea.value.slice(0, token.start)}${item.handle}${separator}${after}`;
+      const cursor = token.start + item.handle.length + separator.length;
+      textarea.setSelectionRange(cursor, cursor);
+      close(composer, state);
+      textarea.focus();
+      textarea.dispatchEvent(new Event("input", { bubbles: true }));
+    }
+
+    function render(composer, state, token, items) {
+      const textarea = composer.querySelector("textarea");
+      const options = composer.querySelector("[data-b270-mention-options]");
+      const status = composer.querySelector("[data-b270-mention-status]");
+      const current = activeToken(textarea);
+      if (!current || current.start !== token.start || current.query !== token.query) return;
+
+      const safeItems = items.filter((item) => item && typeof item.name === "string" &&
+        typeof item.handle === "string").slice(0, 5);
+      if (!safeItems.length) return close(composer, state);
+
+      options.replaceChildren();
+      state.items = safeItems;
+      state.token = token;
+      safeItems.forEach((item, index) => {
+        const option = document.createElement("button");
+        option.type = "button";
+        option.id = `b270-mention-option-${index}`;
+        option.className = "b270-mention-option";
+        option.setAttribute("role", "option");
+        option.setAttribute("aria-selected", "false");
+        option.textContent = `${item.name}  ${item.handle}`;
+        option.addEventListener("pointerdown", (event) => event.preventDefault());
+        option.addEventListener("click", () => insert(composer, state, item));
+        options.append(option);
+      });
+      options.hidden = false;
+      textarea.setAttribute("aria-expanded", "true");
+      status.textContent = `${safeItems.length} mention suggestion${safeItems.length === 1 ? "" : "s"} available.`;
+      selectActive(composer, state, 0);
+    }
+
+    function request(composer, state, token) {
+      const key = token.query.toLocaleLowerCase();
+      if (cache.has(key)) return render(composer, state, token, cache.get(key));
+
+      if (state.abort) state.abort.abort();
+      state.abort = new AbortController();
+      const url = new URL(composer.dataset.suggestionsUrl, window.location.href);
+      url.searchParams.set("q", token.query);
+      fetch(url, {
+        credentials: "same-origin",
+        cache: "no-store",
+        headers: { Accept: "application/json" },
+        signal: state.abort.signal
+      }).then((response) => {
+        if (!response.ok) throw new Error("Mention suggestions unavailable");
+        return response.json();
+      }).then((body) => {
+        const items = Array.isArray(body.suggestions) ? body.suggestions : [];
+        cache.set(key, items);
+        render(composer, state, token, items);
+      }).catch((error) => {
+        if (error.name !== "AbortError") close(composer, state);
+      });
+    }
+
+    function update(composer, state) {
+      const textarea = composer.querySelector("textarea");
+      const token = activeToken(textarea);
+      window.clearTimeout(state.timer);
+      if (!token) return close(composer, state);
+
+      state.timer = window.setTimeout(() => request(composer, state, token), 120);
+    }
+
+    function initialize(composer) {
+      if (composer.dataset.b270MentionReady === "true") return;
+      composer.dataset.b270MentionReady = "true";
+      const textarea = composer.querySelector("textarea");
+      const state = { items: [], active: -1, token: null, timer: null, abort: null };
+
+      textarea.addEventListener("input", () => update(composer, state));
+      textarea.addEventListener("click", () => update(composer, state));
+      textarea.addEventListener("keydown", (event) => {
+        if (!state.items.length) return;
+
+        if (event.key === "ArrowDown") {
+          event.preventDefault();
+          selectActive(composer, state, state.active + 1);
+        } else if (event.key === "ArrowUp") {
+          event.preventDefault();
+          selectActive(composer, state, state.active - 1);
+        } else if (event.key === "Enter" && !event.shiftKey && state.active >= 0) {
+          event.preventDefault();
+          insert(composer, state, state.items[state.active]);
+        } else if (event.key === "Escape") {
+          event.preventDefault();
+          close(composer, state);
+        } else if (event.key === "Tab") {
+          close(composer, state);
+        }
+      });
+      textarea.addEventListener("blur", () => {
+        window.setTimeout(() => {
+          if (!composer.contains(document.activeElement)) close(composer, state);
+        }, 0);
+      });
+    }
+
+    function scan() {
+      document.querySelectorAll("[data-b270-mention-composer]").forEach(initialize);
+    }
+
+    function reset() {
+      cache.clear();
+      scan();
+    }
+
+    scan();
+    new MutationObserver(scan).observe(document.documentElement, { childList: true, subtree: true });
+    window.addEventListener("pageshow", scan);
+    document.addEventListener("turbo:load", reset);
+    window.Bible270MentionTypeahead = { scan, reset };
+  })();
+</script>

data/app/views/bible270/shared/_passage_source.html.erb

@@ -1,13 +1,17 @@
-<% original_languages = reader.effective_bible_version == Bible270::Translations::ORIGINAL_LANGUAGES %>
+<% original_languages = Bible270::Translations.original_languages?(reader.effective_bible_version) %>
 <div class="b270-source-choices" role="radiogroup" aria-label="Reading link source">
+  <label class="b270-source-choice">
+    <%= radio_button_tag :passage_source, "bible_com", reader.bible_com? %>
+    <span>Bible.com</span>
+  </label>
   <label class="b270-source-choice <%= 'disabled' if original_languages %>">
     <%= radio_button_tag :passage_source, "bible_gateway",
           !original_languages && reader.bible_gateway?, disabled: original_languages %>
     <span>Bible Gateway</span>
   </label>
-  <label class="b270-source-choice <%= 'disabled' if original_languages %>">
+  <label class="b270-source-choice">
     <%= radio_button_tag :passage_source, "blue_letter_bible",
-          original_languages || reader.blue_letter_bible?, disabled: original_languages %>
+          reader.blue_letter_bible? || (original_languages && !reader.bible_com?) %>
     <span>Blue Letter Bible</span>
   </label>
 </div>

data/app/views/bible270/shared/_styles.html.erb

@@ -40,6 +40,11 @@
   .b270-field{display:grid;gap:5px;font-size:12.5px;color:var(--muted)}
   .b270-field input{font:inherit;font-size:15px;padding:10px 12px;border:1px solid var(--line);border-radius:9px;background:#fff;color:var(--ink);width:100%}
   .b270-field input:focus{outline:none;border-color:var(--gold);box-shadow:0 0 0 3px rgba(165,129,44,.13)}
+  .b270-notification-field{margin:0;padding:0;border:0}
+  .b270-notification-field legend{padding:0;margin:0 0 3px}
+  .b270-notification-choices{display:grid;gap:7px}
+  .b270-notification-choice{display:flex;align-items:flex-start;gap:7px;line-height:1.35;cursor:pointer}
+  .b270-field .b270-notification-choice input[type=radio]{width:auto;margin:1px 0 0;padding:0;flex:none;accent-color:var(--gold)}
   .b270-reminder-row{display:flex;align-items:center;gap:12px;width:100%;flex-wrap:wrap}
   .b270-reminder-optin,.b270-reminder-time{display:inline-flex;align-items:center;gap:7px;color:var(--muted);white-space:nowrap}
   .b270-reminder-optin{position:relative;min-width:0}
@@ -181,9 +186,9 @@
   .b270-parts-meta{margin-top:10px;font-size:12.5px;color:var(--faint)}
   .b270-version{font-size:11.5px;color:var(--faint);font-weight:400;letter-spacing:.02em;white-space:nowrap}
   .b270-select{font:inherit;font-size:14px;padding:10px 30px 10px 12px;border:1px solid var(--line);border-radius:9px;background:#fff;color:var(--ink);width:100%;max-width:100%;text-overflow:ellipsis}
-  .b270-source-choices{display:flex;align-items:center;gap:18px;flex-wrap:wrap;margin:8px 0 2px;color:var(--muted);font-size:12.5px}
-  .b270-source-choice{display:inline-flex;align-items:center;gap:7px;cursor:pointer;white-space:nowrap}
-  .b270-source-choice input{appearance:none;width:17px;height:17px;margin:0;border:1px solid var(--line);border-radius:3px;background:#fff;display:grid;place-content:center;cursor:pointer}
+  .b270-source-choices{display:flex;align-items:center;justify-content:space-between;gap:4px;flex-wrap:nowrap;width:100%;margin:8px 0 2px;color:var(--muted);font-size:clamp(10.5px,3.4vw,12.5px)}
+  .b270-source-choice{display:inline-flex;align-items:center;gap:4px;cursor:pointer;white-space:nowrap}
+  .b270-source-choice input{appearance:none;width:14px;height:14px;margin:0;border:1px solid var(--line);border-radius:3px;background:#fff;display:grid;place-content:center;cursor:pointer;flex:none}
   .b270-source-choice input::before{content:"";width:9px;height:9px;transform:scale(0);transition:transform .1s;clip-path:polygon(14% 44%,0 59%,38% 100%,100% 18%,82% 0,37% 65%);background:var(--paper)}
   .b270-source-choice input:checked{background:var(--gold);border-color:var(--gold)}
   .b270-source-choice input:checked::before{transform:scale(1)}
@@ -247,6 +252,15 @@
   .b270-cdel{font-size:12px;color:var(--oxblood);background:none;border:none;cursor:pointer;padding:0;margin-left:8px}
   .b270-input{width:100%;padding:9px 11px;border:1px solid var(--line);border-radius:9px;background:#fff;font:inherit;font-size:14px;margin-bottom:8px}
   .b270-form textarea{width:100%;font:inherit;font-size:15px;border:1px solid var(--line);border-radius:10px;padding:11px 13px;background:#fff;resize:vertical;min-height:76px}
+  .b270-sr-only{position:absolute!important;width:1px!important;height:1px!important;padding:0!important;margin:-1px!important;overflow:hidden!important;clip:rect(0,0,0,0)!important;white-space:nowrap!important;border:0!important}
+  .b270-mention-composer{position:relative}
+  .b270-mention-options{position:absolute;z-index:30;left:0;right:0;top:calc(100% + 4px);overflow:hidden;
+                        border:1px solid var(--line);border-radius:10px;background:var(--card);box-shadow:var(--shadow)}
+  .b270-mention-options[hidden]{display:none}
+  .b270 .b270-mention-option{display:block;width:100%;min-height:44px;padding:10px 12px;border:0;border-radius:0;
+                             background:var(--card);color:var(--ink);font:inherit;font-size:13px;text-align:left;cursor:pointer}
+  .b270-mention-option+ .b270-mention-option{border-top:1px solid var(--line-soft)}
+  .b270-mention-option:hover,.b270-mention-option[aria-selected=true]{background:var(--paper);color:var(--gold)}
   .b270-draft-status{min-height:16px;margin:4px 0 -4px;font-size:11.5px;color:var(--faint)}
   .b270-form .row{display:flex;align-items:center;gap:10px;margin-top:10px}
   .b270-form .row select{max-width:100%}

data/config/routes.rb

@@ -20,8 +20,9 @@ Bible270::Engine.routes.draw do
   get    'admin',                        to: 'admin#index',            as: :admin
   get    'admin/readers/:id',            to: 'admin#show',             as: :admin_reader
   delete 'admin/readers/:id',            to: 'admin#destroy'
-  patch  'admin/readers/:id/profile',    to: 'admin#update_profile',   as: :admin_reader_profile
-  delete 'admin/readers/:id/avatar',     to: 'admin#remove_avatar',    as: :admin_reader_avatar
+  patch  'admin/readers/:id/profile',    to: 'admin#update_profile', as: :admin_reader_profile
+  patch  'admin/readers/:id/notifications', to: 'admin#update_notifications', as: :admin_reader_notifications
+  delete 'admin/readers/:id/avatar',     to: 'admin#remove_avatar', as: :admin_reader_avatar
   patch  'admin/readers/:id/version',    to: 'admin#update_bible_version', as: :admin_reader_version
   patch  'admin/readers/:id/start',      to: 'admin#update_start',     as: :admin_reader_start
   patch  'admin/readers/:id/through',    to: 'admin#complete_through', as: :admin_reader_through
@@ -45,6 +46,7 @@ Bible270::Engine.routes.draw do
   get 'progress', to: 'readers#progress', as: :progress
 
   get 'community', to: 'readers#index', as: :community
+  get 'mention-suggestions', to: 'readers#mention_suggestions', as: :mention_suggestions, defaults: { format: :json }
   get 'readers/:id', to: 'readers#show', as: :reader
 
   # Built-in OmniAuth sign-in. The request phase (POST <mount>/auth/:provider)

data/db/migrate/20260101000018_add_all_comment_notices_to_bible270_readers.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddAllCommentNoticesToBible270Readers < ActiveRecord::Migration[7.0]
+  def change
+    add_column :bible270_readers, :notify_on_all_comments, :boolean, null: false, default: false
+  end
+end

data/db/migrate/20260101000019_change_passage_source_default_to_bible_com.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class ChangePassageSourceDefaultToBibleCom < ActiveRecord::Migration[7.0]
+  def change
+    change_column_default :bible270_readers, :passage_source,
+                          from: 'bible_gateway', to: 'bible_com'
+  end
+end

data/lib/bible270/migration_reconciler.rb

@@ -27,6 +27,8 @@ module Bible270
       'AddPassageSourceToBible270Readers' => :check_passage_source,
       'AddDailyRemindersToBible270Readers' => :check_daily_reminders,
       'AddReflectionsSeenAtToBible270Readers' => :check_reflections_seen_at,
+      'AddAllCommentNoticesToBible270Readers' => :check_all_comment_notices,
+      'ChangePassageSourceDefaultToBibleCom' => :check_passage_source_default,
       'CreateActiveStorageTables' => :check_active_storage
     }.freeze
 
@@ -190,6 +192,18 @@ module Bible270
       table_missing(:bible270_readers, columns: %i[reflections_seen_at])
     end
 
+    def check_all_comment_notices
+      table_missing(:bible270_readers, columns: %i[notify_on_all_comments])
+    end
+
+    def check_passage_source_default
+      missing = table_missing(:bible270_readers, columns: %i[passage_source])
+      return missing if missing.any?
+
+      column = connection.columns(:bible270_readers).find { |candidate| candidate.name == 'passage_source' }
+      column&.default == 'bible_com' ? [] : ['column bible270_readers.passage_source default bible_com']
+    end
+
     # The Bible270 installer can install Active Storage for reader avatars. A
     # copied database can therefore have the same timestamp mismatch for Rails'
     # generated Active Storage migration as it has for the engine migrations.

data/lib/bible270/translations.rb

@@ -20,17 +20,36 @@ module Bible270
       'ESV' => { label: 'English Standard Version', short: 'English Standard Version', gateway: 'ESV', blue_letter: 'esv' },
       'KJV' => { label: 'King James Version', short: 'King James Version', gateway: 'KJV', blue_letter: 'kjv' },
       'YLT' => { label: 'Young\'s Literal Translation', short: 'Young\'s Literal Translation', gateway: 'YLT', blue_letter: 'ylt' },
-      'HEB/GRK' => { label: 'Hebrew and Greek', short: 'Hebrew and Greek', gateway: 'WLC', blue_letter: 'wlc/mgnt' }
+      'HEB/GRK' => { label: 'Hebrew and Greek', short: 'Hebrew and Greek', gateway: 'WLC', blue_letter: 'wlc/mgnt' },
+      'ALLGRK' => { label: 'LXX Old Testament and Greek New Testament', short: 'LXX OT and Greek NT', gateway: 'LXX', blue_letter: 'mgnt' }
     }.freeze
 
     DEFAULT = 'NKJV'
     ORIGINAL_LANGUAGES = 'HEB/GRK'
+    ALL_GREEK = 'ALLGRK'
+    ORIGINAL_LANGUAGE_CODES = [ORIGINAL_LANGUAGES, ALL_GREEK].freeze
     BLUE_LETTER_BASE_URL = 'https://www.blueletterbible.org'
+    BIBLE_COM_BASE_URL = 'https://www.bible.com/bible'
+    BIBLE_COM_VERSIONS = {
+      'NKJV' => [114, 'NKJV'], 'NASB95' => [100, 'NASB1995'], 'LSB' => [3345, 'LSB'],
+      'ESV' => [59, 'ESV'], 'KJV' => [1, 'KJV'], 'YLT' => [821, 'YLT98']
+    }.freeze
+    BIBLE_COM_ORIGINAL_LANGUAGES = {
+      old_testament: [3585, 'WLC'], new_testament: [2270, 'THGNT']
+    }.freeze
+    BIBLE_COM_ALL_GREEK = {
+      old_testament: [2503, 'GRCBRENT'], new_testament: [2270, 'THGNT']
+    }.freeze
     BLUE_LETTER_BOOK_CODES = %w[
       gen exo lev num deu jos jdg rut 1sa 2sa 1ki 2ki 1ch 2ch ezr neh est job psa pro ecc sng
       isa jer lam eze dan hos joe amo oba jon mic nah hab zep hag zec mal mat mar luk joh act rom
       1co 2co gal eph php col 1th 2th 1ti 2ti tit phm heb jas 1pe 2pe 1jo 2jo 3jo jud rev
     ].freeze
+    BIBLE_COM_BOOK_CODES = %w[
+      GEN EXO LEV NUM DEU JOS JDG RUT 1SA 2SA 1KI 2KI 1CH 2CH EZR NEH EST JOB PSA PRO ECC SNG
+      ISA JER LAM EZK DAN HOS JOL AMO OBA JON MIC NAM HAB ZEP HAG ZEC MAL MAT MRK LUK JHN ACT ROM
+      1CO 2CO GAL EPH PHP COL 1TH 2TH 1TI 2TI TIT PHM HEB JAS 1PE 2PE 1JN 2JN 3JN JUD REV
+    ].freeze
 
   module_function
 
@@ -50,6 +69,10 @@ module Bible270
       code.to_s.strip.upcase
     end
 
+    def original_languages?(code)
+      ORIGINAL_LANGUAGE_CODES.include?(normalize(code))
+    end
+
     def label(code)
       VERSIONS.dig(normalize(code), :label)
     end
@@ -69,10 +92,9 @@ module Bible270
       codes.map { |code| ["#{code} — #{short_label(code)}", code] }
     end
 
-    def passage_url(reference, version, blue_letter: false)
-      if blue_letter || normalize(version) == ORIGINAL_LANGUAGES
-        return blue_letter_url(reference, version)
-      end
+    def passage_url(reference, version, blue_letter: false, bible_com: false)
+      return bible_com_url(reference, version) if bible_com
+      return blue_letter_url(reference, version) if blue_letter || original_languages?(version)
 
       search = URI.encode_www_form_component(reference)
       gateway = URI.encode_www_form_component(gateway_code(version))
@@ -85,25 +107,17 @@ module Bible270
     # query URL, so link to the first chapter/verse and let its chapter navigation
     # carry the reader onward.
     def blue_letter_url(reference, version = ORIGINAL_LANGUAGES)
-      books = Versification::VERSES.keys
-      book_index = books.index { |book| reference.to_s.start_with?("#{book} ") }
-      return "#{BLUE_LETTER_BASE_URL}/" unless book_index
-
-      book = books[book_index]
-      location = reference.to_s.delete_prefix("#{book} ")
-      match = location.match(%r{\A(\d+)(?::(\d+))?})
-      return "#{BLUE_LETTER_BASE_URL}/" unless match
-
-      chapter = match[1].to_i
-      verse = match[2]&.to_i || 1
-      chapter_verses = Versification::VERSES[book]
-      return "#{BLUE_LETTER_BASE_URL}/" unless chapter.between?(1, chapter_verses.length)
-      return "#{BLUE_LETTER_BASE_URL}/" unless verse.between?(1, chapter_verses[chapter - 1])
+      start = reference_start(reference)
+      return "#{BLUE_LETTER_BASE_URL}/" unless start
 
+      book_index, chapter, verse = start
+      books = Versification::VERSES.keys
       canonical_chapter = books.first(book_index).sum { |prior| Versification::VERSES[prior].length } + chapter
       new_testament = book_index >= books.index('Matthew')
       reader = if normalize(version) == ORIGINAL_LANGUAGES
                  new_testament ? 'mgnt' : 'wlc'
+               elsif normalize(version) == ALL_GREEK
+                 'mgnt'
                else
                  VERSIONS.dig(normalize(version), :blue_letter)
                end
@@ -114,6 +128,45 @@ module Bible270
         "#{chapter}/#{verse}/s_#{anchor}"
     end
 
+    def bible_com_url(reference, version)
+      start = reference_start(reference)
+      return BIBLE_COM_BASE_URL unless start
+
+      book_index, chapter, = start
+      version_id, version_code = bible_com_version(version, book_index)
+      return BIBLE_COM_BASE_URL unless version_id && version_code
+
+      "#{BIBLE_COM_BASE_URL}/#{version_id}/#{BIBLE_COM_BOOK_CODES[book_index]}." \
+        "#{chapter}.#{version_code}"
+    end
+
+    def bible_com_version(version, book_index)
+      normalized = normalize(version)
+      testament = book_index >= Versification::VERSES.keys.index('Matthew') ? :new_testament : :old_testament
+      return BIBLE_COM_ORIGINAL_LANGUAGES[testament] if normalized == ORIGINAL_LANGUAGES
+      return BIBLE_COM_ALL_GREEK[testament] if normalized == ALL_GREEK
+
+      BIBLE_COM_VERSIONS[normalized]
+    end
+
+    def reference_start(reference)
+      books = Versification::VERSES.keys
+      book_index = books.index { |book| reference.to_s.start_with?("#{book} ") }
+      return unless book_index
+
+      book = books[book_index]
+      match = reference.to_s.delete_prefix("#{book} ").match(%r{\A(\d+)(?::(\d+))?})
+      return unless match
+
+      chapter = match[1].to_i
+      verse = match[2]&.to_i || 1
+      chapter_verses = Versification::VERSES[book]
+      return unless chapter.between?(1, chapter_verses.length)
+      return unless verse.between?(1, chapter_verses[chapter - 1])
+
+      [book_index, chapter, verse]
+    end
+
     # Falls back to the configured default, then to ESV, so a link is never built
     # with a blank version.
     def resolve(code)

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '1.1.7'
+  VERSION = '1.3.0'
 end

data/lib/generators/bible270/install/install_generator.rb

@@ -517,7 +517,7 @@ module Bible270
             # Readers choose an opt-in time only when enabled. This application owns
             # scheduling: run `bin/rails bible270:reminders:send` every 15 minutes.
             config.daily_reminders = false
-            config.mention_notifications = true # direct replies and @mentions; readers may opt out
+            config.mention_notifications = true # reflection/reply emails; readers choose the scope
             # config.mailer_host = 'example.com' # links back to the day and profile
 
             # --- Reading links --------------------------------------------------------

data/lib/generators/bible270/install/templates/bible270.rb.tt

@@ -60,7 +60,7 @@ Bible270.configure do |config|
   # Readers choose an opt-in time on their profile only when this is enabled.
   # The host app owns scheduling: run `bin/rails bible270:reminders:send` every 15 minutes.
   config.daily_reminders = false
-  config.mention_notifications = true # direct replies and @mentions; readers may opt out
+  config.mention_notifications = true # reflection/reply emails; readers choose the scope
   # config.mailer_host = "example.com"       # required for day/profile links in email
 
   # --- Reading links ---------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -137,12 +137,14 @@ files:
 - app/views/bible270/readers/show.html.erb
 - app/views/bible270/sessions/new.html.erb
 - app/views/bible270/shared/_comment_drafts.html.erb
+- app/views/bible270/shared/_comment_notification_choices.html.erb
 - app/views/bible270/shared/_day_index.html.erb
 - app/views/bible270/shared/_footer.html.erb
 - app/views/bible270/shared/_grid_legend.html.erb
 - app/views/bible270/shared/_header.html.erb
 - app/views/bible270/shared/_interaction_status.html.erb
 - app/views/bible270/shared/_interaction_ui.html.erb
+- app/views/bible270/shared/_mention_typeahead.html.erb
 - app/views/bible270/shared/_nav_links.html.erb
 - app/views/bible270/shared/_passage_source.html.erb
 - app/views/bible270/shared/_progress.html.erb
@@ -170,6 +172,8 @@ files:
 - db/migrate/20260101000015_add_passage_source_to_bible270_readers.rb
 - db/migrate/20260101000016_add_daily_reminders_to_bible270_readers.rb
 - db/migrate/20260101000017_add_reflections_seen_at_to_bible270_readers.rb
+- db/migrate/20260101000018_add_all_comment_notices_to_bible270_readers.rb
+- db/migrate/20260101000019_change_passage_source_default_to_bible_com.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
 - lib/bible270/configuration.rb