bible270 0.16.1 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5518f1eb25a21f7610ea80c8cd46e1d49690716bf98b5644fb3fa443f920a0e
-  data.tar.gz: 384ec828a091ed3c71abeb71a1d5b5f7d1cb7ff707f997511ca5e6d411cc5095
+  metadata.gz: 70091a35da0211de345d0a946f8fe25aea94c7656d7f9fb7b305aa63c6a1b7e6
+  data.tar.gz: 98e6db18fb16bdb784b7b2ad095b05860a43a81cb3111279f33b7285345bcbd0
 SHA512:
-  metadata.gz: f222369a58be11fb62c8fd76be668aad9010f76f3d88e9d9820d562eefce7becbe7e9b4fd7dd4dfa5e2408c256762fdd91da44942447328fa69782698e387789
-  data.tar.gz: c1f881c35558530bb27636a2fcd27a0f40ebb9cdc37e9f07cc10fda04aa78ddcfff65f8b210575c10640b46400616727e28ddc3b8594fd9cfa91dd19ac658a3b
+  metadata.gz: e03f11e9596c52e59413478a3c5c615ce5bc9f4289ecbed3a037906d51d70e515d56767d18324ba331dded40de502d0d6b7c741c603836d7e351d147375187df
+  data.tar.gz: f2496c1342b3be1625927fdbbecd333c1792d96c8c52742359bdfc9cb66e9de7ac0f3617b20b291ee081811e4d937a92e3dbbecc9c5ee29a3c3d0788db9f473a

data/app/controllers/bible270/comments_controller.rb

@@ -2,6 +2,11 @@
 
 module Bible270
   class CommentsController < ApplicationController
+    def index
+      @days_with_reflections = Comment.approved.distinct.pluck(:day).sort
+      @threads = recent_threads
+    end
+
     def create
       return unless require_reader!
 
@@ -27,10 +32,34 @@ module Bible270
       end
     end
 
+    def update
+      return unless require_reader!
+
+      @comment = own_comment
+      head :not_found and return unless @comment
+
+      @day = @comment.day
+      if @comment.update(comment_params.except(:parent_id))
+        respond_to do |format|
+          format.turbo_stream
+          format.html { redirect_to day_path(@day, anchor: "comment-#{@comment.id}") }
+        end
+      else
+        respond_to do |format|
+          format.turbo_stream do
+            render turbo_stream: turbo_stream.replace("comment-#{@comment.id}",
+                                                      partial: 'bible270/comments/edit_form',
+                                                      locals: { comment: @comment })
+          end
+          format.html { redirect_to day_path(@day), alert: @comment.errors.full_messages.to_sentence }
+        end
+      end
+    end
+
     def destroy
       return unless require_reader!
 
-      @comment = current_reader.comments.find_by(id: params[:id])
+      @comment = deletable_comment
       head :not_found and return unless @comment
 
       @day = @comment.day
@@ -43,8 +72,48 @@ module Bible270
 
   private
 
+    # The most recently active conversations, newest first. A reply counts as
+    # activity, so answering an old reflection brings the whole thread back up —
+    # otherwise a lively discussion on day 3 would stay buried while quieter, newer
+    # reflections sat above it.
+    def recent_threads
+      wanted = Bible270.config.reflections_page_size.to_i
+      wanted = 10 unless wanted.positive?
+
+      # Look at rather more messages than threads, since several may belong to one.
+      recent = Comment.approved.order(created_at: :desc).limit(wanted * 5)
+        .pluck(:id, :parent_id, :created_at)
+
+      roots = {}
+      recent.each do |id, parent_id, created_at|
+        root = parent_id || id
+        roots[root] ||= created_at
+        roots[root] = created_at if created_at > roots[root]
+      end
+
+      ids = roots.sort_by { |_root, at| -at.to_i }.first(wanted).map(&:first)
+      threads = Comment.approved.where(id: ids)
+        .includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+        .index_by(&:id)
+      ids.filter_map { |id| threads[id] }
+    end
+
     def comment_params
       params.require(:comment).permit(:body, :track, :parent_id)
     end
+
+    # Scoped to the reader, so someone else's reflection is simply not found —
+    # it reveals nothing about what exists.
+    def own_comment
+      current_reader.comments.find_by(id: params[:id])
+    end
+
+    # An admin may remove any reflection; everyone else only their own. Editing
+    # stays with the writer either way.
+    def deletable_comment
+      return own_comment unless Bible270.config.admin?(current_reader)
+
+      Comment.find_by(id: params[:id])
+    end
   end
 end

data/app/controllers/bible270/days_controller.rb

@@ -27,6 +27,7 @@ module Bible270
       @comments   = Comment.threads_for_day(@day)
       # Replying prefills the form with the handle rather than needing JavaScript,
       # so it works with Turbo and without an asset pipeline.
+      @editing_comment_id = editing_comment_id
       parent = reply_parent
       @new_comment = Comment.new(day: @day, parent_id: parent&.id, body: reply_prefix(parent))
       @reader_tracks = current_reader ? current_reader.read_tracks_for(@day) : []
@@ -50,6 +51,14 @@ module Bible270
     # "@handle " for the reflection being replied to, or nothing. Private, but
     # declared with the keyword rather than trailing the file, so it is obvious
     # this is not an action.
+    # The reflection the reader has asked to edit: their own, on this day. Anything
+    # else is ignored rather than refused — the page still renders.
+    def editing_comment_id
+      return nil if params[:edit].blank? || current_reader.nil?
+
+      current_reader.comments.where(day: @day, id: params[:edit]).pick(:id)
+    end
+
     # The reflection being replied to, if the link carried one and it is a
     # top-level reflection: a reply to a reply is not allowed.
     def reply_parent

