Merge branch 'develop' into 0valt/387/post-title-search

Oaphi · web-flow · commit cd9c737743a5 · 2025-08-04T18:06:12.000+03:00
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -10,16 +10,13 @@ on:
 
 env:
   RAILS_ENV: test
+  RUBY_VERSION: 3.2
 
 jobs:
   rubocop:
     name: Rubocop checking
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        ruby_version: [3.1, 3.2]
-
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3
@@ -30,7 +27,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby_version }}
+          ruby-version: ${{ env.RUBY_VERSION }}
           bundler-cache: true
       - run: bundle exec rubocop
 
@@ -106,7 +103,7 @@ jobs:
           path: tmp/screenshots
           if-no-files-found: ignore
       - uses: codecov/codecov-action@v5
-        if: ${{ matrix.ruby_version == 3.2 && matrix.test_type == 'test' && github.actor != 'dependabot[bot]' }}
+        if: ${{ matrix.ruby_version == env.RUBY_VERSION && matrix.test_type == 'test' && github.actor != 'dependabot[bot]' }}
         with:
           directory: coverage
           fail_ci_if_error: true
diff --git a/app/assets/javascripts/comments.js b/app/assets/javascripts/comments.js
@@ -236,7 +236,7 @@ $(() => {
    * @type {Record<`${number}-${number}`, Record<string, number>>}
    */
   const pingable = {};
-  $(document).on('keyup', '.js-comment-field', pingable_popup);
+  $(document).on('keyup', '.js-comment-field, .js-thread-title-field', pingable_popup);
 
   /**
    * @type {QPixelPingablePopupCallback}
@@ -267,10 +267,12 @@ $(() => {
       $tgt.focus();
     };
 
-    // If the word the caret is currently in starts with an @, and has at least 3 characters after that, assume it's
-    // an attempt to ping another user with a username, and kick off suggestions -- unless it starts with @#, in which
-    // case it's likely an already-selected ping.
-    if (currentWord.startsWith('@') && !currentWord.startsWith('@#') && currentWord.length >= 4) {
+    // at least 1 character has to be present to trigger autocomplete (2 is because pings start with @)
+    const hasReachedAutocompleteThreshold = currentWord.length >= 2;
+
+    // If the word the caret is currently in starts with an @, and is reached the autocomplete threshold, assume it's
+    // a ping attempt and kick off suggestions (unless it starts with @#, meaning it's likely an already-selected ping)
+    if (currentWord.startsWith('@') && !currentWord.startsWith('@#') && hasReachedAutocompleteThreshold) {
       const threadId = $tgt.data('thread');
       const postId = $tgt.data('post');
 
diff --git a/app/assets/stylesheets/utilities.scss b/app/assets/stylesheets/utilities.scss
@@ -359,6 +359,10 @@ span.spoiler {
   overflow-wrap: anywhere;
 }
 
+.wrap-word {
+  overflow-wrap: break-word;
+}
+
 .nowrap {
   white-space: nowrap;
 }
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -65,7 +65,7 @@ def send_all_email
 
     Thread.new do
       emails = User.where.not(confirmed_at: nil).where('email NOT LIKE ?', '%localhost').select(:email).map(&:email)
-      emails.each_slice(50) do |slice|
+      emails.each_slice(49) do |slice|
         AdminMailer.with(body_markdown: params[:body_markdown],
                          subject: params[:subject],
                          emails: slice, community: community)
diff --git a/app/controllers/close_reasons_controller.rb b/app/controllers/close_reasons_controller.rb
@@ -1,10 +1,11 @@
 class CloseReasonsController < ApplicationController
   before_action :verify_moderator
+  before_action :check_create_access, only: [:new, :create]
   before_action :set_close_reason, only: [:edit, :update]
   before_action :verify_admin_for_global_reasons, only: [:edit, :update]
 
   def index
-    @close_reasons = if current_user.is_global_admin && params[:global] == '1'
+    @close_reasons = if current_user.global_admin? && params[:global] == '1'
                        CloseReason.unscoped.where(community_id: nil)
                      else
                        CloseReason.unscoped.where(community_id: @community.id)
@@ -15,49 +16,47 @@ def edit; end
 
   def update
     before = @close_reason.attributes.map { |k, v| "#{k}: #{v}" }.join(' ')
-    @close_reason.update close_reason_params
-    after = @close_reason.attributes.map { |k, v| "#{k}: #{v}" }.join(' ')
-    AuditLog.moderator_audit(event_type: 'close_reason_update', related: @close_reason, user: current_user,
-                             comment: "from <<CloseReason #{before}>>\nto <<CloseReason #{after}>>")
+    if @close_reason.update(close_reason_params)
+      after = @close_reason.attributes.map { |k, v| "#{k}: #{v}" }.join(' ')
 
-    if @close_reason.community.nil?
-      redirect_to close_reasons_path(global: 1)
+      AuditLog.moderator_audit(event_type: 'close_reason_update',
+                               related: @close_reason,
+                               user: current_user,
+                               comment: "from <<CloseReason #{before}>>\nto <<CloseReason #{after}>>")
+
+      if @close_reason.community.nil?
+        redirect_to close_reasons_path(global: 1)
+      else
+        redirect_to close_reasons_path
+      end
     else
-      redirect_to close_reasons_path
+      render :edit, status: :bad_request
     end
   end
 
   def new
-    if !current_user.is_global_admin && params[:global] == '1'
-      not_found!
-      return
-    end
-
-    @close_reason = CloseReason.new
+    @close_reason = CloseReason.new(community: params[:global] == '1' ? nil : @community)
   end
 
   def create
-    if !current_user.is_global_admin && params[:global] == '1'
-      not_found!
-      return
-    end
+    community_params = { community: params[:global] == '1' ? nil : @community }
+    @close_reason = CloseReason.new(close_reason_params.merge(community_params))
 
-    @close_reason = CloseReason.new(name: params[:close_reason][:name],
-                                    description: params[:close_reason][:description],
-                                    requires_other_post: params[:close_reason][:requires_other_post],
-                                    active: params[:close_reason][:active],
-                                    community: params[:global] == '1' ? nil : @community)
     if @close_reason.save
       attr = @close_reason.attributes_print
-      AuditLog.moderator_audit(event_type: 'close_reason_create', related: @close_reason, user: current_user,
+
+      AuditLog.moderator_audit(event_type: 'close_reason_create',
+                               related: @close_reason,
+                               user: current_user,
                                comment: "<<CloseReason #{attr}>>")
+
       if @close_reason.community.nil?
         redirect_to close_reasons_path(global: 1)
       else
         redirect_to close_reasons_path
       end
     else
-      render :new
+      render :new, status: :bad_request
     end
   end
 
@@ -71,6 +70,10 @@ def set_close_reason
     @close_reason = CloseReason.unscoped.find(params[:id])
   end
 
+  def check_create_access
+    not_found! unless current_user&.global_admin? || params[:global] != '1'
+  end
+
   def verify_admin_for_global_reasons
     if !current_user.global_admin? && @close_reason.community.nil?
       not_found!
diff --git a/app/controllers/pinned_links_controller.rb b/app/controllers/pinned_links_controller.rb
@@ -27,27 +27,42 @@ def new
   end
 
   def create
-    @link = PinnedLink.create pinned_link_params
+    @link = PinnedLink.new(pinned_link_params)
 
-    attr = @link.attributes_print
-    AuditLog.moderator_audit(event_type: 'pinned_link_create', related: @link, user: current_user,
-                             comment: "<<PinnedLink #{attr}>>")
+    if @link.save
+      attr = @link.attributes_print
 
-    flash[:success] = 'Your pinned link has been created. Due to caching, it may take some time until it is shown.'
-    redirect_to pinned_links_path
+      AuditLog.moderator_audit(event_type: 'pinned_link_create',
+                               related: @link,
+                               user: current_user,
+                               comment: "<<PinnedLink #{attr}>>")
+
+      flash[:success] =
+        'Your pinned link has been created. Due to caching, it may take some time until it is shown.'
+      redirect_to pinned_links_path
+    else
+      render 'pinned_links/new', status: :bad_request
+    end
   end
 
   def edit; end
 
   def update
     before = @link.attributes_print
-    @link.update pinned_link_params
-    after = @link.attributes_print
-    AuditLog.moderator_audit(event_type: 'pinned_link_update', related: @link, user: current_user,
-                             comment: "from <<PinnedLink #{before}>>\nto <<PinnedLink #{after}>>")
 
-    flash[:success] = 'The pinned link has been updated. Due to caching, it may take some time until it is shown.'
-    redirect_to pinned_links_path
+    if @link.update(pinned_link_params)
+      after = @link.attributes_print
+
+      AuditLog.moderator_audit(event_type: 'pinned_link_update',
+                               related: @link,
+                               user: current_user,
+                               comment: "from <<PinnedLink #{before}>>\nto <<PinnedLink #{after}>>")
+
+      flash[:success] = 'The pinned link has been updated. Due to caching, it may take some time until it is shown.'
+      redirect_to pinned_links_path
+    else
+      render 'pinned_links/edit', status: :bad_request
+    end
   end
 
   private
diff --git a/app/controllers/post_types_controller.rb b/app/controllers/post_types_controller.rb
@@ -21,7 +21,7 @@ def new
   end
 
   def create
-    @type = PostType.new post_type_params
+    @type = PostType.new(post_type_params)
     if @type.save
       clear_cache!
       redirect_to post_types_path
@@ -55,8 +55,6 @@ def post_type_params
   end
 
   def clear_cache!
-    # FIXME: this is likely not clearing cache for rep changes
-    Rails.cache.delete 'network/post_types/rep_changes'
     PostType.clear_ids_cache
     current_community = RequestContext.community
     Community.all.each do |c|
diff --git a/app/models/close_reason.rb b/app/models/close_reason.rb
@@ -3,5 +3,11 @@ class CloseReason < ApplicationRecord
 
   scope :active, -> { where(active: true) }
 
-  validates :name, uniqueness: { scope: [:community_id], case_sensitive: false }
+  validates :name, length: { maximum: 255 },
+                   presence: true,
+                   uniqueness: { scope: [:community_id], case_sensitive: false }
+
+  def global?
+    community.nil?
+  end
 end
diff --git a/app/models/pinned_link.rb b/app/models/pinned_link.rb
@@ -1,10 +1,18 @@
 class PinnedLink < ApplicationRecord
   include MaybeCommunityRelated
-  belongs_to :post
+  belongs_to :post, optional: true
+
+  validate :check_post_or_url
 
   # Is the link time-constrained?
   # @return [Boolean] check result
   def timed?
     shown_before.present? || shown_after.present?
   end
+
+  def check_post_or_url
+    unless post_id.present? || link.present?
+      errors.add(:base, 'either a post or a URL must be set')
+    end
+  end
 end
diff --git a/app/views/close_reasons/_form.html.erb b/app/views/close_reasons/_form.html.erb
@@ -1,3 +1,11 @@
+<%#
+    Instance variables:
+      @close_reason : close reason to edit
+
+    Variables:
+      submit_url : route URL to submit the form to
+%>
+
 <%= form_for @close_reason, url: submit_url do |f| %>
   <div class="form-group">
     <%= f.label :name, "Name", class: "form-element" %>
diff --git a/app/views/comments/_new_thread_modal.html.erb b/app/views/comments/_new_thread_modal.html.erb
@@ -39,7 +39,11 @@
         You can give your comment thread a title. If you leave this blank, the beginning of the initial comment will
         be shown.
       </span>
-      <%= text_field_tag :title, '', class: 'form-element', data: { character_count: ".js-character-count-thread-title" } %>
+      <%= text_field_tag :title, '',
+                         class: 'form-element js-thread-title-field',
+                         data: { post: post.id,
+                                 thread: '-1',
+                                 character_count: ".js-character-count-thread-title" } %>
       <%= render 'shared/char_count', type: 'thread-title' %>
 
       <%= submit_tag 'Create thread', class: 'button is-filled', id: "create_thread_button_#{post.id}", disabled: true %>
diff --git a/app/views/comments/_rename_thread_modal.html.erb b/app/views/comments/_rename_thread_modal.html.erb
@@ -16,7 +16,10 @@
     </div>
     <div class="modal--body">
       <%= label_tag :title, 'Title', class: 'form-element' %>
-      <%= text_field_tag :title, thread.title, class: 'form-element' %>
+      <%= text_field_tag :title,
+                         thread.title,
+                         class: 'form-element js-thread-title-field',
+                         data: { post: thread.post.id, thread: thread.id } %>
     </div>
     <div class="modal--footer">
       <%= submit_tag 'Update thread', class: 'button is-muted is-filled' %>
diff --git a/app/views/users/_activity_items.html.erb b/app/views/users/_activity_items.html.erb
diff --git a/app/views/users/activity.html.erb b/app/views/users/activity.html.erb
diff --git a/test/controllers/close_reasons_controller_test.rb b/test/controllers/close_reasons_controller_test.rb
diff --git a/test/controllers/pinned_links_controller_test.rb b/test/controllers/pinned_links_controller_test.rb
diff --git a/test/controllers/post_types_controller_test.rb b/test/controllers/post_types_controller_test.rb

Original file line number	Diff line number	Diff line change
`@@ -359,6 +359,10 @@ span.spoiler {`
`359`	`359`	`overflow-wrap: anywhere;`
`360`	`360`	`}`
`361`	`361`
	`362`	`+.wrap-word {`
	`363`	`+ overflow-wrap: break-word;`
	`364`	`+}`
	`365`	`+`
`362`	`366`	`.nowrap {`
`363`	`367`	`white-space: nowrap;`
`364`	`368`	`}`