Merge remote-tracking branch 'origin/master' into AO3-7410

Author: CelineB-sudo

Gemfile.lock

@@ -200,7 +200,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.22.0)
       addressable
     csv (3.3.5)
     cucumber (9.2.1)
@@ -243,7 +243,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.4.1)
+    date (3.5.1)
     departure (8.0.0)
       activerecord (>= 7.2.0)
       mysql2 (>= 0.4.0, < 0.6.0)
@@ -276,7 +276,7 @@ GEM
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
-    erb (5.1.1)
+    erb (6.0.1.1)
     erb_lint (0.4.0)
       activesupport
       better_html (>= 2.0.1)
@@ -406,7 +406,7 @@ GEM
     net-http-digest_auth (1.4.1)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.5.9)
+    net-imap (0.5.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -425,7 +425,7 @@ GEM
     netrc (0.11.0)
     nio4r (2.7.4)
     nkf (0.2.0)
-    nokogiri (1.19.1)
+    nokogiri (1.19.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     orm_adapter (0.5.0)
@@ -458,7 +458,7 @@ GEM
     psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.2)
+    public_suffix (7.0.5)
     puma (6.5.0)
       nio4r (~> 2.0)
     puma_worker_killer (1.0.0)
@@ -661,7 +661,7 @@ GEM
     tilt (2.6.1)
     timecop (0.9.10)
     timeliness (0.4.5)
-    timeout (0.4.3)
+    timeout (0.6.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)

app/controllers/challenge/gift_exchange_controller.rb

@@ -42,6 +42,12 @@ def update
       # expire the cache on the signup form
       ActionController::Base.new.expire_fragment('challenge_signups/new')
 
+      # allow regenerating matches if none were found previously
+      if @challenge.no_potential_matches_found?
+        @challenge.no_potential_matches_found = false
+        @challenge.save!
+      end
+
       # see if we initialized the tag set
       redirect_to collection_profile_path(@collection)
     else

app/controllers/challenge_assignments_controller.rb

@@ -188,7 +188,10 @@ def update_multiple
         assignment.defaulted_at = nil
         assignment.save || (@errors << ts("We couldn't undefault the assignment covering %{request}.", request: assignment.request_byline))
       when "approve"
-        assignment.get_collection_item.approve_by_collection if assignment.get_collection_item
+        if (item = assignment.get_collection_item)
+          item.approve_by_collection
+          item.save || (@errors << t(".approve_error", request: assignment.request_byline))
+        end
       when "cover"
         # cover_[assignment_id] = pinch hitter pseud
         next if val.blank? || assignment.pinch_hitter.try(:byline) == val

app/controllers/chapters_controller.rb

@@ -1,9 +1,9 @@
 class ChaptersController < ApplicationController
   include WorksHelper
 
-  # only registered users and NOT admin should be able to create new chapters
-  before_action :users_only, except: [:index, :show, :destroy, :confirm_delete]
-  before_action :check_user_status, only: [:new, :create, :update, :update_positions]
+  # only registered users and NOT admin should be able to create and delete chapters
+  before_action :users_only, except: [:index, :show]
+  before_action :check_user_status, only: [:new, :create, :update, :update_positions, :post]
   before_action :check_user_not_suspended, only: [:edit, :remove_user_creatorship, :confirm_delete, :destroy]
   before_action :load_work
   # only authors of a work should be able to edit its chapters

app/controllers/collection_participants_controller.rb

@@ -73,16 +73,16 @@ def index
 
   def update
     if @participant.update(collection_participant_params)
-      flash[:notice] = t('collection_participants.update_success', default: "Updated %{participant}.", participant: @participant.pseud.name)
+      flash[:notice] = t(".success", participant: @participant.pseud.byline)
     else
-      flash[:error] = t(".failure", participant: @participant.pseud.name)
+      flash[:error] = t(".failure", participant: @participant.pseud.byline)
     end
     redirect_to collection_participants_path(@collection)
   end
 
   def destroy
     @participant.destroy
-    flash[:notice] = t('collection_participants.destroy', default: "Removed %{participant} from collection.", participant: @participant.pseud.name)
+    flash[:notice] = t(".success", participant: @participant.pseud.byline)
     redirect_back_or_to root_path
   end
 

app/controllers/gifts_controller.rb

@@ -13,18 +13,16 @@ def index
     end
 
     if @user
-      @works = if @can_access_refused_gifts && params[:refused]
-                 @user.rejected_gift_works.visible_to_registered_user
-               elsif current_user.nil?
-                 @user.gift_works.visible_to_all
-               else
-                 @user.gift_works.visible_to_registered_user
-               end
+      @works = @can_access_refused_gifts && params[:refused] ? @user.rejected_gift_works : @user.gift_works
     else
       pseud = Pseud.parse_byline(@recipient_name)
       @works = pseud ? pseud.gift_works : Work.giftworks_for_recipient_name(@recipient_name)
-      @works = current_user.nil? ? @works.visible_to_all : @works.visible_to_registered_user
     end
+    @works = if guest?
+               @works.visible_to_all
+             else
+               @works.visible_to_registered_user
+             end
     @works = @works.in_collection(@collection) if @collection
     @works = @works.order("revised_at DESC").paginate(page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE)
   end

app/controllers/help_controller.rb

@@ -1,55 +1,35 @@
 class HelpController < ApplicationController
+  HELP_ACTIONS = %i[
+    first_login
+    html
+    preferences_collection
+    preferences_comment
+    preferences_display
+    preferences_locale
+    preferences_misc
+    preferences_privacy
+    preferences_work_title_format
+    rte
+    skins_basics
+    skins_creating
+    skins_parents
+    symbols_key
+    tags_fandoms
+    tags_ratings
+    tags_warnings
+    works_languages
+    works_parents
+    works_recipients
+    works_series
+    works_translation_link
+  ].freeze
+
   before_action :users_only, only: [:first_login]
   layout proc { |controller| controller.request.xhr? ? false : "application" } # rubocop:disable Lint/AmbiguousBlockAssociation
 
-  def first_login
-  end
-
-  def html
-  end
-
-  def preferences_collection
-  end
-
-  def preferences_comment
-  end
-
-  def preferences_display
-  end
-
-  def preferences_locale
-  end
-
-  def preferences_misc
-  end
-
-  def preferences_privacy
-  end
-
-  def preferences_work_title_format
-  end
-
-  def rte
-  end
-
-  def skins_basics
-  end
-
-  def skins_creating
-  end
-
-  def skins_parents
-  end
-
-  def symbols_key
-  end
-
-  def tags_fandoms
-  end
-
-  def tags_ratings
-  end
-
-  def tags_warnings
+  HELP_ACTIONS.each do |action|
+    define_method(action) do
+      # Intentionally empty block for help actions
+    end
   end
 end

app/controllers/potential_matches_controller.rb

@@ -65,6 +65,8 @@ def index
       @assignment_in_progress = true
     elsif @collection.potential_matches.count > 0 && @collection.assignments.count == 0
       flash[:error] = ts("There has been an error in the potential matching. Please first try regenerating assignments, and if that doesn't work, all potential matches. If the problem persists, please contact Support.")
+    elsif @collection.challenge.no_potential_matches_found?
+      @no_potential_matches_found = true
     elsif @collection.potential_matches.count > 0
       # we have potential_matches and assignments
 

app/controllers/preferences_controller.rb

@@ -12,14 +12,14 @@ def index
     @page_subtitle = t(".page_title", username: @user.login)
     @preference = @user.preference
     authorize @preference if logged_in_as_admin?
-    @available_skins = (@user.skins.site_skins + Skin.approved_skins.site_skins).uniq
+    @available_skins = available_skins
     @available_locales = Locale.where(email_enabled: true)
   end
 
   def update
     @preference = @user.preference
     authorize @preference if logged_in_as_admin?
-    @available_skins = (@user.skins.site_skins + Skin.approved_skins.site_skins).uniq
+    @available_skins = available_skins
     @available_locales = Locale.where(email_enabled: true)
 
     @user.preference.attributes = preference_params
@@ -40,6 +40,11 @@ def update
 
   private
 
+  def available_skins
+    (@user.skins.site_skins.usable +
+    Skin.approved_skins.site_skins.usable).uniq
+  end
+
   def preference_params
     params.require(:preference).permit(
       :minimize_search_engines,

app/controllers/series_controller.rb

@@ -1,7 +1,7 @@
 class SeriesController < ApplicationController
   before_action :check_user_status, only: [:new, :create, :edit, :update]
-  before_action :load_series, only: [:show, :edit, :remove_user_creatorship, :update, :manage, :destroy, :confirm_delete]
-  before_action :check_ownership, only: [:edit, :update, :manage, :destroy, :confirm_delete]
+  before_action :load_series, only: [:show, :edit, :remove_user_creatorship, :update, :manage, :update_positions, :confirm_delete, :destroy]
+  before_action :check_ownership, except: [:index, :show, :new, :create]
   before_action :check_visibility, only: [:show]
 
   def load_series
@@ -42,14 +42,14 @@ def index
   # GET /series/1
   # GET /series/1.xml
   def show
-    @works = @series.works_in_order.posted.select(&:visible?).paginate(page: params[:page])
+    @works = @series.works_in_order.posted.includes(:pseuds).select(&:visible?).paginate(page: params[:page])
 
     # sets the page title with the data for the series
     if @series.unrevealed?
       @page_subtitle = t(".unrevealed_series")
     else
       @page_subtitle = get_page_subtitle(@series.fandoms.pluck(:name).join(t("support.array.words_connector")),
-                                      @series.anonymous? ? t(".anonymous") : @series.allpseuds.collect(&:byline).join(t("support.array.words_connector")),
+                                      helpers.text_byline(@series),
                                       @series.title)
     end
 
@@ -116,7 +116,6 @@ def update
 
   def update_positions
     if params[:serial_works]
-      @series = Series.find(params[:id])
       @series.reorder_list(params[:serial_works])
       flash[:notice] = ts("Series order has been successfully updated.")
     elsif params[:serial]