data/app/controllers/bible270/likes_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Bible270
+  # A heart on someone's reflection. One route, because liking and unliking are
+  # the same gesture — tapping the heart again takes it back.
+  class LikesController < ApplicationController
+    def toggle
+      return unless require_reader!
+
+      @comment = Comment.approved.find_by(id: params[:id])
+      head :not_found and return unless @comment
+
+      @comment.toggle_like!(current_reader)
+      @comment.reload
+
+      respond_to do |format|
+        format.turbo_stream
+        format.html { redirect_to day_path(@comment.day, anchor: "comment-#{@comment.id}") }
+      end
+    end
+  end
+end

data/app/helpers/bible270/plan_helper.rb

@@ -137,6 +137,89 @@ module Bible270
       end
     end
 
+    # Timestamps in the plan's zone rather than UTC. Dates — started_on and the
+    # like — need no conversion and are formatted inline.
+    def b270_date(time)
+      local = Bible270.local_time(time)
+      local&.strftime('%b %-d, %Y')
+    end
+
+    def b270_datetime(time)
+      local = Bible270.local_time(time)
+      local&.strftime('%b %-d, %Y at %-I:%M %p')
+    end
+
+    # Only the writer may change their own words. An admin can remove a reflection
+    # but not rewrite it: putting words in someone's mouth is worse than taking
+    # them away, and taking them away is already the moderator's job.
+    def b270_can_edit?(comment)
+      signed_in? && comment.reader_id == current_reader.id
+    end
+
+    def b270_can_delete?(comment)
+      return false unless signed_in?
+
+      comment.reader_id == current_reader.id || Bible270.config.admin?(current_reader)
+    end
+
+    # One cell of the 270-day grid. Four views drew this by hand in four slightly
+    # different ways; now they all call this.
+    #
+    # The title attribute carries the readings, so hovering a square says what is
+    # on that day — no JavaScript, and it works for keyboard focus too.
+    def b270_day_cell(day, reader: nil, today: nil)
+      link_to day, day_path(day),
+              class: b270_day_cell_classes(day, reader: reader, today: today),
+              title: b270_day_readings(day)
+    end
+
+    # Shared with the admin grid, which is a button_to rather than a link because
+    # it toggles the day rather than navigating to it.
+    def b270_day_cell_classes(day, reader: nil, today: nil)
+      classes = ['b270-cell', b270_day_status_class(reader, day)]
+      classes << 'talk' if b270_days_with_reflections.include?(day)
+      classes << 'now' if today && day == today
+
+      classes.reject(&:blank?).join(' ')
+    end
+
+    # "Genesis 1-3 · Matthew 1 · Psalm 1" as plain text, for a title attribute.
+    def b270_day_readings(day)
+      readings = Bible270::Plan.readings_for(day)
+      Bible270::Plan::TRACKS.keys.filter_map { |track| readings[track] }.join(' · ')
+    end
+
+    # The same references as links to the passage, in the reader's own translation
+    # when they have chosen one — b270_passage_url falls back to the site default
+    # for a visitor.
+    def b270_day_reading_links(day)
+      readings = Bible270::Plan.readings_for(day)
+
+      links = Bible270::Plan::TRACKS.keys.filter_map do |track|
+        reference = readings[track]
+        next if reference.blank?
+
+        link_to reference, b270_passage_url(reference),
+                class: 'b270-reflink', target: '_blank', rel: 'noopener'
+      end
+
+      safe_join(links, ' · ')
+    end
+
+    # The days that have at least one visible reflection, fetched once per request.
+    # Called from the layout's grid, which no controller sets up, so it cannot be an
+    # instance variable assigned in an action.
+    def b270_days_with_reflections
+      @b270_days_with_reflections ||=
+        if defined?(Bible270::Comment)
+          Bible270::Comment.approved.distinct.pluck(:day).to_set
+        else
+          Set.new
+        end
+    rescue StandardError
+      Set.new
+    end
+
     def b270_day_status_class(reader, day)
       return '' unless reader
 

data/app/models/bible270/comment.rb

@@ -3,6 +3,15 @@
 module Bible270
   # A publicly visible reflection attached to a plan day (optionally a track).
   class Comment < ApplicationRecord
+    # One heart for both states. An unliked one is the same emoji shown grey by
+    # CSS, so it cannot drift in size from a real like, and hovering it previews
+    # exactly what clicking will produce.
+    #
+    # The white heart this replaced was legible on white but nearly invisible on
+    # 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 = '❤️'
+
     self.table_name = 'bible270_comments'
 
     belongs_to :reader, class_name: 'Bible270::Reader'
@@ -12,6 +21,7 @@ module Bible270
     belongs_to :parent, class_name: 'Bible270::Comment', optional: true
     has_many :replies, class_name: 'Bible270::Comment', foreign_key: :parent_id,
                        dependent: :destroy, inverse_of: :parent
+    has_many :likes, class_name: 'Bible270::Like', dependent: :destroy, inverse_of: :comment
 
     validates :day, inclusion: { in: 1..Plan::DAYS }
     validates :body, presence: true, length: { maximum: 4000 }
@@ -28,13 +38,18 @@ module Bible270
     # Fires once the reflection is really saved, so nothing is sent for one whose
     # transaction rolls back.
     after_create_commit :notify_mentioned_readers
+    # Only the people newly named: editing a reflection five times must not mail
+    # the same reader five times.
+    after_update_commit :notify_newly_mentioned_readers
 
     scope :approved, -> { where(approved: true) }
     scope :hidden,   -> { where(approved: false) }
     # Only the reflections themselves: replies are rendered under their parent, so
     # listing them again at the top level would show each twice.
     scope :for_day,  ->(d) { approved.where(day: d, parent_id: nil).order(created_at: :asc) }
