bible270 1.8.3 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be8007d9a8bdb9c797652387e0a4e8751e5fed2aa29d088d98287ca7d2b7e77a
-  data.tar.gz: d71275e3b9097162a126c3129e635a09ad5ee8bd43a899e349c619cd9e633473
+  metadata.gz: 37c1e22aede65482ba3d194eb1d2e74efde387475c1f264c30496e6330d3666c
+  data.tar.gz: 298306a3422ce83b4f68b2a8e8acaa16b956c30475a7d9d36afd88a76f086450
 SHA512:
-  metadata.gz: 59e2a645945d342632584219ac34231c458ccbe504b925009835144e4aa2b49c7fc9b6c61a169366c9a78e087d8e94648dea50a4a8c44906ca1ab77c3d40b08f
-  data.tar.gz: 7e4947ed4bebe9581261d18e2851ca3afab2661f94ab682f1759d5ce5f301d7b0353de97df88303b17ff2a5788a9ddf4484247018082abf814e86602501677da
+  metadata.gz: 471fff64f3f002999a00c5785bdf975aa5c5ed4723c9c107e7e738161f4b4740b7f73c29067f0aa22a5bdb3d0c5cf818b5e3ebcb27b9b89898a7e1a1340b0abf
+  data.tar.gz: b68eddc3274715999dde7df1df9928f4b0899e45323f18b91ba9e7d17781c81ad02df129ac52fcb09427fce8e8466d87f3b51be211c37fbbf30ad4fef8f15b15

data/CHANGELOG.md

@@ -7,6 +7,9 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
 ### Changed
 
 - keep Proverbs 7 whole and divide Proverbs 10 and 16 into four readings
+- show likes and replies on My Progress and reader pages, with admin edit links on reader pages
+- show each reader's pace beside their completed-day count for admins on Community
+- add edit, like, and reply controls to reflections on Admin reader pages
 
 **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.8.1...main)**
 

data/app/controllers/bible270/admin_controller.rb

@@ -97,7 +97,7 @@ module Bible270
       @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)
+      @comments = @reader.comments.includes(likes: :reader).order(created_at: :desc).limit(50)
     end
 
     # ---- reflections ------------------------------------------------------

data/app/controllers/bible270/readers_controller.rb

@@ -17,7 +17,7 @@ module Bible270
     def progress
       @reader = current_reader
       # Defaults keep the open visitor page simple and make every view input explicit.
-      @recent_comments = @reader ? @reader.comments.recent.limit(5) : Comment.none
+      @recent_comments = @reader ? recent_reflections(@reader, limit: 5) : []
       @partial_day_tasks = []
       @remaining_partial_days = 0
       return unless @reader
@@ -34,7 +34,7 @@ module Bible270
       redirect_to(community_path, alert: 'Reader not found.') and return unless @reader
 
       @days_completed = @reader.days_completed
-      @recent_comments = @reader.comments.recent.limit(20)
+      @recent_comments = recent_reflections(@reader, limit: 20)
     end
 
     def mention_suggestions
@@ -43,5 +43,16 @@ module Bible270
       response.headers['Cache-Control'] = 'private, no-store'
       render json: { suggestions: Reader.mention_suggestions(params[:q], except: current_reader) }
     end
+
+  private
+
+    def recent_reflections(reader, limit:)
+      comments = reader.comments.recent
+        .includes(:reader, { likes: :reader }, { replies: [:reader, { likes: :reader }] })
+        .limit(limit).to_a
+      ids = comments.map(&:id)
+      # A reader's own replies already appear beneath any listed parent reflection.
+      comments.reject { |comment| ids.include?(comment.parent_id) }
+    end
   end
 end

data/app/models/bible270/comment.rb

@@ -150,7 +150,14 @@ module Bible270
     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 visible_replies
+      if replies.loaded?
+        replies.select(&:approved?).sort_by { |reply| [reply.created_at, reply.id] }
+      else
+        replies.approved.order(created_at: :asc, id: :asc)
+      end
+    end
+
     def moderated? = moderated_at.present?
 
   private

