bible270 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb59bf731c08118644e9303ed749397492c6c7fea523a20cf4eb3c17b84281f
-  data.tar.gz: e1f6b1be1b245e859370ae745eb05f8adf47df953f89ad7cb28c700ad705830c
+  metadata.gz: 7867bb4de49fe177447a5f7b1cfa9fa031e1926cdb8c4c73f2071eb8a7620c82
+  data.tar.gz: '0499e0931abdd3890f07945f7fc82f6de8dc5da1a156fbb8147e1b5b2be79596'
 SHA512:
-  metadata.gz: 312efc5cd9bfcb503430d1adc601b21a93658c9d378060182d3453b747d43674a736a83b753accaf0f0d738b0da005656c87490f17a51814800b3798632c09ab
-  data.tar.gz: c45129d6950f6b40f8bb0477b9de95ed9e98bb5ad3c1f9fa36bfb1b44eb5c1b26e337fc9d31e7dc9554115f2c4ecde14427127333bf2287925a0c0a33457b470
+  metadata.gz: 422848afb4e96f1a94cbfc26078f7c343afdb519e431c25aa6f2de10be0578d51fa65aa6d04683490b792685d5888474b8f711f0e1839ccd6ccaeb45c52c26d0
+  data.tar.gz: 81cd1f5df1028fa4064bc77ec5ee20866406d21c1ae5d4d992e8137bde59e5c6d6c505c7fc92b85111c931b7450da60b125692cb0bacbe63652e63012f9257da

data/CHANGELOG.md

@@ -2,13 +2,52 @@
 
 All notable changes to bible270. Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html), treating pre-1.0 minor bumps as the place breaking changes may land.
 
-## Unreleased Changes
+## [Unreleased]
+
+### Added
+
+- add an on-demand Markdown formatting drawer and separate server-rendered Preview control for reflections and replies, with safe rendering, formatted notification emails, mention and browser-draft compatibility, and literal display of existing plain-text reflections; upgrading hosts must copy and run the new `body_format` comment migration
+
+### Fixed
+
+- keep `json` below 3.0 while supported Rails releases still pass positional parse options, preventing session-cookie decoding from crashing every request under `json` 3.0
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.2...main)**
+
+## [1.4.2] - 2026-09-03
+
+### Added
+
+- let administrators disable the day-completion dove animation for individual readers without affecting progress tracking; upgrading hosts must copy and run the new `completion_dove_disabled` reader migration before changing this setting
 
 ### Changed
 
-- simplify day completion to one continuous server-confirmed dove flight from the lower center, eliminating the stagger between a pre-submit animation and the Turbo or HTML response
+- keep the completion dove bright in dark mode, grow it to an 80%-of-viewport fit with a smoother rounded silhouette, and finish with a centered fade instead of veering offscreen
+- show every reader who finished a day after the Reflections section, using compact 56px avatars ordered from earliest to latest completion
+
+### Fixed
+
+- show the dove only once for each persisted day completion, including during concurrent final checkoffs, Turbo response replays, and stale-session retries
+
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.1...v1.4.2)**
+
+## [1.4.1] - 2026-09-02
+
+### Changed
+
+- run the day-completion dove as one continuous, server-confirmed animation from the lower center, avoiding a stagger between submission and the Turbo or HTML response
+- improve installer guidance for OmniAuth providers, deferred bundling, Active Storage, pending migrations, and OAuth callback setup
+- detect existing engine mounts more reliably and move them above catch-all routes when necessary
+
+### Fixed
+
+- reject invalid enrollment states and malformed or out-of-range admin day values instead of silently interpreting them
+- apply admin profile name and avatar changes atomically, preventing partial updates when validation fails
+- report broadcast queueing, delivery failures, and partial success accurately without recording an entirely failed broadcast as sent
+- restrict reflection return redirects to safe application URLs
+- honor the install generator's `--mailer-from` option, reject unsafe provider identifiers, and safely quote generated configuration values
 
-**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.0...main)**
+**[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.4.0...v1.4.1)**
 
 ## [1.4.0] - 2026-09-02
 
@@ -622,6 +661,9 @@ 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.
 