-    scope :threads_for_day, ->(d) { for_day(d).includes(:reader, replies: :reader) }
+    scope :threads_for_day, ->(d) {
+      for_day(d).includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+    }
     scope :recent, -> { approved.order(created_at: :desc) }
 
     # Every reflection is visible when written; these are the moderation actions.
@@ -43,6 +58,31 @@ module Bible270
     def hidden?  = !approved
     def reply?   = parent_id.present?
 
+    def liked_by?(reader)
+      return false if reader.nil?
+
+      likes.any? { |like| like.reader_id == reader.id }
+    end
+
+    # Toggling returns the new state, so a caller can say what happened without
+    # asking again.
+    def toggle_like!(reader)
+      existing = likes.find { |like| like.reader_id == reader.id }
+      if existing
+        existing.destroy
+        likes.reload
+        false
+      else
+        likes.create(reader: reader)
+        likes.reload
+        true
+      end
+    end
+
+    # A second's grace: created_at and updated_at differ by microseconds on
+    # insert, which would mark every reflection as edited.
+    def edited? = updated_at - created_at > 1
+
     # Visible replies, oldest first: a conversation reads forwards.
     def visible_replies = replies.approved.order(created_at: :asc)
     def moderated? = moderated_at.present?
@@ -70,11 +110,19 @@ module Bible270
 
     # A mention emails the person named. Failures are logged rather than raised:
     # nobody should lose a reflection because the mail server is down.
-    def notify_mentioned_readers
+    def notify_newly_mentioned_readers
+      return unless saved_change_to_body?
+
+      already = Reader.mentioned_in(body_before_last_save).map(&:id)
+      notify_mentioned_readers(except: already)
+    end
+
+    def notify_mentioned_readers(except: [])
       return unless Bible270.config.mention_notifications
 
       Reader.mentioned_in(body).each do |mentioned|
         next if mentioned.id == reader_id
+        next if except.include?(mentioned.id)
         next unless mentioned.wants_mention_notices?
 
         notice = NoticeMailer.mentioned(comment_id: id, reader_id: mentioned.id)

data/app/models/bible270/like.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Bible270
+  # A reader's heart on a reflection. There is nothing to a like but who gave it
+  # and when — the count is the number of rows, and the hover text is the name.
+  class Like < ApplicationRecord
+    self.table_name = 'bible270_likes'
+
+    belongs_to :reader, class_name: 'Bible270::Reader'
+    belongs_to :comment, class_name: 'Bible270::Comment'
+
+    validates :reader_id, uniqueness: { scope: :comment_id }
+  end
+end

data/app/models/bible270/reader.rb

@@ -8,6 +8,7 @@ module Bible270
 
     has_many :checkoffs, class_name: 'Bible270::Checkoff', dependent: :destroy
     has_many :comments,  class_name: 'Bible270::Comment',  dependent: :destroy
+    has_many :likes,     class_name: 'Bible270::Like',     dependent: :destroy, inverse_of: :reader
     belongs_to :owner, polymorphic: true, optional: true
 
     # Active Storage is optional: an app may have it disabled, and the engine has

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

@@ -18,7 +18,7 @@
         <div class="b270-cmeta">
           <strong><%= comment.reader.display_name %></strong>
           · <%= link_to "day #{comment.day}", day_path(comment.day) %>
-          · <%= comment.created_at.strftime('%b %-d, %Y') %>
+          · <%= b270_date(comment.created_at) %>
           <% 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>

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

@@ -9,7 +9,7 @@
   <% if @enrollment_closed %>
     <% if @enrollment_closed_at %>
       <p class="b270-startline">Enrollment closed
-      on <%= @enrollment_closed_at.strftime('%B %-d, %Y') %><% end %>.
+      on <%= b270_date(@enrollment_closed_at) %><% end %>.
       The <%= @readers.size %> reader<%= 's' unless @readers.size == 1 %> already taking part can
       still sign in and carry on.</p>
     <%= button_to 'Open to new readers', admin_enrollment_path, method: :patch,

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

@@ -80,7 +80,8 @@
   <div class="b270-grid" style="margin-top:16px">
     <% (1..Bible270::Plan::DAYS).each do |d| %>
       <%= button_to d, admin_reader_day_path(@reader, d), method: :post,
-            class: "b270-cell #{b270_day_status_class(@reader, d)}",
+            class: b270_day_cell_classes(d, reader: @reader),
+            title: b270_day_readings(d),
             form: { style: 'display:contents', id: "day-#{d}" } %>
     <% end %>
   </div>

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

@@ -1,28 +1,52 @@
 <%# locals: (comment:, reply: false) %>
+<%#
+  Whether this reflection is being edited comes from the controller rather than a
+  local, so it works for a reply as well as a top-level reflection without the day
+  view having to thread a flag through the collection. It is nil everywhere else
+  the partial is rendered.
+%>
+<% editing = @editing_comment_id.present? && @editing_comment_id == comment.id %>
 <div class="b270-comment <%= 'b270-reply' if reply %>" id="comment-<%= comment.id %>">
   <%= b270_avatar(comment.reader, size: reply ? 28 : 34) %>
   <div style="flex:1">
     <div class="b270-cmeta">
       <strong><%= link_to comment.reader.display_name, reader_path(comment.reader), style: "text-decoration:none" %></strong>
-      · <%= comment.created_at.strftime("%b %-d, %Y") %>
+      · <%= b270_date(comment.created_at) %>
       <% if comment.track.present? %>· <%= b270_track(comment.track)[:label] %><% end %>