data/app/models/bible270/reader.rb

@@ -643,6 +643,17 @@ module Bible270
       Plan.day_for(Bible270.today, effective_start_date)
     end
 
+    def progress_status(completed_days: days_completed)
+      today = calendar_day
+      return 'undated' unless today
+
+      difference = completed_days - today
+      return 'on track' if difference.zero?
+
+      amount = difference.abs
+      "#{amount} #{amount == 1 ? 'day' : 'days'} #{difference.positive? ? 'ahead' : 'behind'}"
+    end
+
     # Raw, unclamped — lets callers distinguish "not started yet" / "finished".
     # The plan day that today actually is, or nil when today falls outside the
     # plan's window. calendar_day clamps, so before the start date it reports day

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

@@ -90,8 +90,9 @@
             <% else %>
               <%= reader.provider %>
             <% end %>
-            · <%= @days_completed[reader.id] %>/<%= Bible270::Plan::DAYS %> days
             <% if reader.dated? %>· started <%= reader.effective_start_date.strftime('%b %-d, %Y') %><% end %>
+            · <%= @days_completed[reader.id] %>/<%= Bible270::Plan::DAYS %> days
+            · <%= @reader_report.status_for(reader) %>
           </div>
           <div class="sub b270-reader-activity">
             <% if (activity = @recent_reader_activities[reader.id]) %>

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

@@ -115,7 +115,8 @@
 
 
 <div class="b270-panel">
-  <%= render "bible270/shared/reflections", comments: @comments, moderate: true %>
+  <%= render "bible270/shared/interaction_status" %>
+  <%= render "bible270/shared/reflections", comments: @comments, moderate: true, editable: true, actions: true %>
 </div>
 
 <div class="b270-panel">
@@ -172,3 +173,4 @@
 </div>
 
 <p style="margin-top:18px"><%= link_to '← All readers', admin_path %></p>
+<%= render "bible270/shared/interaction_ui" %>

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

@@ -14,6 +14,7 @@
             joined <%= Bible270.local_time(r.created_at).strftime("%b %-d %Y") %><% if @show_admin_progress %>
               · <%= link_to "#{@days_completed[r.id]} of #{Bible270::Plan::DAYS} days complete",
                     admin_reader_path(r), class: "b270-admin-progress" %>
+              · <%= r.progress_status(completed_days: @days_completed[r.id].to_i) %>
             <% end %>
           </div>
         </div>

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

@@ -12,8 +12,10 @@
 
 <% if @reader %>
   <div class="b270-panel">
+    <%= render "bible270/shared/interaction_status" %>
     <%= render "bible270/shared/reflections", comments: @recent_comments,
-          title: "Your recent reflections", editable: true,
+          title: "Your recent reflections", editable: true, conversations: true,
           empty_text: "You have not written any reflections yet." %>
   </div>
+  <%= render "bible270/shared/interaction_ui" %>
 <% end %>

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

@@ -16,8 +16,11 @@
 </div>
 
 <div class="b270-panel">
+  <%= render "bible270/shared/interaction_status" %>
   <%= render "bible270/shared/reflections", comments: @recent_comments,
-        title: "Their reflections", empty_text: "No reflections yet." %>
+        title: "Their reflections", empty_text: "No reflections yet.",
+        conversations: true, editable: Bible270.config.admin?(current_reader) %>
 </div>
 
 <%= render "bible270/shared/day_index", reader: @reader, expanded: true %>
+<%= render "bible270/shared/interaction_ui" %>

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

@@ -1,4 +1,4 @@
-<%# locals: (comments:, title: "Their reflections", moderate: false, editable: false, empty_text: "None yet.") %>
+<%# locals: (comments:, title: "Their reflections", moderate: false, editable: false, actions: false, conversations: false, reply: false, empty_text: "None yet.") %>
 <%#
   A reader's reflections. Three views showed near-identical markup: the admin
   page, a reader's public page, and the progress page, differing only in whether
