Assorted fixes for errors

app/assets/javascripts/comments.js

@@ -197,7 +197,7 @@ $(() => {
     $modal.find('.js-follower-display').html(data);
   });
 
-  $(document).on('click', '[class*=js--lock-thread] form', async (evt) => {
+  $(document).on('submit', '[class*=js--lock-thread] form', async (evt) => {
     evt.preventDefault();
 
     const $tgt = $(evt.target);

app/controllers/comments_controller.rb

@@ -219,47 +219,85 @@ def thread_rename
     redirect_to comment_thread_path(@comment_thread.id)
   end
 
+  def archive_thread
+    status = @comment_thread.update(archived: true, archived_by: current_user)
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def delete_thread
+    status = @comment_thread.update(deleted: true, deleted_by: current_user)
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def follow_thread
+    status = ThreadFollower.create(comment_thread: @comment_thread, user: current_user)
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def lock_thread
+    lu = nil
+    unless params[:duration].blank?
+      lu = params[:duration].to_i.days.from_now
+    end
+
+    status = @comment_thread.update(locked: true, locked_by: current_user, locked_until: lu)
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def unarchive_thread
+    status = @comment_thread.update(archived: false, archived_by: nil, ever_archived_before: true)
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def undelete_thread
+    if @comment_thread.deleted_by.at_least_moderator? && !current_user.at_least_moderator?
+      render json: { status: 'error', message: I18n.t('comments.errors.mod_only_undelete') }
+      return
+    end
+    status = @comment_thread.update(deleted: false, deleted_by: nil)
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def unfollow_thread
+    status = ThreadFollower.find_by(comment_thread: @comment_thread, user: current_user)&.destroy
+    restrict_thread_response(@comment_thread, status)
+  end
+
+  def unlock_thread
+    status = @comment_thread.update(locked: false, locked_by: nil, locked_until: nil)
+    restrict_thread_response(@comment_thread, status)
+  end
+
   def thread_restrict
+    # TODO: remove this wrapper action entirely (callbacks need to be moved, routes assigned, etc)
     case params[:type]
     when 'lock'
-      lu = nil
-      unless params[:duration].blank?
-        lu = params[:duration].to_i.days.from_now
-      end
-      @comment_thread.update(locked: true, locked_by: current_user, locked_until: lu)
+      lock_thread
     when 'archive'
-      @comment_thread.update(archived: true, archived_by: current_user)
+      archive_thread
     when 'delete'
-      @comment_thread.update(deleted: true, deleted_by: current_user)
+      delete_thread
     when 'follow'
-      ThreadFollower.create comment_thread: @comment_thread, user: current_user
+      follow_thread
     else
-      return not_found!
+      not_found!
     end
-
-    render json: { status: 'success' }
   end
 
   def thread_unrestrict
+    # TODO: remove this wrapper action entirely (callbacks need to be moved, routes assigned, etc)
     case params[:type]
     when 'lock'
-      @comment_thread.update(locked: false, locked_by: nil, locked_until: nil)
+      unlock_thread
     when 'archive'
-      @comment_thread.update(archived: false, archived_by: nil, ever_archived_before: true)
+      unarchive_thread
     when 'delete'
-      if @comment_thread.deleted_by.at_least_moderator? && !current_user.at_least_moderator?
-        render json: { status: 'error', message: I18n.t('comments.errors.mod_only_undelete') }
-        return
-      end
-      @comment_thread.update(deleted: false, deleted_by: nil)
+      undelete_thread
     when 'follow'
-      tf = ThreadFollower.find_by(comment_thread: @comment_thread, user: current_user)
-      tf&.destroy
+      unfollow_thread
     else
-      return not_found!
+      not_found!
     end
-
-    render json: { status: 'success' }
   end
 
   def post
@@ -403,6 +441,18 @@ def check_for_pings(thread, content)
     matches.flatten.select { |m| pingable.include?(m.to_i) }.map(&:to_i)
   end
 
+  # @param thread [CommentThread] thread to get response for
+  # @param status [Boolean] status of the restrict operation
+  def restrict_thread_response(thread, status)
+    if status
+      render json: { status: 'success', thread: thread }
+    else
+      render json: { status: 'failed',
+                     message: thread.errors.full_messages.join(', ') },
+             status: :bad_request
+    end
+  end
+
   # @param pings [Array<Integer>] list of pinged user ids
   def apply_pings(pings)
     pings.each do |p|

app/models/ability.rb

@@ -1,12 +1,52 @@
 class Ability < ApplicationRecord
   include CommunityRelated
+  include AbilitiesHelper
 
   validates :internal_id, uniqueness: { scope: [:community_id], case_sensitive: false }
 
   def manual?
     post_score_threshold.nil? && edit_score_threshold.nil? && flag_score_threshold.nil?
   end
 
+  # Gets the edit score percent for a given user
+  # @param user [User, nil] user to get the percent for
+  # @return [Integer] edit score percent
+  def edit_score_percent_for(user)
+    return 0 if edit_score_threshold.nil? || user.nil?
+    return 100 if edit_score_threshold.zero?
+
+    linear_score = linearize_progress(user.community_user.edit_score)
+    linear_threshold = linearize_progress(edit_score_threshold)
+
+    (linear_score / linear_threshold * 100).to_i
+  end
+
+  # Gets the flag score percent for a given user
+  # @param user [User, nil] user to get the percent for
+  # @return [Integer] flag score percent
+  def flag_score_percent_for(user)
+    return 0 if flag_score_threshold.nil? || user.nil?
+    return 100 if flag_score_threshold.zero?
+
+    linear_score = linearize_progress(user.community_user.flag_score)
+    linear_threshold = linearize_progress(flag_score_threshold)
+
+    (linear_score / linear_threshold * 100).to_i
+  end
+
+  # Gets the post score percent for a given user
+  # @param user [User, nil] user to get the percent for
+  # @return [Integer] post score percent
+  def post_score_percent_for(user)
+    return 0 if post_score_threshold.nil? || user.nil?
+    return 100 if post_score_threshold.zero?
+
+    linear_score = linearize_progress(user.community_user.post_score)
+    linear_threshold = linearize_progress(post_score_threshold)
+
+    (linear_score / linear_threshold * 100).to_i
+  end
+
   def self.on_user(user)
     Ability.where(id: UserAbility.where(community_user: user.community_user).select(:ability_id).distinct)
   end

app/models/post.rb

@@ -187,6 +187,12 @@ def closeable?
     post_type.is_closeable
   end
 
+  # Is the post deleted by the owner?
+  # @return [Boolean] check result
+  def deleted_by_owner?
+    deleted_by&.same_as?(user)
+  end
+
   # @return [Boolean] whether there is a suggested edit pending for this post
   def pending_suggested_edit?
     SuggestedEdit.where(post_id: id, active: true).any?

app/views/abilities/show.html.erb

@@ -51,11 +51,11 @@
         <div class="widget--body">
           <% if @user.id == current_user&.id %>
             <p>You need to reach these thresholds to earn the ability:</p>
-	  <% else %>
+          <% else %>
             <p><%= @user.username %> needs to reach these thresholds to earn the ability:</p>
-	  <% end %>
+          <% end %>
           <% unless @ability.post_score_threshold.nil? %>
-            <% post_score_percent = (linearize_progress(@user.community_user.post_score) / linearize_progress(@ability.post_score_threshold) * 100).to_i %>
+            <% post_score_percent = @ability.post_score_percent_for(@user) %>
 
             <p><strong>Post score threshold</strong></p>
             <% if post_score_percent < 100 %>
@@ -74,7 +74,7 @@
           <% end %>
 
           <% unless @ability.edit_score_threshold.nil? %>
-            <% edit_score_percent = (linearize_progress(@user.community_user.edit_score) / linearize_progress(@ability.edit_score_threshold) * 100).to_i %>
+            <% edit_score_percent = @ability.edit_score_percent_for(@user) %>
 
             <p><strong>Edit score threshold</strong></p>
             <% if edit_score_percent < 100 %>
@@ -93,7 +93,7 @@
           <% end %>
 
           <% unless @ability.flag_score_threshold.nil? %>
-            <% flag_score_percent = (linearize_progress(@user.community_user.flag_score) / linearize_progress(@ability.flag_score_threshold) * 100).to_i %>
+            <% flag_score_percent = @ability.flag_score_percent_for(@user) %>
 
             <p><strong>Flag score threshold</strong></p>
             <% if flag_score_percent < 100 %>
@@ -124,21 +124,21 @@
       <% end %>
     </div>
     <% if @your_ability&.is_suspended && (@user.id == current_user&.id || current_user&.at_least_moderator?) %>
-    <div class="widget--body">
-      <div class="notice is-danger">
-        <% if @your_ability.suspension_end.nil? %>
-          <p><strong>Your use of the <%= @ability.name %> ability has been suspended.</strong></p>
-        <% else %>
-          <p><strong>Your use of the <%= @ability.name %> ability has been temporarily suspended (ends <span title="<%= @your_ability.suspension_end.iso8601 %>">in <%= time_ago_in_words(@your_ability.suspension_end) %></span>)</strong>.</p>
-        <% end %>
-        <p><%= @your_ability.suspension_message %></p>
-        <p>If you have any questions regarding the site rules, you can ask them in the Meta category of this site or on <a href="https://meta.codidact.com/">meta.codidact.com</a>. If you have any questions about this suspension or would like to dispute it, use the Meta category or <a href="mailto:<%= SiteSetting['AdministratorContactEmail'] %>">contact us</a>.
-      </div>
+      <div class="widget--body">
+        <div class="notice is-danger">
+          <% if @your_ability.suspension_end.nil? %>
+            <p><strong>Your use of the <%= @ability.name %> ability has been suspended.</strong></p>
+          <% else %>
+            <p><strong>Your use of the <%= @ability.name %> ability has been temporarily suspended (ends <span title="<%= @your_ability.suspension_end.iso8601 %>">in <%= time_ago_in_words(@your_ability.suspension_end) %></span>)</strong>.</p>
+          <% end %>
+          <p><%= @your_ability.suspension_message %></p>
+          <p>If you have any questions regarding the site rules, you can ask them in the Meta category of this site or on <a href="https://meta.codidact.com/">meta.codidact.com</a>. If you have any questions about this suspension or would like to dispute it, use the Meta category or <a href="mailto:<%= SiteSetting['AdministratorContactEmail'] %>">contact us</a>.
+          </div>
+        </div>
+      <% end %>
     </div>
-    <% end %>
-  </div>
-<% end %>
+  <% end %>
 
-<div class="h-p-2">
-  <%= raw @ability.description %>
-</div>
+  <div class="h-p-2">
+    <%= raw @ability.description %>
+  </div>

app/views/comments/_lock_thread_modal.html.erb

@@ -1,12 +1,14 @@
 <%#
-  Helper for rendering comment thread lock action modal
+   "Helper for rendering comment thread lock action modal
 
-  Variables:
-    thread : Comment thread to create the modal for
-%>
+    Variables:
+      thread : Comment thread to create the modal for
+"%>
 
 <div class="modal is-with-backdrop is-small js--lock-thread-<%= thread.id %>">
-  <%= form_tag restrict_comment_thread_path(thread.id), class: 'modal--container' do %>
+  <%= form_tag restrict_comment_thread_path(thread.id),
+               class: 'modal--container',
+               data: { thread: thread.id } do %>
     <%= hidden_field_tag :type, 'lock' %>
     <div class="modal--header">
       <button type="button"

app/views/posts/_expanded.html.erb

@@ -131,24 +131,23 @@
         </div>
       <% end %>
 
-      <% if post.deleted %>
+      <% if post.deleted? %>
         <div class="notice has-margin-2">
           <p class="has-font-weight-normal">
             <strong>Deleted</strong> by <%= user_link post.deleted_by %>
             on <%= post.deleted_at.strftime('%b %e, %Y at %H:%M') %>
           </p>
           <hr>
-          <% if post.deleted_by.id == post.user_id %>
+          <% if post.deleted_by_owner? %>
             <p>
-              The author of this post decided to delete it. It can only be seen by users with the Curate privilege.
+              The author of this post decided to delete it. It can only be seen by users with the Curate ability.
             </p>
           <% else %>
             <p>
-              This post was deleted and can only be seen by users with the Curate privilege.
+              This post was deleted and can only be seen by users with the Curate ability.
             </p>
           <% end %>
-
-          <p>Users with the Curate privilege may vote to restore this post if it has been deleted incorrectly.</p>
+          <p>Users with the Curate ability may vote to restore this post if it has been deleted incorrectly.</p>
         </div>
       <% end %>
 

app/views/reactions/_list.html.erb

@@ -22,6 +22,9 @@
     <% end %>
 </div>
 
+<%# TODO: eager load instead %>
+<% host = post.community.host %>
+
 <% post.reaction_list.each do |rt, rr| %>
     <div class="modal is-with-backdrop reaction-info-modal"
          id="reaction-info-<%= post.id %>-<%= rt.id %>">
@@ -43,9 +46,7 @@
                     </tr>
                     <% rr.each do |r| %>
                     <tr>
-                        <td>
-                            <%= link_to rtl_safe_username(r.user), user_path(r.user), dir: 'ltr'%>
-                        </td>
+                        <td><%= user_link(r.user, { host: host }) %></td>
                         <td class="comment-col">
                             <% if r.comment %>
                                 <div class="muted-p">

db/migrate/20250905231140_add_locked_at_to_comment_threads.rb

@@ -0,0 +1,5 @@
+class AddLockedAtToCommentThreads < ActiveRecord::Migration[7.2]
+  def change
+    add_column :comment_threads, :locked_at, :datetime, precision: nil
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.2].define(version: 2025_08_10_133540) do
+ActiveRecord::Schema[7.2].define(version: 2025_09_05_231140) do
   create_table "abilities", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "community_id"
     t.string "name"
@@ -175,6 +175,7 @@
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "community_id", null: false
+    t.datetime "locked_at", precision: nil
     t.index ["archived_by_id"], name: "index_comment_threads_on_archived_by_id"
     t.index ["community_id"], name: "index_comment_threads_on_community_id"
     t.index ["deleted_by_id"], name: "index_comment_threads_on_deleted_by_id"