-      <% if signed_in? && comment.reader_id == current_reader.id %>
+      <% if comment.edited? %>· <span class="b270-edited" title="<%= b270_datetime(comment.updated_at) %>">edited</span><% end %>
+      <% if b270_can_edit?(comment) %>
+        <%= link_to "edit", day_path(comment.day, edit: comment.id, anchor: "comment-#{comment.id}"),
+              class: "b270-cedit" %>
+      <% end %>
+      <% if b270_can_delete?(comment) %>
+        <%# The confirm goes on the form, since button_to renders one and that is
+            where Turbo looks. Only when removing someone else's: confirming your
+            own deletion every time would be nagging. %>
         <%= button_to "delete", comment_path(comment), method: :delete, class: "b270-cdel",
-              form: { style: "display:inline", data: { turbo_stream: true } } %>
+              form: { style: "display:inline",
+                      data: { turbo_stream: true,
+                              turbo_confirm: (b270_can_edit?(comment) ? nil : "Delete #{comment.reader.display_name}'s reflection?") } } %>
       <% end %>
     </div>
 
-    <p class="b270-cbody"><%= b270_with_mentions(comment.body) %></p>
+    <% if editing %>
+      <%= render partial: "bible270/comments/edit_fields", locals: { comment: comment } %>
+    <% else %>
+      <p class="b270-cbody"><%= b270_with_mentions(comment.body) %></p>
+    <% end %>
 
     <%# Only a top-level reflection can be replied to: one level deep, so a reply
         offers no Reply of its own. %>
-    <% unless reply %>
-      <% if signed_in? && comment.reader_id != current_reader.id %>
-        <div class="b270-creply">
-          <%= link_to "Reply", day_path(comment.day, reply_to: comment.id, anchor: "new_comment_form"),
-                class: "b270-linkbtn" %>
-        </div>
+    <div class="b270-cactions">
+      <%= render partial: "bible270/likes/likes", locals: { comment: comment } %>
+      <%# A reply may be liked but not replied to: one level deep. %>
+      <% if !reply && signed_in? && comment.reader_id != current_reader.id %>
+        <%= link_to "Reply", day_path(comment.day, reply_to: comment.id, anchor: "new_comment_form"),
+              class: "b270-linkbtn" %>
       <% end %>
+    </div>
+
+    <% unless reply %>
 
       <div class="b270-replies" id="replies-<%= comment.id %>">
         <%= render partial: "bible270/comments/comment",

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

@@ -0,0 +1,25 @@
+<%# locals: (comment:) %>
+<%#
+  The edit form for one reflection. Reached by ?edit=<id> on the day page, which
+  needs no JavaScript — the same approach as ?reply_to=. Turbo will upgrade the
+  save to a stream when it is driving the page, and fall back to a redirect when
+  it is not.
+%>
+<%= form_with model: comment, url: comment_path(comment), method: :patch,
+      class: "b270-form b270-editform", data: { turbo_stream: true } do |f| %>
+  <% if comment.errors.any? %>
+    <p class="b270-editerror"><%= comment.errors.full_messages.to_sentence %></p>
+  <% end %>
+
+  <%= f.text_area :body %>
+  <div class="row">
+    <% unless comment.reply? %>
+      <%= f.select :track,
+            options_for_select([["The whole day", ""]] + Bible270::Plan::TRACKS.map { |k, v| [v[:label], k] },
+                               comment.track.to_s),
+            {}, class: "b270-select", style: "width:auto" %>
+    <% end %>
+    <%= f.submit "Save", class: "b270-btn" %>
+    <%= link_to "Cancel", day_path(comment.day, anchor: "comment-#{comment.id}"), class: "b270-linkbtn" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,7 @@
+<%# locals: (comment:) %>
+<div class="b270-comment b270-editing" id="comment-<%= comment.id %>">
+  <%= b270_avatar(comment.reader) %>
+  <div style="flex:1">
+    <%= render partial: "bible270/comments/edit_fields", locals: { comment: comment } %>
+  </div>
+</div>

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

@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "comment-#{@comment.id}" do %>
+  <%= render partial: "bible270/comments/edit_form", locals: { comment: @comment } %>
+<% end %>

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

@@ -0,0 +1,52 @@
+<% content_for :title, "Reflections — #{Bible270.config.app_name}" %>
+<% content_for :hide_day_index, true %><%# this page has its own, filtered grid %>
+
+<p class="b270-eyebrow">Reflections</p>
+<h1>Shared gleanings</h1>
+
+<% if @days_with_reflections.any? %>
+  <div class="b270-panel">
+    <h2 class="b270-subhead">Days with reflections</h2>
+    <p class="b270-hint" style="margin-top:0">
+      <%= @days_with_reflections.size %>
+      of <%= Bible270::Plan::DAYS %> days have been written about.
+    </p>
+
+    <%# Only the days that have something on them, so the grid is a map of the
+        conversation rather than of the plan. Squares keep their usual meaning:
+        the fill is reading progress, and hovering shows that day's readings. %>
+    <div class="b270-grid">
+      <% @days_with_reflections.each do |day| %>
+        <%= b270_day_cell(day, reader: current_reader) %>
+      <% end %>
+    </div>
+  </div>
+
+  <h2 class="b270-section-h">Most recent</h2>
+  <div id="comments">
+    <% @threads.each do |thread| %>
+      <div class="b270-thread">
+        <p class="b270-threadday">
+          <%= link_to "Day #{thread.day}", day_path(thread.day) %>
+          · <%= b270_day_reading_links(thread.day) %>
+        </p>
+        <%= render partial: "bible270/comments/comment", locals: { comment: thread, reply: false } %>
+      </div>
+    <% end %>
+  </div>
+
+  <p style="margin-top:18px">
+    <%= link_to "Browse the whole plan →", root_path %>
+  </p>
+<% else %>
+  <div class="b270-panel">
+    <p class="b270-signedout" style="margin:0">
+      No one has written a reflection yet.
+      <% if signed_in? %>
+        <%= link_to "Be the first", day_path(current_reader.current_day) %>.
+      <% else %>
+        <%= link_to "Sign in", sign_in_path %> to add one.
+      <% end %>
+    </p>
+  </div>
+<% end %>

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

