Merge branch 'develop' into 0valt/1699/erb_lint

Author: Oaphi

Gemfile.lock

@@ -391,7 +391,7 @@ GEM
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.18.0)
+    ruby-saml (1.18.1)
       nokogiri (>= 1.13.10)
       rexml
     ruby-vips (2.2.4)

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');
 

app/assets/stylesheets/utilities.scss

@@ -359,6 +359,10 @@ span.spoiler {
   overflow-wrap: anywhere;
 }
 
+.wrap-word {
+  overflow-wrap: break-word;
+}
+
 .nowrap {
   white-space: nowrap;
 }

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)

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,9 +16,12 @@ def edit; end
 
   def update
     before = @close_reason.attributes.map { |k, v| "#{k}: #{v}" }.join(' ')
-    @close_reason.update close_reason_params
+    @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,
+
+    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?
@@ -28,29 +32,23 @@ def update
   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
-
     @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
@@ -71,6 +69,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!

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

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|

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

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" %>

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 %>