+[Unreleased]: https://github.com/avonderluft/bible270/compare/v1.4.2...HEAD
+[1.4.2]: https://github.com/avonderluft/bible270/releases/tag/v1.4.2
+[1.4.1]: https://github.com/avonderluft/bible270/releases/tag/v1.4.1
 [1.4.0]: https://github.com/avonderluft/bible270/releases/tag/v1.4.0
 [1.3.2]: https://github.com/avonderluft/bible270/releases/tag/v1.3.2
 [1.3.1]: https://github.com/avonderluft/bible270/releases/tag/v1.3.1

data/README.md

@@ -1,6 +1,6 @@
 # Bible 270
 
-[![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Coverage Status](https://coveralls.io/repos/github/avonderluft/bible270/badge.svg?branch=main&cache=20260812-1)](https://coveralls.io/github/avonderluft/bible270?branch=main) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
+[![Gem Version](https://img.shields.io/gem/v/bible270)](https://rubygems.org/gems/bible270) [![Coverage Status](https://img.shields.io/coverallsCoverage/github/avonderluft/bible270?branch=main&cacheSeconds=300)](https://coveralls.io/github/avonderluft/bible270?branch=main) [![Downloads](https://img.shields.io/gem/dt/bible270)](https://rubygems.org/gems/bible270) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/bible270?label=last%20release&color=seagreen)](https://github.com/avonderluft/bible270/releases)
 
 A mountable **Rails engine** that drops a 270-day (9 month) interactive Bible reading plan into any Rails app, built with [ComfortableMediaSurfer](https://github.com/shakacode/comfortable-media-surfer) CMS in mind. Readers tick off each day's readings, post reflections, and see how everyone else is getting on, much like the social plans on Bible.com.
 
@@ -283,7 +283,14 @@ filters, and paginates older threads. Signed-in readers see which conversations
 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.
+work without JavaScript. A quiet **Formatting** disclosure opens a toolbar for bold, italic,
+quotations, bulleted and numbered lists, and links without requiring readers to know Markdown syntax.
+A separate **Preview** control checks the current draft through the same server-side sanitizer used
+after posting; formatting tools stay out of sight until requested. The source remains
+editable in the ordinary textarea, drafts preserve its format, and all rendered HTML is restricted to that small safe
+set. Existing reflections remain literal plain text until a reader intentionally formats or converts
+them. Upgrading hosts must copy and run migration `20260101000021`, which records whether each body is
+plain text or Markdown; until then, the composer safely falls back to plain text.
 
 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
@@ -483,7 +490,7 @@ The CMS serves your content; this is a separate mounted app. Either **just link
 |-------|-------|
 | `bible270_readers` | identity, avatar, provider/uid or polymorphic `owner`, start date, translation, passage-reader, and reminder preferences |
 | `bible270_checkoffs` | one row per reader per day per track (`ot`/`nt`/`pp`), unique-indexed |
-| `bible270_comments` | a reflection on a day, optionally scoped to a track, public to all |
+| `bible270_comments` | a plain-text or safely rendered Markdown reflection on a day, optionally scoped to a track, public to all |
 | `bible270_sign_in_tokens` | magic-link tokens: email, **digest only**, expiry, consumed-at |
 
 A day is "complete" once all three tracks are ticked. Progress and comments are **public** by
@@ -496,6 +503,7 @@ GET    /                         days#index      overview + community + calendar
 GET    /day/:day                 days#show       readings, who's finished, reflections
 POST   /day/:day/toggle/:track   checkoffs#toggle
 POST   /day/:day/comments        comments#create
+POST   /comments/preview         comments#preview
 DELETE /comments/:id             comments#destroy
 GET    /community                readers#index   reader directory
 GET    /mention-suggestions      readers#mention_suggestions (signed-in JSON)

data/app/controllers/bible270/admin_controller.rb

@@ -13,8 +13,8 @@ module Bible270
 
     before_action :require_admin!
     before_action :load_reader,
-                  only: %i[show destroy update_start update_profile update_notifications remove_avatar complete_through
-                           toggle_day]
+                  only: %i[show destroy update_start update_profile update_notifications update_completion_animation
+                           remove_avatar complete_through toggle_day]
     before_action :load_comment, only: %i[hide_comment unhide_comment destroy_comment]
 
     # ---- enrolment --------------------------------------------------------
@@ -74,6 +74,7 @@ module Bible270
 
     def show
       @comment_notifications_available = comment_notifications_available_for?(@reader)
+      @completion_dove_preference_available = completion_dove_available_for(@reader)
       @days_completed = @reader.days_completed
       @comments = @reader.comments.order(created_at: :desc).limit(50)
     end
@@ -236,6 +237,16 @@ module Bible270
       redirect_to admin_reader_path(@reader), notice: 'Reflection email setting updated.'
     end
 
+    def update_completion_animation
+      unless completion_dove_available_for(@reader)
+        alert = 'Run the pending Bible270 database migration before changing the completion animation.'
+        return redirect_to(admin_reader_path(@reader), alert: alert)
+      end
+
+      @reader.update!(completion_dove_disabled: params[:completion_dove_disabled] == '1')
+      redirect_to admin_reader_path(@reader), notice: 'Completion animation setting updated.'
+    end
+
     def remove_avatar
       @reader.remove_avatar!
       redirect_to admin_reader_path(@reader), notice: "Removed #{@reader.display_name}'s picture."
@@ -298,6 +309,12 @@ module Bible270
       true
     end
 
+    def completion_dove_available_for(reader)
+      available = Reader.completion_dove_column?
+      reader.reload if available && !reader.has_attribute?('completion_dove_disabled')
+      available
+    end
+
     def require_admin!
       return if Bible270.config.admin_configured? && Bible270.config.admin?(current_reader)
 

data/app/controllers/bible270/checkoffs_controller.rb

@@ -18,25 +18,27 @@ module Bible270
       requested_state = params[:checked] if params.key?(:checked)
       head :bad_request and return if params.key?(:checked) && !%w[0 1].include?(requested_state)
 
-      marked_read, checkoff_changed = apply_checkoff(requested_state)
-
-      @reader = current_reader.reload.reload_progress
-      @day_just_completed = marked_read && checkoff_changed && @reader.day_complete?(@day)
+      # Serialize this reader's transitions so two different final portions
+      # submitted concurrently cannot both announce the same day completion.
+      marked_read = nil
+      current_reader.with_lock do
+        marked_read, @completion_event_id = apply_checkoff(requested_state)
+        @reader = current_reader.reload.reload_progress
+        @day_just_completed = marked_read && @completion_event_id && @reader.day_complete?(@day)
+      end
       @reader_tracks = @reader.read_tracks_for(@day)
       @readings = Plan.readings_for(@day)
 
-      required = Plan.total_parts(@day)
-      completer_ids = Checkoff.where(day: @day)
-        .group(:reader_id)
-        .having('COUNT(*) >= ?', required)
-        .pluck(:reader_id)
-      @completers = Reader.where(id: completer_ids).order(:display_name)
+      @completers = Reader.completers_for(@day)
 
       respond_to do |format|
         format.turbo_stream
         format.html do
           if @day_just_completed
-            redirect_to day_path(@day), flash: { b270_day_just_completed: @day }
+            redirect_to day_path(@day), flash: {
+              b270_day_just_completed: @day,
+              b270_completion_event_id: @completion_event_id
+            }
           else
             message = marked_read ? 'Reading marked read.' : 'Reading marked unread.'
             redirect_to day_path(@day), flash: { b270_interaction_status: message }
@@ -51,9 +53,10 @@ module Bible270
       existing = find_checkoff
       if requested_state == '1'
         current_reader.ensure_started!
-        [true, existing.nil? && create_checkoff]
+        [true, existing.nil? ? create_checkoff : nil]
       elsif requested_state == '0' || existing
-        [false, existing ? existing.destroy.present? : false]
+        existing&.destroy
+        [false, nil]
       else
         current_reader.ensure_started!
         [true, create_checkoff]
@@ -66,15 +69,16 @@ module Bible270
       end
     end
 
+    # The created id is stable if Turbo replays this response, while a later
+    # re-completion creates a new id and is correctly treated as a new event.
     def create_checkoff
-      Checkoff.create!(reader: current_reader, day: @day, track: @track, part: @part)
-      true
+      Checkoff.create!(reader: current_reader, day: @day, track: @track, part: @part).id
     rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
       # A repeated or concurrent desired-state request is already successful. Do
       # not hide any other validation failure under the same recovery.
       raise unless find_checkoff
 
-      false
+      nil
     end
   end
 end

data/app/controllers/bible270/comments_controller.rb

@@ -11,6 +11,14 @@ module Bible270
       current_reader&.mark_reflections_seen!(visited_at)
     end
 
+    def preview
+      return unless require_reader!
+
+      attributes = { body: params.dig(:comment, :body).to_s }
+      attributes[:body_format] = CommentFormatter::MARKDOWN if Comment.body_format_column?
+      render partial: 'bible270/comments/body', locals: { comment: Comment.new(attributes) }
+    end
+
     def create
       return unless require_reader!
 
@@ -134,7 +142,9 @@ module Bible270
     end
 
     def comment_params
-      params.require(:comment).permit(:body, :track, :parent_id)
+      permitted = %i[body track parent_id]
+      permitted << :body_format if Comment.body_format_column?
+      params.require(:comment).permit(*permitted)
     end
 
     # Scoped to the reader, so someone else's reflection is simply not found —

data/app/controllers/bible270/days_controller.rb

@@ -18,19 +18,12 @@ module Bible270
       @readings   = Plan.readings_for(@day)
       @comments   = Comment.threads_for_day(@day)
       @editing_comment_id = editing_comment_id
-      @new_comment = Comment.new(day: @day, parent_id: reply_parent&.id)
+      @new_comment = Comment.new_for_composer(day: @day, parent_id: reply_parent&.id)
       @reader_tracks = current_reader ? current_reader.read_tracks_for(@day) : []
       @day_just_completed = flash[:b270_day_just_completed].to_i == @day
+      @completion_event_id = flash[:b270_completion_event_id] if @day_just_completed
 
-      # Every box on the day, not every track: an Old Testament reading of three
-      # chapters is three rows, so counting tracks would call someone finished
-      # who had only read the Old Testament.
-      required = Plan.total_parts(@day)
-      completer_ids = Checkoff.where(day: @day)
-        .group(:reader_id)
-        .having('COUNT(*) >= ?', required)
-        .pluck(:reader_id)
-      @completers = Reader.where(id: completer_ids).order(:display_name)
+      @completers = Reader.completers_for(@day)
     end
 
   private

data/app/helpers/bible270/plan_helper.rb

@@ -53,40 +53,46 @@ module Bible270
       end
     end
 
-    # The mark beside the title in the header. Larger than the favicon and inlined
-    # as SVG, so it stays crisp at any size and needs no asset pipeline.
-    # Renders "@handle" as a link to that reader. An unresolved or ambiguous handle
-    # is left as plain text, which is how a writer discovers it found nobody.
-    #
-    # Built by walking the matches and escaping everything between them, rather
-    # than escaping afterwards: the body is reader-supplied, so the only safe
-    # construction is one where every non-link fragment is escaped by hand.
-    def b270_with_mentions(body)
-      text = body.to_s
-      readers = Bible270::Reader.mentioned_in(text)
+    # Formats every reflection surface through the same sanitizer. Web views link
+    # resolved mentions; email can opt out because it has no mounted request path.
+    def b270_comment_body(comment, link_mentions: true)
+      format = comment.rendered_body_format
+      html = if link_mentions
+               readers = Bible270::Reader.mentioned_in(comment.body)
+               Bible270::CommentFormatter.html(comment.body, format: format) do |handle|
+                 reader = readers.find { |candidate| candidate.answers_to?(handle) }
+                 reader_path(reader) if reader
+               end
+             else
+               Bible270::CommentFormatter.html(comment.body, format: format)
+             end
+      html.html_safe
+    end
 
-      pieces = []
-      cursor = 0
+    def b270_comment_text(comment)
+      Bible270::CommentFormatter.text(comment.body, format: comment.rendered_body_format)
+    end
 
-      text.to_enum(:scan, Bible270::Mentions::PATTERN).each do
-        match = Regexp.last_match
-        pieces << ERB::Util.html_escape(text[cursor...match.begin(0)])
+    def b270_editor_rows(body, columns: 48, minimum: 4)
+      rows = body.to_s.split("\n", -1).sum do |line|
+        [1, (line.length.to_f / columns).ceil].max
+      end
+      [minimum, rows].max
+    end
 
-        handle = Bible270::Mentions.normalize(match[1])
+    # Backward-compatible plain-text entry point for host views that called the old
+    # mention helper directly.
+    def b270_with_mentions(body)
+      readers = Bible270::Reader.mentioned_in(body)
+      html = Bible270::CommentFormatter.html(body, format: Bible270::CommentFormatter::PLAIN) do |handle|
         reader = readers.find { |candidate| candidate.answers_to?(handle) }
-        pieces << if reader
-                    link_to(match[0], reader_path(reader), class: 'b270-mention')
-                  else
-                    ERB::Util.html_escape(match[0])
-                  end
-
-        cursor = match.end(0)
+        reader_path(reader) if reader
       end
-
-      pieces << ERB::Util.html_escape(text[cursor..].to_s)
-      safe_join(pieces)
+      html.html_safe
     end
 
+    # The mark beside the title in the header. Larger than the favicon and inlined
+    # as SVG, so it stays crisp at any size and needs no asset pipeline.
     def b270_mark(size: 38)
       configured = Bible270.config.header_mark
       return nil if configured == false

data/app/mailers/bible270/application_mailer.rb

@@ -3,6 +3,7 @@
 module Bible270
   class ApplicationMailer < ActionMailer::Base
     default from: -> { Bible270.config.mailer_from }
+    helper Bible270::PlanHelper
     # `layout nil` means "normal lookup", which finds the host app's mailer layout and
     # nests our complete HTML document inside theirs. Only `false` disables it.
     layout false

data/app/models/bible270/comment.rb

@@ -11,6 +11,8 @@ module Bible270
     # the paper background; an outline glyph like U+2661 is drawn by the font
     # rather than the emoji set and needs hand-tuning to match.
     HEART = '❤️'
+    BODY_FORMAT_COLUMN = 'body_format'
+    BODY_FORMATS = CommentFormatter::FORMATS
     ThreadPage = Struct.new(:threads, :activity_by_id, :page, :pages, :total, keyword_init: true)
 
     self.table_name = 'bible270_comments'
@@ -26,6 +28,7 @@ module Bible270
 
     validates :day, inclusion: { in: 1..Plan::DAYS }
     validates :body, presence: true, length: { maximum: 4000 }
+    validates :body_format, inclusion: { in: BODY_FORMATS }, if: :body_format_column?
     # A reflection can be about one track or about the whole day. The form's
     # "The whole day" option submits an empty string, so normalise it to NULL
     # before validating — allow_nil alone rejects "" with
@@ -54,6 +57,23 @@ module Bible270
     }
     scope :recent, -> { approved.order(created_at: :desc) }
 
+    def self.body_format_column?
+      column_names.include?(BODY_FORMAT_COLUMN)
+    rescue ActiveRecord::StatementInvalid
+      false
+    end
+
+    def self.new_for_composer(attributes = {})
+      attributes = attributes.merge(BODY_FORMAT_COLUMN => CommentFormatter::MARKDOWN) if body_format_column?
+      new(attributes)
+    end
+
+    def body_format_column? = self.class.body_format_column?
+
+    def rendered_body_format
+      body_format_column? ? body_format.presence || CommentFormatter::PLAIN : CommentFormatter::PLAIN
+    end
+
     # One page of top-level reflections ordered by the newest activity in each
     # conversation. Loading only IDs and timestamps keeps older archives cheap to
     # sort, while the displayed page still eager-loads its readers, replies and likes.

data/app/models/bible270/reader.rb

@@ -33,6 +33,7 @@ module Bible270
     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
+    COMPLETION_DOVE_COLUMN = 'completion_dove_disabled'
     MENTION_SUGGESTION_LIMIT = 5
 
     validates :display_name, presence: true
@@ -64,6 +65,18 @@ module Bible270
       end
     end
 
+    # A day is completed when its final required checkoff is created, so MAX(created_at)
+    # is the completion moment. Keep reader_id as a deterministic tie-breaker.
+    def self.completers_for(day)
+      reader_ids = Checkoff.where(day: day)
+        .group(:reader_id)
+        .having('COUNT(*) >= ?', Plan.total_parts(day))
+        .order(Checkoff.arel_table[:created_at].maximum.asc, :reader_id)
+        .pluck(:reader_id)
+      readers_by_id = where(id: reader_ids).index_by(&:id)
+      reader_ids.filter_map { |reader_id| readers_by_id[reader_id] }
+    end
+
     def self.reflections_seen_column?
       column_names.include?(REFLECTIONS_SEEN_COLUMN)
     rescue ActiveRecord::StatementInvalid
@@ -289,6 +302,22 @@ module Bible270
       where(notify_on_all_comments: true).where.not(email: [nil, ''])
     end
 
+    def self.completion_dove_column?
+      return true if column_names.include?(COMPLETION_DOVE_COLUMN)
+
+      reset_column_information
+      column_names.include?(COMPLETION_DOVE_COLUMN)
+    rescue ActiveRecord::StatementInvalid
+      false
+    end
+
+    # Keep day completion usable while an upgraded host is waiting to run the
+    # preference migration. Historically the dove was enabled, so a missing
+    # column preserves that behavior.
+    def completion_dove_disabled?
+      has_attribute?(COMPLETION_DOVE_COLUMN) && self[COMPLETION_DOVE_COLUMN] == true
+    end
+
     # Small, deterministic suggestions for the reflection composer. Full-handle
     # collisions are omitted because the server must never guess which reader a
     # mention intended.

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

@@ -22,7 +22,7 @@
           <% if comment.reply? %>· reply to <strong><%= comment.parent&.reader&.display_name || 'a deleted reflection' %></strong><% end %>
           <% if comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
         </div>
-        <p class="b270-cbody"><%= comment.body %></p>
+        <div class="b270-cbody"><%= b270_comment_body(comment) %></div>
         <div style="display:flex;gap:10px;align-items:center;margin-top:6px">
           <% if comment.hidden? %>
             <%= button_to 'Restore', admin_unhide_comment_path(comment), method: :patch,

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

@@ -70,6 +70,29 @@
   <% end %>
 </div>
 
+<div class="b270-panel">
+  <h2 class="b270-subhead">Completion animation</h2>
+  <% unless @completion_dove_preference_available %>
+    <p class="b270-flash alert" style="margin:0">
+      Run the pending Bible270 database migration before changing the completion animation.
+    </p>
+  <% else %>
+    <%= form_with url: admin_reader_completion_animation_path(@reader), method: :patch,
+                  class: "b270-emailform" do %>
+      <div class="b270-field">
+        <label class="b270-reminder-optin">
+          <%= check_box_tag :completion_dove_disabled, "1", @reader.completion_dove_disabled? %>
+          <span>Turn off the dove animation for this reader</span>
+        </label>
+      </div>
+      <p class="b270-hint" style="margin:0">
+        Day completion and progress tracking still work normally when the animation is off.
+      </p>
+      <%= submit_tag 'Save', class: 'b270-btn' %>
+    <% 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/checkoffs/toggle.turbo_stream.erb

@@ -5,7 +5,7 @@
 
 <%= turbo_stream.replace "day_progress_#{@day}" do %>
   <%= render "bible270/days/day_progress", day: @day, reader: @reader,
-        just_completed: @day_just_completed %>
+        just_completed: @day_just_completed, completion_event_id: @completion_event_id %>
 <% end %>
 
 <%= turbo_stream.replace "completers_#{@day}" do %>

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

@@ -0,0 +1,6 @@
+<%# locals: (comment:) %>
+<% if comment.body.to_s.strip.empty? %>
+  <p class="b270-hint">Nothing to preview yet.</p>
+<% else %>
+  <%= b270_comment_body(comment) %>
+<% end %>

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

@@ -32,7 +32,7 @@
     <% if editing %>
       <%= render partial: "bible270/comments/edit_fields", locals: { comment: comment } %>
     <% else %>
-      <p class="b270-cbody"><%= b270_with_mentions(comment.body) %></p>
+      <div class="b270-cbody"><%= b270_comment_body(comment) %></div>
     <% end %>
 
     <%# Only a top-level reflection can be replied to: one level deep, so a reply

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

@@ -13,7 +13,8 @@
     <p class="b270-editerror"><%= comment.errors.full_messages.to_sentence %></p>
   <% end %>
 
-  <%= f.text_area :body %>
+  <%= render "bible270/comments/editor", form: f, comment: comment,
+        label_text: (comment.reply? ? "Reply" : "Reflection") %>
   <div class="row">
     <% unless comment.reply? %>
       <%= f.select :track,

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

@@ -0,0 +1,57 @@
+<%# locals: (form:, comment:, label_text:, placeholder: nil) %>
+<% editor_key = comment.persisted? ? "edit-#{comment.id}" : "new" %>
+<% textarea_id = "b270-comment-body-#{editor_key}" %>
+<% options_id = "b270-mention-options-#{editor_key}" %>
+<% write_id = "b270-comment-write-#{editor_key}" %>
+<% preview_id = "b270-comment-preview-#{editor_key}" %>
+<% drawer_id = "b270-comment-formatting-#{editor_key}" %>
+<% markdown_available = Bible270::Comment.body_format_column? %>
+
+<div class="b270-mention-composer" data-b270-mention-composer
+     data-suggestions-url="<%= mention_suggestions_path %>">
+  <div class="b270-markdown-editor" data-b270-markdown-editor data-b270-editor-key="<%= editor_key %>"
+       data-b270-preview-url="<%= comment_preview_path if markdown_available %>"
+       data-b270-formatting-open="false" data-b270-editor-mode="write">
+    <% if markdown_available %>
+      <div class="b270-editor-utilities" data-b270-editor-utilities hidden>
+        <button type="button" class="b270-editor-utility" aria-expanded="false"
+                aria-controls="<%= drawer_id %>" data-b270-formatting-toggle>
+          Formatting <span class="b270-format-chevron" aria-hidden="true">▾</span>
+        </button>
+        <button type="button" class="b270-editor-utility" aria-pressed="false"
+                aria-controls="<%= write_id %> <%= preview_id %>" data-b270-preview-toggle>Preview</button>
+      </div>
+      <div id="<%= drawer_id %>" class="b270-formatting-drawer" aria-hidden="true"
+           data-b270-formatting-drawer inert>
+        <div class="b270-formatting-drawer-inner">
+          <div class="b270-markdown-toolbar" role="toolbar" aria-label="Reflection formatting"
+               data-b270-markdown-toolbar>
+            <button type="button" data-b270-markdown-action="bold" aria-label="Bold selected text" title="Bold (Ctrl+B)"><span class="b270-format-glyph b270-format-bold" aria-hidden="true">B</span></button>
+            <button type="button" data-b270-markdown-action="italic" aria-label="Italicize selected text" title="Italic (Ctrl+I)"><span class="b270-format-glyph b270-format-italic" aria-hidden="true">I</span></button>
+            <button type="button" data-b270-markdown-action="quote" aria-label="Format as a quotation" title="Quotation">“ ”</button>
+            <button type="button" data-b270-markdown-action="bullet-list" aria-label="Format as a bulleted list" title="Bulleted list">• List</button>
+            <button type="button" data-b270-markdown-action="number-list" aria-label="Format as a numbered list" title="Numbered list">1. List</button>
+            <button type="button" data-b270-markdown-action="link" aria-label="Add a link" title="Link">Link</button>
+          </div>
+        </div>
+      </div>
+      <%= form.hidden_field :body_format, data: { b270_body_format: true } %>
+    <% end %>
+
+    <div id="<%= write_id %>" data-b270-write-panel>
+      <%= form.label :body, label_text, for: textarea_id, class: "b270-sr-only" %>
+      <%= form.text_area :body, id: textarea_id, placeholder: placeholder,
+            rows: (b270_editor_rows(comment.body) if comment.persisted?),
+            role: "combobox", autocomplete: "off", data: { b270_autosize: comment.persisted? },
+            aria: { autocomplete: "list", expanded: "false", haspopup: "listbox", controls: options_id } %>
+    </div>
+    <% if markdown_available %>
+      <div id="<%= preview_id %>" class="b270-markdown-preview b270-cbody"
+           aria-label="Reflection preview" aria-live="polite" data-b270-preview-panel hidden></div>
+    <% end %>
+  </div>
+
+  <div class="b270-mention-options" id="<%= options_id %>" role="listbox"
+       data-b270-mention-options hidden></div>
+  <p class="b270-sr-only" data-b270-mention-status aria-live="polite"></p>
+</div>

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

@@ -18,18 +18,9 @@
     </p>
   <% end %>
   <%= f.hidden_field :parent_id %>
-  <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>
+  <%= render "bible270/comments/editor", form: f, comment: comment,
+        label_text: (posting_reply ? "Reply" : "Reflection"),
+        placeholder: (posting_reply ? "Write your reply…" : "Share a reflection on today's reading…") %>
   <p class="b270-draft-status" data-b270-draft-status aria-live="polite"></p>
   <div class="row">
     <%= f.select :track,

data/app/views/bible270/comments/create.turbo_stream.erb

@@ -10,5 +10,6 @@
 <% end %>
 
 <%= turbo_stream.replace "new_comment_form" do %>
-  <%= render "bible270/comments/form", day: @day, comment: Bible270::Comment.new(day: @day), posted: true %>
+  <%= render "bible270/comments/form", day: @day,
+        comment: Bible270::Comment.new_for_composer(day: @day), posted: true %>
 <% end %>