@@ -0,0 +1,4 @@
+<%= turbo_stream.replace "comment-#{@comment.id}" do %>
+  <%= render partial: "bible270/comments/comment",
+        locals: { comment: @comment, reply: @comment.reply? } %>
+<% end %>

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

@@ -15,8 +15,8 @@
         <%= b270_avatar(r) %>
         <div>
           <div class="name"><%= link_to r.display_name, reader_path(r), style: "text-decoration:none" %></div>
-          <% @day_number = @days_completed[r.id] == 1 ? "day" : "days" %>
-          <div class="sub"><%= @days_completed[r.id] %> <%= @day_number %> read</div>
+          <% day_word = @days_completed[r.id] == 1 ? "day" : "days" %>
+          <div class="sub"><%= @days_completed[r.id] %> <%= day_word %> read</div>
         </div>
         <div class="stat"><span class="big"><%= (@days_completed[r.id].to_f / Bible270::Plan::DAYS * 100).round %>%</span></div>
       </div>

data/app/views/bible270/likes/_likes.html.erb

@@ -0,0 +1,27 @@
+<%# locals: (comment:) %>
+<%#
+  One heart per like, each carrying its giver's name — so a row of hearts is both
+  the count and, on hover, the list of who.
+
+  Your own like is not drawn in the row: the button is your heart, filled, and
+  saying so. Drawing both gave a reader two hearts for one like.
+%>
+<%
+  liked = signed_in? && comment.liked_by?(current_reader)
+  others = signed_in? ? comment.likes.reject { |like| like.reader_id == current_reader.id } : comment.likes
+%>
+<span class="b270-likes" id="likes-<%= comment.id %>">
+  <% others.each do |like| %><span class="b270-heart"
+      title="<%= like.reader.display_name %>"><%= Bible270::Comment::HEART %></span><% end %>
+
+  <% if signed_in? %>
+    <%= button_to like_comment_path(comment), method: :post, class: "b270-likebtn#{' liked' if liked}",
+          form: { style: "display:inline", data: { turbo_stream: true } },
+          aria: { label: liked ? "Take back your like" : "Like this reflection" },
+          title: liked ? "You liked this — tap to take it back" : "Like this reflection" do %>
+      <%= Bible270::Comment::HEART %>
+    <% end %>
+  <% elsif comment.likes.any? %>
+    <span class="b270-likecount"><%= comment.likes.size %></span>
+  <% end %>
+</span>

data/app/views/bible270/likes/toggle.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.replace "likes-#{@comment.id}" do %>
+  <%= render partial: "bible270/likes/likes", locals: { comment: @comment } %>
+<% end %>

data/app/views/bible270/notice_mailer/new_reader.html.erb

@@ -11,7 +11,7 @@
         <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Name</td><td><%= @reader.display_name %></td></tr>
         <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Email</td><td><%= @reader.email.presence || '(none given)' %></td></tr>
         <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Signed in with</td><td><%= @reader.provider.presence || 'the host application' %></td></tr>
-        <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Joined</td><td><%= @reader.created_at.strftime('%B %-d, %Y at %-I:%M %p') %></td></tr>
+        <tr><td style="padding:3px 12px 3px 0;color:#6d6558">Joined</td><td><%= Bible270.local_time(@reader.created_at).strftime('%B %-d, %Y at %-I:%M %p') %></td></tr>
       </table>
 
       <p style="margin:18px 0 0;font-size:14px;color:#6d6558">

data/app/views/bible270/notice_mailer/new_reader.text.erb

@@ -3,7 +3,7 @@
   Name:        <%= @reader.display_name %>
   Email:       <%= @reader.email.presence || '(none given)' %>
   Signed in with: <%= @reader.provider.presence || 'the host application' %>
-  Joined:      <%= @reader.created_at.strftime('%B %-d, %Y at %-I:%M %p') %>
+  Joined:      <%= Bible270.local_time(@reader.created_at).strftime('%B %-d, %Y at %-I:%M %p') %>
 
 That makes <%= @total %> reader<%= 's' unless @total == 1 %> taking part.
 <% if @admin_url %>

data/app/views/bible270/readers/index.html.erb

@@ -11,7 +11,7 @@
         <%= b270_avatar(r, size: 40) %>
         <div>
           <div class="name"><%= link_to r.display_name, reader_path(r), style: "text-decoration:none" %></div>
-          <div class="sub"><%= @days_completed[r.id] %> of <%= Bible270::Plan::DAYS %> days · joined <%= r.created_at.strftime("%b %Y") %></div>
+          <div class="sub"><%= @days_completed[r.id] %> of <%= Bible270::Plan::DAYS %> days · joined <%= Bible270.local_time(r.created_at).strftime("%b %Y") %></div>
         </div>
         <div class="stat">
           <span class="big"><%= (@days_completed[r.id].to_f / Bible270::Plan::DAYS * 100).round %>%</span>

data/app/views/bible270/readers/progress.html.erb