@@ -11,17 +11,21 @@
   No ERB tags in this comment: the first close-tag would end it and the rest
   would become live template code.
 %>
-<h2 class="b270-subhead"><%= title %></h2>
+<% if title.present? %><h2 class="b270-subhead"><%= title %></h2><% end %>
 
 <% if comments.any? %>
   <% comments.each do |comment| %>
-    <div class="b270-comment">
+    <div class="b270-comment <%= 'b270-reply' if reply %>" id="comment-<%= comment.id %>">
+      <% if reply %><%= b270_avatar(comment.reader, size: 36) %><% end %>
       <div style="flex:1">
         <div class="b270-cmeta">
+          <% if reply %>
+            <strong><%= link_to comment.reader.display_name, reader_path(comment.reader) %></strong> ·
+          <% end %>
           <%= link_to "Day #{comment.day}", day_path(comment.day) %>
           · <%= b270_date(comment.created_at) %>
           <% if moderate && comment.hidden? %><span class="b270-badge">Hidden</span><% end %>
-          <% if editable && b270_can_edit?(comment) %>
+          <% if editable && !comment.hidden? && b270_can_edit?(comment) %>
             <%= link_to "edit", day_path(comment.day, edit: comment.id, anchor: "comment-#{comment.id}"),
                   class: "b270-cedit" %>
           <% end %>
@@ -29,6 +33,27 @@
 
         <div class="b270-cbody"><%= b270_comment_body(comment) %></div>
 
+        <% if (actions || conversations) && !comment.hidden? %>
+          <div class="b270-cactions">
+            <%= render "bible270/likes/likes", comment: comment %>
+            <% if !comment.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>
+        <% end %>
+        <% if conversations %>
+          <% unless comment.reply? %>
+            <div class="b270-replies" id="replies-<%= comment.id %>">
+              <% replies = comment.visible_replies %>
+              <% if replies.any? %>
+                <%= render "bible270/shared/reflections", comments: replies, title: nil,
+                      conversations: true, reply: true, editable: editable %>
+              <% end %>
+            </div>
+          <% end %>
+        <% end %>
+
         <% if moderate %>
           <div style="display:flex;gap:10px;margin-top:6px">
             <% if comment.hidden? %>

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

@@ -239,6 +239,7 @@
   .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-cactions .b270-linkbtn{margin:0}
   .b270-likes{display:inline-flex;align-items:center;gap:3px;position:relative}
   .b270-heart{font-size:13px;line-height:1;cursor:default}
   /* The single heart is also the toggle for signed-in readers. It stays red

data/lib/bible270/reader_progress_report.rb

@@ -28,12 +28,16 @@ module Bible270
         Row.new(
           name: reader.display_name,
           days_read: days_read,
-          status: status(reader, days_read),
+          status: reader.progress_status(completed_days: days_read),
           last_activity: last_activity_date(reader)
         )
       end
     end
 
+    def status_for(reader)
+      reader.progress_status(completed_days: completed_days.fetch(reader.id, 0))
+    end
+
     def empty? = rows.empty?
 
     def to_table
@@ -79,16 +83,5 @@ module Bible270
       occurred_at = recent_activities[reader.id]&.occurred_at
       occurred_at ? Bible270.local_time(occurred_at).strftime('%b %-d, %Y') : '—'
     end
-
-    def status(reader, days_read)
-      calendar_day = reader.calendar_day
-      return 'undated' unless calendar_day
-
-      difference = days_read - calendar_day
-      return 'on track' if difference.zero?
-
-      amount = difference.abs
-      "#{amount} #{amount == 1 ? 'day' : 'days'} #{difference.positive? ? 'ahead' : 'behind'}"
-    end
   end
 end

data/lib/bible270/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.5
 platform: ruby
 authors:
 - Andrew vonderLuft