Merge branch 'develop' into art/admin-error-preload

Author: ArtOfCode-

app/assets/javascripts/codeblocks.js

@@ -1,16 +1,78 @@
-$(() => {
-  $(".post--content pre > code")
-    .parent()
-    .each(function() {
-      const content = $(this).text()
-      $(this)
-        .wrap('<div style="position:relative;"></div>')
-        .parent()
-        .prepend($('<button class="copy-button button is-muted is-outlined has-margin-2">Copy</button>')
-          .click(function () {
-            navigator.clipboard.writeText(content);
-            $(this).text('Copied!');
-            setTimeout(() => { $(this).text('Copy'); }, 2000);
-          }))
+document.addEventListener('DOMContentLoaded', () => {
+  /**
+   * @param {string} content
+   * @returns {HTMLButtonElement}
+   */
+  const createCopyButton = (content, isSmall = false) => {
+    const button = document.createElement('button');
+    button.classList.add('copy-button', 'button', 'is-muted', 'is-outlined', 'has-margin-2');
+    button.textContent = 'Copy';
+
+    if (isSmall) {
+      button.classList.add('is-small');
+    }
+
+    button.addEventListener('click', async () => {
+      const originalButtonText = button.textContent;
+
+      try {
+        await navigator.clipboard.writeText(content);
+        button.textContent = 'Copied!';
+      }
+      catch (e) {
+        console.warn(e);
+        button.textContent = 'Failed!';
+      }
+      finally {
+        setTimeout(() => {
+          button.textContent = originalButtonText;
+        }, 2000);
+      }
+    });
+
+    return button;
+  };
+
+  /**
+   * @param {Element} element
+   * @returns {HTMLDivElement}
+   */
+  const wrapRelative = (element) => {
+    const wrapper = document.createElement('div');
+    wrapper.style.position = 'relative';
+    wrapper.append(element.cloneNode(true));
+    element.replaceWith(wrapper);
+    return wrapper;
+  };
+
+  if (!window.isSecureContext) {
+    return;
+  }
+
+  document.querySelectorAll('.post--content pre > code').forEach((child) => {
+    const { parentElement: element } = child;
+
+    if (!element) {
+      return;
+    }
+
+    const { textContent } = element;
+
+    // code blocks always have a trailing newline added
+    const normalizedText = textContent.replace(/\n$/, '');
+
+    if (!normalizedText) {
+      return;
+    }
+
+    const numLines = normalizedText.split(/\r?\n/).length;
+
+    if (numLines < 1) {
+      return;
+    }
+
+    const button = createCopyButton(textContent, numLines === 1);
+    const wrapper = wrapRelative(element);
+    wrapper.prepend(button);
   });
-});
+});

app/assets/stylesheets/utilities.scss

@@ -123,6 +123,10 @@ pre.pre-wrap {
   display: none;
   position: absolute;
   right: 0;
+
+  &.is-small {
+    top: -1px;
+  }
 }
 
 div:hover > .copy-button {

app/controllers/categories_controller.rb

@@ -158,10 +158,15 @@ def verify_view_access
   end
 
   def set_list_posts
-    sort_params = { activity: { last_activity: :desc }, age: { created_at: :desc }, score: { score: :desc },
+    @default_sort_type = :activity
+    @sort_type = params[:sort]&.to_sym || @default_sort_type
+
+    sort_params = { activity: { last_activity: :desc },
+                    age: { created_at: :desc },
+                    score: { score: :desc },
                     lottery: [Arel.sql('(RAND() - ? * DATEDIFF(CURRENT_TIMESTAMP, posts.created_at)) DESC'),
                               SiteSetting['LotteryAgeDeprecationSpeed']] }
-    sort_param = sort_params[params[:sort]&.to_sym] || { last_activity: :desc }
+
     @posts = @category.posts
                       .undeleted
                       .where(post_type_id: @category.display_post_types)
@@ -200,7 +205,8 @@ def set_list_posts
 
     @posts = helpers.qualifiers_to_sql(filter_qualifiers, @posts, current_user)
     @filtered = filter_qualifiers.any?
-    @posts = @posts.paginate(page: params[:page], per_page: 50).order(sort_param)
+    @posts = @posts.paginate(page: params[:page], per_page: 50)
+                   .order(sort_params[@sort_type])
   end
 
   def clear_categories_cache

app/controllers/users_controller.rb

@@ -45,20 +45,13 @@ def index
 
   def show
     @abilities = Ability.on_user(@user)
+    @limit = params[:limit]&.to_i || 15
 
-    all_posts = if current_user&.privilege?('flag_curate') || @user == current_user
-                  @user.posts
-                else
-                  @user.posts.undeleted
-                end
-                .list_includes
-                .joins(:category)
-                .where('IFNULL(categories.min_view_trust_level, 0) <= ?', current_user&.trust_level || 0)
-                .user_sort({ term: params[:sort], default: :score },
-                           age: :created_at, score: :score)
-
-    @posts = all_posts.first(15)
-    @total_post_count = all_posts.count
+    @posts = set_posts.user_sort({ term: params[:sort], default: :score },
+                                 age: :created_at, score: :score)
+
+    @total_post_count = @posts.count
+    @posts = @posts.first(@limit)
     render layout: 'without_sidebar'
   end
 
@@ -215,17 +208,13 @@ def set_preference
   end
 
   def posts
-    @posts = if current_user&.privilege?('flag_curate') || @user == current_user
-               Post.all
-             else
-               Post.undeleted
-             end.by(@user).list_includes.joins(:category)
-             .where('IFNULL(categories.min_view_trust_level, 0) <= ?', current_user&.trust_level || 0)
-             .user_sort({ term: params[:sort], default: :score },
-                        activity: :last_activity,
-                        age: :created_at,
-                        score: :score)
-             .paginate(page: params[:page], per_page: 25)
+    @posts = set_posts.user_sort({ term: params[:sort], default: :score },
+                                 activity: :last_activity,
+                                 age: :created_at,
+                                 score: :score)
+                      .order(created_at: :desc)
+                      .paginate(page: params[:page], per_page: 25)
+
     respond_to do |format|
       format.html do
         render :posts
@@ -661,6 +650,17 @@ def filter_params
                   include_tags: [], exclude_tags: [])
   end
 
+  def set_posts
+    @posts = if current_user&.privilege?('flag_curate') || @user == current_user
+               @user.posts
+             else
+               @user.posts.undeleted
+             end
+             .list_includes
+             .joins(:category)
+             .where('IFNULL(categories.min_view_trust_level, 0) <= ?', current_user&.trust_level || 0)
+  end
+
   def set_user
     user_id = if params[:id] == 'me' && user_signed_in?
                 current_user.id

app/helpers/application_helper.rb

@@ -1,7 +1,5 @@
 # Provides helper methods for use by views under <tt>ApplicationController</tt> (and by extension, every view).
 module ApplicationHelper
-  include Warden::Test::Helpers
-
   ##
   # Is the current user a moderator or admin on the current community?
   # @return [Boolean]
@@ -330,7 +328,7 @@ def current_user
     @current_user ||= warden.authenticate(scope: :user)
     if @current_user&.deleted? || @current_user&.community_user&.deleted?
       scope = Devise::Mapping.find_scope!(:user)
-      logout scope
+      warden.logout(scope)
       @current_user = nil
     end
     @current_user

app/helpers/search_helper.rb

@@ -114,11 +114,11 @@ def params_to_qualifiers(params)
       filter_qualifiers.append({ param: :source, value: params[:source].to_sym })
     end
 
-    if params[:include_tags]&.all? { |id| id.match? valid_value[:integer] }
+    if valid_tags_list?(params[:include_tags])
       filter_qualifiers.append({ param: :include_tags, tag_ids: params[:include_tags] })
     end
 
-    if params[:exclude_tags]&.all? { |id| id.match? valid_value[:integer] }
+    if valid_tags_list?(params[:exclude_tags])
       filter_qualifiers.append({ param: :exclude_tags, tag_ids: params[:exclude_tags] })
     end
 
@@ -244,6 +244,13 @@ def qualifiers_to_sql(qualifiers, query, user)
     query
   end
 
+  # Is a given param a valid list of tags?
+  # @param param [String, Array<String>, nil] parameter to check
+  # @return [Boolean] check result
+  def valid_tags_list?(param)
+    param.is_a?(Array) && param&.all? { |id| id.match?(/^\d+$/) }
+  end
+
   # Is a given param a valid source type?
   # @param param [String, Symbol, nil] parameter to check
   # @return [Boolean] check result

app/models/tag.rb

@@ -49,7 +49,7 @@ def self.search(term)
 
     # Select from the union of the above queries, select only the tag columns such that we can distinct them
     from(Arel.sql("((#{q1.to_sql}) UNION (#{q2.to_sql})) tags"))
-      .order(Arel.sql(sanitize_sql_array(['name LIKE ? DESC, name', value])))
+      .order(Arel.sql(sanitize_sql_array(['name LIKE ? DESC, char_length(name), name', value])))
       .select(Tag.column_names.map { |c| "tags.#{c}" })
       .distinct
   end

app/views/search/_filters.html.erb

@@ -1,9 +1,10 @@
 <% allow_delete ||= false %>
 <% allow_apply = true if allow_apply.nil? %>
 <% @active_filter ||= {} %>
+<% @default_sort_type ||= '' %>
 
 <div class="form-group">
-  <input name="sort" type="hidden" value="<%= params[:sort] || '' %>" />
+  <input name="sort" type="hidden" value="<%= params[:sort] || @default_sort_type %>" />
 
   <div class="search-filters-filter">
     <div>

…grate/20260208223211_follow_own_posts.rb …grate/20260304104100_follow_own_posts.rbdb/migrate/20260208223211_follow_own_posts.rb renamed to db/migrate/20260304104100_follow_own_posts.rb db/migrate/20260208223211_follow_own_posts.rb renamed to db/migrate/20260304104100_follow_own_posts.rb

@@ -1,6 +1,7 @@
 class FollowOwnPosts < ActiveRecord::Migration[7.2]
   def change
-    to_insert = Post.where.not(post_type_id: [PolicyDoc.post_type_id, HelpDoc.post_type_id])
+    to_insert = Post.unscoped
+                    .where.not(post_type_id: [PolicyDoc.post_type_id, HelpDoc.post_type_id])
                     .where.not(user_id: nil)
                     .pluck(:id, :user_id)
                     .map { |post_id, user_id| { post_id: post_id, user_id: user_id } }

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_12_26_185531) do
+ActiveRecord::Schema[7.2].define(version: 2026_03_04_104100) do
   create_table "abilities", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.bigint "community_id"
     t.string "name"