@@ -18,10 +18,10 @@
     <div class="b270-grid">
       <% today = @reader.today_day %>
       <% (1..Bible270::Plan::DAYS).each do |d| %>
-        <%= link_to d, day_path(d),
-              class: "b270-cell #{b270_day_status_class(@reader, d)} #{'now' if d == today}" %>
+        <%= b270_day_cell(d, reader: @reader, today: today) %>
       <% end %>
     </div>
+<p class="b270-gridnote">Dot indicates days with reflections.</p>
     <p class="b270-hint">Filled squares are days you have finished; a lighter square means you have
        read some of that day but not all of it.</p>
   </div>

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

@@ -22,7 +22,8 @@
 
 <div class="b270-grid">
   <% (1..Bible270::Plan::DAYS).each do |d| %>
-    <%= link_to d, day_path(d), class: "b270-cell #{b270_day_status_class(@reader, d)}" %>
+    <%= b270_day_cell(d, reader: @reader) %>
   <% end %>
 </div>
+<p class="b270-gridnote">Dot indicates days with reflections.</p>
 

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

@@ -4,9 +4,9 @@
     <div class="b270-grid">
       <% today = signed_in? ? current_reader.current_day : nil %>
       <% (1..Bible270::Plan::DAYS).each do |d| %>
-        <%= link_to d, day_path(d),
-              class: "b270-cell #{b270_day_status_class(current_reader, d)} #{'now' if d == today}" %>
+        <%= b270_day_cell(d, reader: current_reader, today: today) %>
       <% end %>
     </div>
+<p class="b270-gridnote">Dot indicates days with reflections.</p>
   </details>
 <% end %>

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

@@ -0,0 +1,16 @@
+<%# locals: (reflections: true) %>
+<%#
+  Six states need saying out loud: three degrees of progress, each of which may
+  also have reflections. Hovering a square shows that day's readings.
+
+  reflections: false on the Reflections page, where every square has them by
+  definition and the entry would explain nothing.
+%>
+<p class="b270-legend">
+  <span><i></i> not yet read</span>
+  <span><i class="partial"></i> partly read</span>
+  <span><i class="complete"></i> finished</span>
+  <% if reflections %>
+    <span><i class="talk"></i> has reflections</span>
+  <% end %>
+</p>

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

@@ -9,12 +9,14 @@
     <% end %>
   </div>
   <nav class="b270-nav">
-    <%= link_to "Plan", root_path %>
+    <!--<%= link_to "Plan", root_path %>-->
     <%= link_to "People", community_path %>
+    <%# Public, like the community page: anyone may read reflections. %>
+    <%= link_to "Posts", reflections_path %>
     <% if signed_in? %>
-      <% if Bible270.config.admin?(current_reader) %><%= link_to "Admin", admin_path %><% end %>
       <%= link_to "Progress", progress_path %>
       <%= link_to "Profile", profile_path %>
+      <% if Bible270.config.admin?(current_reader) %><%= link_to "Admin", admin_path %><% end %>
       <%= button_to "Sign out", sign_out_path, method: :delete, class: "b270-linkbtn",
             form: { style: "display:inline" } %>
     <% elsif Bible270.config.any_sign_in_method? %>

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

@@ -19,7 +19,7 @@
       <div style="flex:1">
         <div class="b270-cmeta">
           <%= link_to "Day #{comment.day}", day_path(comment.day) %>
-          · <%= comment.created_at.strftime("%b %-d, %Y") %>
+          · <%= b270_date(comment.created_at) %>
           <% if moderate && comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
         </div>
 

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

