diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js
index 155883ff6..e998ca3d5 100644
--- a/app/assets/javascripts/comments.js
+++ b/app/assets/javascripts/comments.js
@@ -19,17 +19,13 @@ $(() => {
     return $tgt.closest('.js-comment-thread-wrapper')[0] ?? null;
   };
 
-  $(document).on('click', '.post--comments-thread.is-inline a', async (evt) => {
-    if (evt.ctrlKey) { return; }
-
-    evt.preventDefault();
-
-    const $tgt = $(evt.target);
-    const $threadId = $tgt.data('thread');
-    const wrapper = getCommentThreadWrapper($tgt);
-
-    openThread(wrapper, $threadId);
-  });
+  /**
+   * @param {HTMLElement} wrapper
+   * @returns {boolean}
+   */
+  const isInlineCommentThread = (wrapper) => {
+    return !!wrapper.querySelector('[data-inline=true]');
+  };
 
   /**
    * @param {HTMLElement} wrapper
@@ -45,8 +41,24 @@ $(() => {
     window.hljs && hljs.highlightAll();
   }
 
+  $(document).on('click', '.post--comments-thread.is-inline a', async (evt) => {
+    if (evt.ctrlKey) {
+      return; // TODO: do we need this early exit?
+    }
+
+    evt.preventDefault();
+
+    const $tgt = $(evt.target);
+    const $threadId = $tgt.data('thread');
+    const wrapper = getCommentThreadWrapper($tgt);
+
+    openThread(wrapper, $threadId);
+  });
+
   $(document).on('click', '.js-show-deleted-comments', (ev) => {
-    if (ev.ctrlKey) { return; } // do we really need it?
+    if (ev.ctrlKey) {
+      return;
+    } // do we really need it?
 
     ev.preventDefault();
 
@@ -80,7 +92,9 @@ $(() => {
     }
 
     if (isDeleted) {
-      $container.append(`<i class="fas fa-trash h-c-red-600 fa-fw" title="Deleted thread" aria-label="Deleted thread"></i>`);
+      $container.append(
+        `<i class="fas fa-trash h-c-red-600 fa-fw" title="Deleted thread" aria-label="Deleted thread"></i>`
+      );
       $container.addClass('is-deleted');
     }
 
@@ -171,8 +185,7 @@ $(() => {
       if (isDelete) {
         $comment.addClass('deleted-content');
         $tgt.removeClass('js-comment-delete').addClass('js-comment-undelete').val('undelete');
-      }
-      else {
+      } else {
         $comment.removeClass('deleted-content');
         $tgt.removeClass('js-comment-undelete').addClass('js-comment-delete').val('delete');
       }
@@ -189,7 +202,7 @@ $(() => {
     const $modal = $($tgt.data('modal'));
 
     const resp = await QPixel.fetch(`/comments/thread/${threadId}/followers`, {
-      headers: { 'Accept': 'text/html' }
+      headers: { Accept: 'text/html' }
     });
 
     const data = await resp.text();
@@ -197,28 +210,82 @@ $(() => {
     $modal.find('.js-follower-display').html(data);
   });
 
-  $(document).on('click', '[class*=js--lock-thread] form', async (evt) => {
-    evt.preventDefault();
+  $(document).on('click', '.js-archive-thread', async (ev) => {
+    ev.preventDefault();
 
-    const $tgt = $(evt.target);
-    const threadID = $tgt.data("thread");
+    const $tgt = $(ev.target);
+    const threadID = $tgt.data('thread');
 
-    const data = await QPixel.lockThread(threadID);
+    const data = await QPixel.archiveThread(threadID);
 
     QPixel.handleJSONResponse(data, () => {
-      window.location.reload();
+      const wrapper = getCommentThreadWrapper($tgt);
+      const inline = isInlineCommentThread(wrapper);
+      openThread(wrapper, threadID, { inline });
     });
   });
 
-  $(document).on('click', '.js--restrict-thread, .js--unrestrict-thread', async (evt) => {
+  $(document).on('click', '.js-delete-thread', async (ev) => {
+    ev.preventDefault();
+
+    const $tgt = $(ev.target);
+    const threadID = $tgt.data('thread');
+
+    const data = await QPixel.deleteThread(threadID);
+
+    QPixel.handleJSONResponse(data, () => {
+      const wrapper = getCommentThreadWrapper($tgt);
+      const inline = isInlineCommentThread(wrapper);
+      openThread(wrapper, threadID, { inline });
+    });
+  });
+
+  $(document).on('click', '.js-follow-thread', async (ev) => {
+    ev.preventDefault();
+
+    const $tgt = $(ev.target);
+    const threadID = $tgt.data('thread');
+
+    const data = await QPixel.followThread(threadID);
+
+    QPixel.handleJSONResponse(data, () => {
+      const wrapper = getCommentThreadWrapper($tgt);
+      const inline = isInlineCommentThread(wrapper);
+      openThread(wrapper, threadID, { inline });
+    });
+  });
+
+  $(document).on('click', '.js-lock-thread', async (ev) => {
+    ev.preventDefault();
+
+    const $tgt = $(ev.target);
+    const threadID = $tgt.data('thread');
+    const form = $tgt.closest(`form[data-thread=${threadID}]`).get(0);
+
+    if (form instanceof HTMLFormElement) {
+      const { value: duration } = form.elements['duration'] ?? {};
+
+      const data = await QPixel.lockThread(threadID, duration ? Math.round(+duration) : void 0);
+
+      QPixel.handleJSONResponse(data, () => {
+        const wrapper = getCommentThreadWrapper($tgt);
+        const inline = isInlineCommentThread(wrapper);
+        openThread(wrapper, threadID, { inline });
+      });
+    } else {
+      QPixel.createNotification('danger', 'Failed to find thread to lock');
+    }
+  });
+
+  // TODO: split into individual handlers once unrestrict_thread is split
+  $(document).on('click', '.js--unrestrict-thread', async (evt) => {
     evt.preventDefault();
 
     const $tgt = $(evt.target);
-    const threadID = $tgt.data("thread");
-    const action = $tgt.data("action");
-    const route = $tgt.hasClass("js--restrict-thread") ? 'restrict' : 'unrestrict';
+    const threadID = $tgt.data('thread');
+    const action = $tgt.data('action');
 
-    const resp = await QPixel.fetchJSON(`/comments/thread/${threadID}/${route}`, { type: action });
+    const resp = await QPixel.fetchJSON(`/comments/thread/${threadID}/unrestrict`, { type: action });
 
     const data = await resp.json();
 
@@ -261,7 +328,7 @@ $(() => {
       const $item = $(ev.target).hasClass('item') ? $(ev.target) : $(ev.target).parents('.item');
       const id = $item.data('user-id');
       $tgt[0].selectionStart = caretPos - posInWord;
-      $tgt[0].selectionEnd = (caretPos - posInWord) + currentWord.length;
+      $tgt[0].selectionEnd = caretPos - posInWord + currentWord.length;
       QPixel.replaceSelection($tgt, `@#${id}`);
       popup.destroy();
       $tgt.focus();
@@ -282,17 +349,20 @@ $(() => {
         pingable[`${threadId}-${postId}`] = await resp.json();
       }
 
-      const items = Object.entries(pingable[`${threadId}-${postId}`]).filter((e) => {
-        return e[0].toLowerCase().startsWith(currentWord.substr(1).toLowerCase());
-      }).map((e) => {
-        const username = e[0].replace(/</g, '&#x3C;').replace(/>/g, '&#x3E;');
-        const id = e[1];
-        return itemTemplate.clone().html(`${username} <span class="has-color-tertiary-600">#${id}</span>`)
-          .attr('data-user-id', id);
-      });
+      const items = Object.entries(pingable[`${threadId}-${postId}`])
+        .filter((e) => {
+          return e[0].toLowerCase().startsWith(currentWord.substr(1).toLowerCase());
+        })
+        .map((e) => {
+          const username = e[0].replace(/</g, '&#x3C;').replace(/>/g, '&#x3E;');
+          const id = e[1];
+          return itemTemplate
+            .clone()
+            .html(`${username} <span class="has-color-tertiary-600">#${id}</span>`)
+            .attr('data-user-id', id);
+        });
       QPixel.Popup.getPopup(items, $tgt[0], callback);
-    }
-    else {
+    } else {
       QPixel.Popup.destroyAll();
     }
   }
@@ -306,8 +376,7 @@ $(() => {
     if ($thread.is(':hidden')) {
       $thread.show();
       $thread.find('.js-comment-field').trigger('focus');
-    }
-    else {
+    } else {
       $thread.hide();
     }
   });
@@ -322,8 +391,7 @@ $(() => {
     if ($reply.is(':hidden')) {
       $reply.show();
       $reply.find('.js-comment-field').trigger('focus');
-    }
-    else {
+    } else {
       $reply.hide();
     }
   });
@@ -358,9 +426,7 @@ $(() => {
 
     const shouldFollow = action === 'follow';
 
-    const data = shouldFollow ?
-                  await QPixel.followComments(postId) :
-                  await QPixel.unfollowComments(postId);
+    const data = shouldFollow ? await QPixel.followComments(postId) : await QPixel.unfollowComments(postId);
 
     QPixel.handleJSONResponse(data, () => {
       target.dataset.action = shouldFollow ? 'unfollow' : 'follow';
diff --git a/app/assets/javascripts/qpixel_api.js b/app/assets/javascripts/qpixel_api.js
index d06026b39..b38b6e1a5 100644
--- a/app/assets/javascripts/qpixel_api.js
+++ b/app/assets/javascripts/qpixel_api.js
@@ -451,6 +451,38 @@ window.QPixel = {
     return QPixel.parseJSONResponse(resp, 'Failed to vote');
   },
 
+  archiveThread: async (id) => {
+    const resp = await QPixel.fetchJSON(`/comments/thread/${id}/archive`, {}, {
+      headers: { 'Accept': 'application/json' },
+    });
+
+    return QPixel.parseJSONResponse(resp, 'Failed to archive thread');
+  },
+
+  deleteThread: async (id) => {
+    const resp = await QPixel.fetchJSON(`/comments/thread/${id}/delete`, {}, {
+      headers: { 'Accept': 'application/json' },
+    });
+
+    return QPixel.parseJSONResponse(resp, 'Failed to delete thread');
+  },
+
+  followThread: async (id) => {
+    const resp = await QPixel.fetchJSON(`/comments/thread/${id}/follow`, {}, {
+      headers: { 'Accept': 'application/json' },
+    });
+
+    return QPixel.parseJSONResponse(resp, 'Failed to follow thread');
+  },
+
+  lockThread: async (id, duration) => {
+    const resp = await QPixel.fetchJSON(`/comments/thread/${id}/lock`, {
+      duration,
+    });
+
+    return QPixel.parseJSONResponse(resp, 'Failed to lock thread');
+  },
+
   deleteComment: async (id) => {
     const resp = await QPixel.fetchJSON(`/comments/${id}/delete`, {}, {
       headers: { 'Accept': 'application/json' },
@@ -495,14 +527,6 @@ window.QPixel = {
     return QPixel.parseJSONResponse(resp, 'Failed to unfollow post comments');
   },
 
-  lockThread: async (id) => {
-    const resp = await QPixel.fetchJSON(`/comments/thread/${id}/restrict`, {
-      type: 'lock'
-    });
-
-    return QPixel.parseJSONResponse(resp, 'Failed to lock thread');
-  },
-
   renameTag: async (categoryId, tagId, name) => {
     const resp = await QPixel.fetchJSON(`/categories/${categoryId}/tags/${tagId}/rename`, { name }, {
       headers: { 'Accept': 'application/json' }
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 659693ef6..4126185ba 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -5,15 +5,23 @@ class CommentsController < ApplicationController
 
   before_action :set_comment, only: [:update, :destroy, :undelete, :show]
   before_action :set_post, only: [:create_thread, :post_follow, :post_unfollow]
-  before_action :set_thread,
-                only: [:create, :thread, :thread_content, :thread_rename, :thread_restrict, :thread_unrestrict,
-                       :thread_followers]
-
+  before_action :set_thread, only: [:create,
+                                    :thread,
+                                    :thread_content,
+                                    :thread_rename,
+                                    :archive_thread,
+                                    :delete_thread,
+                                    :follow_thread,
+                                    :lock_thread,
+                                    :thread_unrestrict,
+                                    :thread_followers]
   before_action :check_post_access, only: [:create_thread, :create]
   before_action :check_privilege, only: [:update, :destroy, :undelete]
   before_action :check_create_access, only: [:create_thread, :create]
   before_action :check_reply_access, only: [:create]
-  before_action :check_restrict_access, only: [:thread_restrict]
+  before_action :check_archive_thread_access, only: [:archive_thread]
+  before_action :check_delete_thread_access, only: [:delete_thread]
+  before_action :check_lock_thread_access, only: [:lock_thread]
   before_action :check_thread_access, only: [:thread, :thread_content, :thread_followers]
   before_action :check_unrestrict_access, only: [:thread_unrestrict]
   before_action :check_if_target_post_locked, only: [:create, :post_follow]
@@ -219,47 +227,69 @@ def thread_rename
     redirect_to comment_thread_path(@comment_thread.id)
   end
 
-  def thread_restrict
-    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)
-    when 'archive'
-      @comment_thread.update(archived: true, archived_by: current_user)
-    when 'delete'
-      @comment_thread.update(deleted: true, deleted_by: current_user)
-    when 'follow'
-      ThreadFollower.create comment_thread: @comment_thread, user: current_user
-    else
-      return not_found!
+  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
 
-    render json: { status: 'success' }
+  def unlock_thread
+    status = @comment_thread.update(locked: false, locked_by: nil, locked_until: nil)
+    restrict_thread_response(@comment_thread, status)
   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
@@ -364,18 +394,20 @@ def check_reply_access
     end
   end
 
-  def check_restrict_access
-    case params[:type]
-    when 'lock'
-      not_found! unless current_user.can_lock?(@comment_thread)
-    when 'archive'
-      not_found! unless current_user.can_archive?(@comment_thread)
-    when 'delete'
-      not_found! unless current_user.can_delete?(@comment_thread)
-    end
+  def check_archive_thread_access
+    not_found! unless current_user.can_archive?(@comment_thread)
+  end
+
+  def check_delete_thread_access
+    not_found! unless current_user.can_delete?(@comment_thread)
+  end
+
+  def check_lock_thread_access
+    not_found! unless current_user.can_lock?(@comment_thread)
   end
 
   def check_unrestrict_access
+    # TODO: split into individual checks once unrestrict_thread is split
     case params[:type]
     when 'lock'
       not_found! unless current_user.can_unlock?(@comment_thread)
@@ -403,6 +435,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|
diff --git a/app/models/ability.rb b/app/models/ability.rb
index a3160b57d..b43648f59 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -1,5 +1,6 @@
 class Ability < ApplicationRecord
   include CommunityRelated
+  include AbilitiesHelper
 
   validates :internal_id, uniqueness: { scope: [:community_id], case_sensitive: false }
 
@@ -7,6 +8,45 @@ 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
diff --git a/app/models/post.rb b/app/models/post.rb
index 29dc6e497..4a9ac09c5 100644
--- a/app/models/post.rb
+++ b/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?
diff --git a/app/views/abilities/show.html.erb b/app/views/abilities/show.html.erb
index 23ccdfb27..a2b0f84dd 100644
--- a/app/views/abilities/show.html.erb
+++ b/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>
diff --git a/app/views/comments/_lock_thread_modal.html.erb b/app/views/comments/_lock_thread_modal.html.erb
index ef756bf6a..c911f3c03 100644
--- a/app/views/comments/_lock_thread_modal.html.erb
+++ b/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 lock_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"
@@ -23,7 +25,7 @@
       <%= number_field_tag :duration, nil, class: 'form-element' %>
     </div>
     <div class="modal--footer">
-      <%= submit_tag 'Lock thread', class: 'button is-muted is-filled',
+      <%= submit_tag 'Lock thread', class: 'button is-muted is-filled js-lock-thread',
                                     data: { thread: thread.id } %>
       <button type="button" class="button is-muted" data-modal=".js--lock-thread-<%= thread.id %>">Cancel</button>
     </div>
diff --git a/app/views/comments/_thread_actions_modal.html.erb b/app/views/comments/_thread_actions_modal.html.erb
index d4b6bf21e..38d72e8d6 100644
--- a/app/views/comments/_thread_actions_modal.html.erb
+++ b/app/views/comments/_thread_actions_modal.html.erb
@@ -17,7 +17,7 @@
       </a>
     <% end %>
 
-    <% unless thread.archived || thread.deleted %>
+    <% unless thread.archived || thread.deleted? %>
       <% if thread.locked? %>
         <a href="javascript:void(0)" class="js--unrestrict-thread"
                                      data-action="lock"
@@ -35,7 +35,7 @@
       <% end %>
     <% end %>
       
-    <% unless thread.locked? || thread.deleted %>
+    <% unless thread.locked? || thread.deleted? %>
       <% if thread.archived %>
         <a href="javascript:void(0)" class="js--unrestrict-thread" 
                                      data-action="archive"
@@ -45,8 +45,7 @@
           <i class="fas fa-archive fa-fw"></i> restore
         </a>
       <% else %>
-        <a href="javascript:void(0)" class="js--restrict-thread"
-                                     data-action="archive"
+        <a href="javascript:void(0)" class="js-archive-thread"
                                      data-thread="<%= thread.id %>"
                                      role="button"
                                      aria-label="Archive thread">
@@ -55,7 +54,7 @@
       <% end %>
     <% end %>
 
-    <% unless thread.locked? || thread.archived %>
+    <% unless thread.locked? || thread.archived? %>
       <% if thread.deleted %>
         <a href="javascript:void(0)" class="js--unrestrict-thread"
                                      data-action="delete"
@@ -65,8 +64,7 @@
           <i class="fas fa-trash fa-fw"></i> undelete
         </a>
       <% else %>
-        <a href="javascript:void(0)" class="js--restrict-thread"
-                                     data-action="delete"
+        <a href="javascript:void(0)" class="js-delete-thread"
                                      data-thread="<%= thread.id %>"
                                      role="button"
                                      aria-label="Delete thread">
diff --git a/app/views/comments/_thread_follow_link.html.erb b/app/views/comments/_thread_follow_link.html.erb
index f76c14f77..1a2f46f4e 100644
--- a/app/views/comments/_thread_follow_link.html.erb
+++ b/app/views/comments/_thread_follow_link.html.erb
@@ -18,8 +18,7 @@
   </a>
 <% else %>
   <a href="#"
-     class="widget--header-link js--restrict-thread"
-     data-action="follow"
+     class="widget--header-link js-follow-thread"
      data-thread="<%= thread.id %>"
      title="Follow this thread to be notified of every response."
      role="button"
diff --git a/app/views/posts/_expanded.html.erb b/app/views/posts/_expanded.html.erb
index 310f1abfb..e21331548 100644
--- a/app/views/posts/_expanded.html.erb
+++ b/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 %>
 
diff --git a/app/views/reactions/_list.html.erb b/app/views/reactions/_list.html.erb
index 4e19b9edb..00c50ae37 100644
--- a/app/views/reactions/_list.html.erb
+++ b/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">
diff --git a/config/routes.rb b/config/routes.rb
index aa5824408..5ca2842f9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -239,7 +239,12 @@
     get    'thread/:id/pingable',          to: 'comments#pingable', as: :thread_pingable
     post   'thread/:id/new',               to: 'comments#create', as: :create_comment
     post   'thread/:id/rename',            to: 'comments#thread_rename', as: :rename_comment_thread
-    post   'thread/:id/restrict',          to: 'comments#thread_restrict', as: :restrict_comment_thread
+
+    post   'thread/:id/archive',           to: 'comments#archive_thread', as: :archive_comment_thread
+    post   'thread/:id/delete',            to: 'comments#delete_thread', as: :delete_comment_thread
+    post   'thread/:id/follow',            to: 'comments#follow_thread', as: :follow_comment_thread
+    post   'thread/:id/lock',              to: 'comments#lock_thread', as: :lock_comment_thread
+
     post   'thread/:id/unrestrict',        to: 'comments#thread_unrestrict', as: :unrestrict_comment_thread
     get    'thread/:id/followers',         to: 'comments#thread_followers', as: :comment_thread_followers
     get    'post/:post_id',                to: 'comments#post', as: :post_comments
diff --git a/db/migrate/20250905231140_add_locked_at_to_comment_threads.rb b/db/migrate/20250905231140_add_locked_at_to_comment_threads.rb
new file mode 100644
index 000000000..99039eec7
--- /dev/null
+++ b/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
diff --git a/db/schema.rb b/db/schema.rb
index 4935b9c75..63559a291 100644
--- a/db/schema.rb
+++ b/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"
diff --git a/global.d.ts b/global.d.ts
index 0c359669a..ac3eb2e73 100644
--- a/global.d.ts
+++ b/global.d.ts
@@ -540,6 +540,13 @@ interface QPixel {
                                                       onSuccess: (data: Extract<T, QPixelSuccessResponseJSON>) => void,
                                                       onFinally?: (data: T) => void) => boolean
 
+  /**
+   * Attempts to archive a comment thread
+   * @param id id of the thread to archive
+   * @returns result of the operation
+   */
+  archiveThread?: (id: string) => Promise<QPixelResponseJSON>
+
   /**
    * Attempts to delete a comment
    * @param id id of the comment to delete
@@ -547,6 +554,20 @@ interface QPixel {
    */
   deleteComment?: (id: string) => Promise<QPixelResponseJSON>
 
+  /**
+   * Attempts to delete a comment thread
+   * @param id id of the thread to delete
+   * @returns result of the operation
+   */
+  deleteThread?: (id: string) => Promise<QPixelResponseJSON>
+
+  /**
+   * Attempts to follow a comment thread
+   * @param id id of the thread to follow
+   * @returns result of the operation
+   */
+  followThread?: (id: string) => Promise<QPixelResponseJSON>
+
   /**
    * Attempts to start following comments on a given post
    * @param postId id of the post to follow comments on
@@ -584,9 +605,10 @@ interface QPixel {
   /**
    * Attempts to lock a comment thread
    * @param id id of the comment thread to lock
+   * @param duration how long should the thread be locked for, in days
    * @returns result of the operation
    */
-  lockThread?: (id: string) => Promise<QPixelResponseJSON>
+  lockThread?: (id: string, duration?: number) => Promise<QPixelResponseJSON>
 
   /**
    * Attempts to rename a tag
diff --git a/test/comments_test_helpers.rb b/test/comments_test_helpers.rb
index 17e262d45..8f7a14ae5 100644
--- a/test/comments_test_helpers.rb
+++ b/test/comments_test_helpers.rb
@@ -6,7 +6,7 @@ module CommentsControllerTestHelpers
   # Attempts to archive a given comment thread
   # @param thread [CommentThread] thread to archive
   def try_archive_thread(thread)
-    post :thread_restrict, params: { id: thread.id, type: 'archive' }
+    post :archive_thread, params: { id: thread.id }
   end
 
   # Attempts to create a comment thread on a given post
@@ -50,7 +50,7 @@ def try_create_comment(thread,
   # Attempts to delete a given comment thread
   # @param thread [CommentThread] thread to delete
   def try_delete_thread(thread)
-    post :thread_restrict, params: { id: thread.id, type: 'delete' }
+    post :delete_thread, params: { id: thread.id }
   end
 
   # Attempts to undelete a given comment thread
@@ -62,7 +62,7 @@ def try_undelete_thread(thread)
   # Attempts to follow a given comment thread
   # @param thread [CommentThread] thread to follow
   def try_follow_thread(thread)
-    post :thread_restrict, params: { id: thread.id, type: 'follow' }
+    post :follow_thread, params: { id: thread.id }
   end
 
   # Attempts to unfollow a given comment thread
@@ -87,7 +87,7 @@ def try_post_unfollow(test_post)
   # @param thread [CommentThread] thread to lock
   # @param duration [Integer] lock duration, in days
   def try_lock_thread(thread, duration: nil)
-    post :thread_restrict, params: { duration: duration, id: thread.id, type: 'lock' }
+    post :lock_thread, params: { duration: duration, id: thread.id }
   end
 
   # Attempts to unlock a given comment thread
diff --git a/test/fixtures/abilities.yml b/test/fixtures/abilities.yml
index cb0082abd..ff974bc44 100644
--- a/test/fixtures/abilities.yml
+++ b/test/fixtures/abilities.yml
@@ -5,35 +5,56 @@ everyone:
   internal_id: everyone
   icon: user
   community: sample
+  edit_score_threshold: 0
+  flag_score_threshold: 0
+  post_score_threshold: 0
 
 unrestricted:
   name: Participate Everywhere
   internal_id: unrestricted
   icon: heartbeat
   community: sample
+  edit_score_threshold: ~
+  flag_score_threshold: ~
+  post_score_threshold: 0.75
 
 edit_posts:
   name: Edit Posts
   internal_id: edit_posts
   icon: pen
   community: sample
+  edit_score_threshold: 0.95
+  flag_score_threshold: ~
+  post_score_threshold: ~
 
 edit_tags:
   name: Edit Tags
   internal_id: edit_tags
   community: sample
+  edit_score_threshold: 0.975
+  flag_score_threshold: ~
+  post_score_threshold: ~
 
 flag_close:
   name: Vote on Holds
   internal_id: flag_close
   community: sample
+  edit_score_threshold: ~
+  flag_score_threshold: 0.95
+  post_score_threshold: 0.9
 
 flag_curate:
   name: Curate
   internal_id: flag_curate
   community: sample
+  edit_score_threshold: ~
+  flag_score_threshold: 0.9
+  post_score_threshold: 0.9
 
 mod:
   name: Moderator
   internal_id: mod
-  community: sample
\ No newline at end of file
+  community: sample
+  post_score_threshold: ~
+  edit_score_threshold: ~
+  flag_score_threshold: ~
diff --git a/test/fixtures/community_users.yml b/test/fixtures/community_users.yml
index 727e850f4..df9e4877e 100644
--- a/test/fixtures/community_users.yml
+++ b/test/fixtures/community_users.yml
@@ -105,3 +105,24 @@ sample_spammer:
   is_admin: false
   is_moderator: false
   reputation: 1
+
+sample_edit_scorer:
+  user: edit_scorer
+  community: sample
+  is_admin: false
+  is_moderator: false
+  reputation: 1
+
+sample_flag_scorer:
+  user: flag_scorer
+  community: sample
+  is_admin: false
+  is_moderator: false
+  reputation: 1
+
+sample_post_scorer:
+  user: post_scorer
+  community: sample
+  is_admin: false
+  is_moderator: false
+  reputation: 1
diff --git a/test/fixtures/flags.yml b/test/fixtures/flags.yml
index af4c8cb00..d20deec29 100644
--- a/test/fixtures/flags.yml
+++ b/test/fixtures/flags.yml
@@ -36,3 +36,11 @@ escalated:
   escalation_comment: what do I do with this
   escalated_at: 2025-01-01T00:00:00.000000Z
   escalated_by: moderator
+
+helpful_flag_scorer:
+  reason: For abilities!
+  post: question_one (Post)
+  post_flag_type: not_confidential
+  user: flag_scorer
+  community: sample
+  status: helpful
diff --git a/test/fixtures/posts.yml b/test/fixtures/posts.yml
index e4cf4cace..99c172bdf 100644
--- a/test/fixtures/posts.yml
+++ b/test/fixtures/posts.yml
@@ -480,3 +480,18 @@ question_without_votes:
   community: sample
   category: main
   license: cc_by_sa
+
+post_scorer_question:
+  post_type: question
+  title: This is a question for testing post scores
+  body: This post MUST be positively scored (> 0.5) to count towards the score
+  body_markdown: <p>This post MUST be positively scored (> 0.5) to count towards the score</p>
+  tags_cache:
+    - post
+  tags:
+    - post
+  score: 0.7
+  user: post_scorer
+  community: sample
+  category: main
+  license: cc_by_sa
diff --git a/test/fixtures/suggested_edits.yml b/test/fixtures/suggested_edits.yml
index 5f79e9b6d..e020f860a 100644
--- a/test/fixtures/suggested_edits.yml
+++ b/test/fixtures/suggested_edits.yml
@@ -72,3 +72,16 @@ pending_high_trust:
   comment: High trust only
   active: true
   accepted: false
+
+approved_edit_scorer:
+  post: question_one
+  user: edit_scorer
+  community: sample
+  body: this is used to get consistent edit score for tests
+  body_markdown: <p>this is used to get consistent edit score for tests</p>
+  comment: working towards the Edit Posts ability
+  active: false
+  accepted: true
+  decided_at: 2000-01-01T00:00:00.000000Z
+  decided_by: editor
+  title: approved suggested edit by the user used for edit score tests
diff --git a/test/fixtures/user_abilities.yml b/test/fixtures/user_abilities.yml
index 0b6c586d4..094a95ec5 100644
--- a/test/fixtures/user_abilities.yml
+++ b/test/fixtures/user_abilities.yml
@@ -14,6 +14,18 @@ d_eo:
   community_user: sample_deleter
   ability: everyone
 
+pe_eo:
+  community_user: sample_edit_scorer
+  ability: everyone
+
+pf_eo:
+  community_user: sample_flag_scorer
+  ability: everyone
+
+pp_eo:
+  community_user: sample_post_scorer
+  ability: everyone
+
 stu_ur:
   community_user: sample_standard_user
   ability: unrestricted
@@ -30,6 +42,18 @@ d_ur:
   community_user: sample_deleter
   ability: unrestricted
 
+pe_ur:
+  community_user: sample_edit_scorer
+  ability: unrestricted
+
+pf_ur:
+  community_user: sample_flag_scorer
+  ability: unrestricted
+
+pp_ur:
+  community_user: sample_post_scorer
+  ability: unrestricted
+
 c_fc:
   community_user: sample_closer
   ability: flag_close
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 4f20ce3dc..140caa683 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -163,3 +163,24 @@ spammer:
   is_global_admin: false
   is_global_moderator: false
   confirmed_at: 2020-01-01T00:00:00.000000Z
+
+edit_scorer:
+  email: edit-scorer@example.com
+  encrypted_password: '$2a$11$roUHXKxecjyQ72Qn7DWs3.9eRCCoRn176kX/UNb/xiue3aGqf7xEW'
+  sign_in_count: 1337
+  username: edit_scorer
+  confirmed_at: 2020-01-01T00:00:00.000000Z
+
+flag_scorer:
+  email: flag-scorer@example.com
+  encrypted_password: '$2a$11$roUHXKxecjyQ72Qn7DWs3.9eRCCoRn176kX/UNb/xiue3aGqf7xEW'
+  sign_in_count: 1337
+  username: flag_scorer
+  confirmed_at: 2020-01-01T00:00:00.000000Z
+
+post_scorer:
+  email: post-scorer@example.com
+  encrypted_password: '$2a$11$roUHXKxecjyQ72Qn7DWs3.9eRCCoRn176kX/UNb/xiue3aGqf7xEW'
+  sign_in_count: 1337
+  username: post_scorer
+  confirmed_at: 2020-01-01T00:00:00.000000Z
diff --git a/test/models/ability_test.rb b/test/models/ability_test.rb
index 610503f05..2a4fd3eed 100644
--- a/test/models/ability_test.rb
+++ b/test/models/ability_test.rb
@@ -1,7 +1,56 @@
 require 'test_helper'
 
 class AbilityTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  test 'score_percent_for methods should return 0 for missing users' do
+    [:edit, :flag, :post].each do |type|
+      abilities.each do |ability|
+        assert_equal 0, ability.send("#{type}_score_percent_for", nil)
+      end
+    end
+  end
+
+  test 'score_percent_for methods should return 0 for unrelated abilities' do
+    std = users(:standard_user)
+
+    [:edit, :flag, :post].each do |type|
+      abilities.each do |ability|
+        next unless ability.send("#{type}_score_threshold").nil?
+
+        assert_equal 0, ability.send("#{type}_score_percent_for", std)
+      end
+    end
+  end
+
+  test 'score_percent_for methods should return 100 for abilities 0 thresholds' do
+    std = users(:standard_user)
+
+    [:edit, :flag, :post].each do |type|
+      abilities.each do |ability|
+        next unless ability.send("#{type}_score_threshold")&.zero?
+
+        assert_equal 100, ability.send("#{type}_score_percent_for", std)
+      end
+    end
+  end
+
+  test 'edit_score_percent_for should correctly calculate percent for a given user' do
+    user = users(:edit_scorer)
+    ability = abilities(:edit_posts)
+
+    assert_equal 2, ability.edit_score_percent_for(user)
+  end
+
+  test 'flag_score_percent_for should correctly calculate percent for a given user' do
+    user = users(:flag_scorer)
+    ability = abilities(:flag_curate)
+
+    assert_equal 6, ability.flag_score_percent_for(user)
+  end
+
+  test 'post_score_percent_for should correctly calculate percent for a given user' do
+    user = users(:post_scorer)
+    ability = abilities(:flag_close)
+
+    assert_equal 6, ability.post_score_percent_for(user)
+  end
 end
diff --git a/test/models/post_test.rb b/test/models/post_test.rb
index 92633c61f..7b2d9342f 100644
--- a/test/models/post_test.rb
+++ b/test/models/post_test.rb
@@ -130,4 +130,10 @@ class PostTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test 'deleted_by_owner? should correctly determine if the post is deleted by its owner' do
+    posts.reject(&:deleted).each do |post|
+      assert_not post.deleted_by_owner?
+    end
+  end
 end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 6e6536269..db21566f6 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -217,7 +217,7 @@ class UserTest < ActiveSupport::TestCase
     end
   end
 
-  test 'ability_on? should return true for every undeleted user with profile on a community' do
+  test "ability_on? should correctly check the 'everyone' ability" do
     everyone = abilities(:everyone)
 
     communities.each do |community|
@@ -230,19 +230,26 @@ class UserTest < ActiveSupport::TestCase
     end
   end
 
-  test 'ability_on? should correctly check for unrestricted ability' do
+  test "ability_on? should correctly check the 'unrestricted' ability" do
+    ability = abilities(:unrestricted)
     community = communities(:sample)
     basic = users(:basic_user)
     system = users(:system)
 
-    unrestricted = abilities(:unrestricted)
+    restricted_users = [basic, system]
 
-    [basic, system].each do |user|
-      assert_equal user.ability_on?(community.id, unrestricted.internal_id), false
+    restricted_users.each do |user|
+      assert_not user.ability_on?(community.id, ability.internal_id),
+                 "Expected user '#{user.name}' not to have the ability"
     end
 
-    CommunityUser.unscoped.undeleted.where(community_id: community.id).where.not(user_id: [basic.id, system.id]).each do |cu|
-      assert_equal cu.user.ability_on?(community.id, unrestricted.internal_id), !cu.user.deleted
+    users.each do |user|
+      next unless user.profile_on?(community.id) && !user.community_user.deleted?
+      next if restricted_users.any? { |u| u.same_as?(user) }
+
+      assert_equal user.ability_on?(community.id, ability.internal_id),
+                   !user.deleted?,
+                   "Expected user '#{user.name}' #{'not ' if user.deleted?}to have the ability"
     end
   end