@@ -54,7 +54,7 @@
   .b270-flash.notice{background:#e7efe6;color:#2f5d34;border:1px solid #c6dcc6}
 
   .b270-eyebrow{font-size:12px;letter-spacing:.18em;text-transform:uppercase;color:var(--gold);font-weight:600;margin:0 0 10px}
-  .b270 h1{font-family:"Spectral",serif;font-weight:600;font-size:clamp(28px,6vw,42px);line-height:1.03;letter-spacing:-.01em;margin:0 0 6px}
+  .b270 h1{font-family:"Spectral",serif;font-weight:600;font-size:clamp(22px,6vw,33px);line-height:1.03;letter-spacing:-.01em;margin:0 0 6px}
   .b270 h1 em{font-style:italic;color:var(--muted);font-weight:400}
   .b270 .lede{color:var(--muted);max-width:77ch;margin:0 0 24px;font-size:15px}
 
@@ -76,7 +76,7 @@
   .b270-startform{display:flex;align-items:center;gap:10px;margin-top:10px;flex-wrap:wrap}
   .b270-startform input[type=date]{font:inherit;font-size:14px;padding:8px 10px;border:1px solid var(--line);border-radius:8px;background:#fff;color:var(--ink)}
   .b270-linkbtn{background:none;border:none;padding:0;margin-top:8px;font:inherit;font-size:12.5px;color:var(--oxblood);cursor:pointer;text-decoration:underline}
-  .b270-hint{margin:8px 0 0;font-size:12px;color:var(--faint);max-width:52ch}
+  .b270-hint{margin:8px 0 0;font-size:12px;color:var(--faint);max-width:111ch}
   .b270-tracks{margin-top:16px;display:grid;gap:11px}
   .b270-tm{display:grid;grid-template-columns:130px 1fr auto;align-items:center;gap:12px;font-size:12.5px}
   .b270-tm .lab{color:var(--muted);display:flex;align-items:center;gap:8px}
@@ -161,8 +161,27 @@
   .b270-replying strong{color:var(--ink)}
   .b270-mention{color:var(--teal);font-weight:600;text-decoration:none}
   .b270-mention:hover{text-decoration:underline}
+  .b270-cactions{display:flex;align-items:center;gap:12px;margin-top:6px;flex-wrap:wrap}
+  .b270-likes{display:inline-flex;align-items:center;gap:2px}
+  .b270-heart{font-size:13px;line-height:1;cursor:default}
+  /* Same size as a heart in the row: the button is one of the hearts, not a
+     control sitting beside them. Unliked, it is the same emoji desaturated —
+     visible against the paper, and hovering shows what clicking will give. */
+  .b270-likebtn{background:none;border:0;padding:0 2px;font-size:13px;line-height:1;cursor:pointer;
+                filter:grayscale(1);opacity:.5;transition:filter .12s,opacity .12s}
+  .b270-likebtn:hover{filter:none;opacity:1}
+  .b270-likebtn.liked{filter:none;opacity:1}
+  .b270-likecount{font-size:11.5px;color:var(--faint);margin-left:2px}
   .b270-creply{margin-top:6px}
   .b270-cbody{margin:3px 0 0;white-space:pre-wrap}
+  .b270-editform{margin-top:6px}
+  .b270-editform textarea{min-height:64px}
+  .b270-editerror{margin:0 0 8px;font-size:13px;color:var(--oxblood)}
+  .b270-cedit{font-size:12px;color:var(--muted);margin-left:8px}
+  .b270-cedit:hover{color:var(--gold)}
+  .b270-edited{font-style:italic;color:var(--faint)}
+  .b270-comment.b270-editing{background:rgba(165,129,44,.05);border-radius:10px;padding:12px}
+  .b270-editing textarea{min-height:64px}
   .b270-cdel{font-size:12px;color:var(--oxblood);background:none;border:none;cursor:pointer;padding:0;margin-left: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-form .row{display:flex;align-items:center;gap:10px;margin-top:10px}
@@ -185,8 +204,27 @@
   .b270-cell:hover{border-color:var(--gold);color:var(--gold)}
   .b270-cell.partial{background:linear-gradient(135deg,var(--card) 50%,rgba(165,129,44,.35) 50%);color:var(--muted)}
   .b270-cell.complete{background:var(--teal);border-color:var(--teal);color:#eef3f2;font-weight:600}
+  /* Days that have reflections carry a dot and nothing else: the fill stays
+     free to mean reading progress, so the two facts never compete. On a finished
+     square the dot goes pale, since oxblood on teal is hard to pick out. */
+  .b270-cell.talk{position:relative}
+  .b270-cell.talk::after{content:"";position:absolute;top:3px;right:3px;width:7px;height:7px;border-radius:50%;background:var(--oxblood)}
+  .b270-cell.talk.complete::after{background:#f4efe6}
   .b270-cell.now{box-shadow:0 0 0 2px var(--gold)}
 
+  /* On the Reflections page each thread carries the day it belongs to, since
+     there is no day heading above it. */
+  .b270-thread{margin-bottom:8px}
+  .b270-threadday{margin:0;font-size:12px;letter-spacing:.04em;color:var(--faint)}
+  .b270-threadday a{color:var(--gold);font-weight:600;text-decoration:none}
+  .b270-threadday a:hover{text-decoration:underline}
+  /* Scripture references stay undecorated, hover included, so a line of three of
+     them does not read as a row of buttons. */
+  .b270-threadday .b270-reflink,
+  .b270-threadday .b270-reflink:hover{color:var(--muted);font-weight:400;text-decoration:none}
+  .b270-threadday .b270-reflink:hover{color:var(--ink)}
+  .b270-gridnote{margin:10px 0 0;font-size:11.5px;color:var(--faint)}
+
   .b270-footer{margin-top:20px;padding-top:11px;border-top:1px solid var(--line-soft);color:var(--faint);font-size:13px}
   .b270-footer p{margin:0;line-height:1.5}
   details.b270-index summary{cursor:pointer;font-family:"Spectral",serif;font-size:18px;font-weight:600;list-style:none;margin-top:30px}

data/config/routes.rb

@@ -12,6 +12,8 @@ Bible270::Engine.routes.draw do
                                    constraints: { day: %r{\d+} }
   post   'day/:day/comments',      to: 'comments#create',  as: :day_comments,
                                    constraints: { day: %r{\d+} }
+  post   'comments/:id/like',      to: 'likes#toggle',     as: :like_comment
+  patch  'comments/:id',           to: 'comments#update'
   delete 'comments/:id',           to: 'comments#destroy', as: :comment
 
   # Admin panel — 404s unless config.admin_emails / admin_resolver allows you.
@@ -34,6 +36,8 @@ Bible270::Engine.routes.draw do
   patch 'profile',                       to: 'profiles#update'
   delete 'profile/avatar', to: 'profiles#remove_avatar', as: :profile_avatar
 
+  get 'reflections', to: 'comments#index', as: :reflections
+
   get 'progress', to: 'readers#progress', as: :progress
 
   get 'community', to: 'readers#index', as: :community

data/db/migrate/20260101000013_create_bible270_likes.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class CreateBible270Likes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :bible270_likes do |t|
+      t.references :reader, null: false, index: false,
+                            foreign_key: { to_table: :bible270_readers }
+      t.references :comment, null: false, index: false,
+                             foreign_key: { to_table: :bible270_comments }
+      t.timestamps
+    end
+
+    # One like per reader per reflection, enforced by the database as well as the
+    # model: a double-tap should not become two hearts.
+    add_index :bible270_likes, %i[reader_id comment_id], unique: true,
+                               name: 'idx_b270_likes_unique'
+    # Reading a thread asks for a comment's likes, so that is the index that earns
+    # its keep.
+    add_index :bible270_likes, :comment_id, name: 'idx_b270_likes_comment'
+  end
+end

data/lib/bible270/configuration.rb

@@ -292,7 +292,7 @@ module Bible270
     # from, so without this the notice names the reader but cannot link to them.
     attr_accessor :mailer_host
 
-    attr_accessor :after_sign_out_path, :email_sign_in_max_per_window, :passage_url_builder, :tagline, :footer_html, :footer, :favicon, :avatar_max_bytes, :chapter_breaks, :admin_emails, :admin_resolver, :bible_version, :header_mark, :remember_for, :require_sign_in_to_participate
+    attr_accessor :after_sign_out_path, :email_sign_in_max_per_window, :passage_url_builder, :tagline, :footer_html, :footer, :favicon, :avatar_max_bytes, :chapter_breaks, :admin_emails, :admin_resolver, :bible_version, :header_mark, :remember_for, :require_sign_in_to_participate, :mention_notifications
 
     # Public labels.
     attr_accessor :app_name
@@ -331,7 +331,9 @@ module Bible270
 
     # Email a reader when someone writes "@them" in a reflection. Readers can opt
     # out individually on their profile; this switches the whole feature off.
-    attr_accessor :mention_notifications
+    # How many recent threads the Reflections page shows. A thread resurfaces when
+    # someone replies to it, so this is a count of conversations, not of messages.
+    attr_accessor :reflections_page_size
 
     def remember_signed_in?
       remember_for.to_i.positive?
@@ -354,6 +356,7 @@ module Bible270
       @app_name = 'Daily Bread'
       @tagline = 'Journeying through Scripture in 9 months'
       @time_zone = nil
+      @reflections_page_size = 10
       @mention_notifications = true
       @header_mark = nil
       @remember_for = 365 * 24 * 60 * 60

data/lib/bible270/version.rb

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

data/lib/bible270.rb

@@ -22,10 +22,24 @@ module_function
   # it; Date.today follows the machine. A self-hosted reading plan wants the
   # latter, so that is the default, with config.time_zone to override.
   def today
-    zone = config.time_zone
-    return Date.today if zone.nil? || zone.to_s.empty?
+    local_time(Time.now).to_date
+  end
 
-    found = Time.respond_to?(:find_zone) ? Time.find_zone(zone) : nil
-    found ? found.today : Date.today
+  # A stored timestamp in the plan's own zone.
+  #
+  # created_at and friends come back in Rails' Time.zone, which is UTC unless the
+  # host app sets it — so a reflection written at 5pm in Los Angeles was being
+  # shown as the next day. This is the same rule Bible270.today follows: the
+  # machine's zone, or config.time_zone when one is given.
+  def local_time(time)
+    return nil if time.nil?
+
+    zone = config.time_zone
+    if zone.to_s.empty?
+      time.getlocal
+    else
+      found = Time.respond_to?(:find_zone) ? Time.find_zone(zone) : nil
+      found ? time.in_time_zone(found) : time.getlocal
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.17.1
 platform: ruby
 authors:
 - Andrew vonderLuft
@@ -85,6 +85,7 @@ files:
 - app/controllers/bible270/checkoffs_controller.rb
 - app/controllers/bible270/comments_controller.rb
 - app/controllers/bible270/days_controller.rb
+- app/controllers/bible270/likes_controller.rb
 - app/controllers/bible270/profiles_controller.rb
 - app/controllers/bible270/readers_controller.rb
 - app/controllers/bible270/sessions_controller.rb
@@ -95,6 +96,7 @@ files:
 - app/models/bible270/application_record.rb
 - app/models/bible270/checkoff.rb
 - app/models/bible270/comment.rb
+- app/models/bible270/like.rb
 - app/models/bible270/reader.rb
 - app/models/bible270/setting.rb
 - app/models/bible270/sign_in_token.rb
@@ -103,13 +105,20 @@ files:
 - app/views/bible270/admin/show.html.erb
 - app/views/bible270/checkoffs/toggle.turbo_stream.erb
 - app/views/bible270/comments/_comment.html.erb
+- app/views/bible270/comments/_edit_fields.html.erb
+- app/views/bible270/comments/_edit_form.html.erb
 - app/views/bible270/comments/_form.html.erb
 - app/views/bible270/comments/create.turbo_stream.erb
 - app/views/bible270/comments/destroy.turbo_stream.erb
+- app/views/bible270/comments/edit.turbo_stream.erb
+- app/views/bible270/comments/index.html.erb
+- app/views/bible270/comments/update.turbo_stream.erb
 - app/views/bible270/days/_reading.html.erb
 - app/views/bible270/days/_start_date.html.erb
 - app/views/bible270/days/index.html.erb
 - app/views/bible270/days/show.html.erb
+- app/views/bible270/likes/_likes.html.erb
+- app/views/bible270/likes/toggle.turbo_stream.erb
 - app/views/bible270/notice_mailer/mentioned.html.erb
 - app/views/bible270/notice_mailer/mentioned.text.erb
 - app/views/bible270/notice_mailer/new_reader.html.erb
@@ -121,6 +130,7 @@ files:
 - app/views/bible270/sessions/new.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/_progress.html.erb
 - app/views/bible270/shared/_reflections.html.erb
@@ -142,6 +152,7 @@ files:
 - db/migrate/20260101000010_add_remember_token_to_bible270_readers.rb
 - db/migrate/20260101000011_add_mention_notices_to_bible270_readers.rb
 - db/migrate/20260101000012_add_parent_to_bible270_comments.rb
+- db/migrate/20260101000013_create_bible270_likes.rb
 - lib/bible270.rb
 - lib/bible270/avatars.rb
 - lib/bible270/configuration.rb