Merge d1b6f1c531 into a50c8e951f

.rubocop_todo.yml

@@ -57,11 +57,6 @@ Style/FormatStringToken:
     - 'config/initializers/devise.rb'
     - 'lib/paperclip/color_extractor.rb'
 
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
-  Enabled: false
-
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/HashTransformValues:
   Exclude:

app/javascript/mastodon/api_types/notifications.ts

@@ -60,7 +60,7 @@ export interface BaseNotificationGroupJSON {
 
 interface NotificationGroupWithStatusJSON extends BaseNotificationGroupJSON {
   type: NotificationWithStatusType;
-  status: ApiStatusJSON;
+  status_id: string;
 }
 
 interface NotificationWithStatusJSON extends BaseNotificationJSON {

app/javascript/mastodon/features/notifications/components/filtered_notifications_banner.tsx

@@ -49,21 +49,14 @@ export const FilteredNotificationsBanner: React.FC = () => {
         <span>
           <FormattedMessage
             id='filtered_notifications_banner.pending_requests'
-            defaultMessage='Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know'
+            defaultMessage='From {count, plural, =0 {no one} one {one person} other {# people}} you may know'
             values={{ count: policy.summary.pending_requests_count }}
           />
         </span>
       </div>
 
       <div className='filtered-notifications-banner__badge'>
-        <div className='filtered-notifications-banner__badge__badge'>
-          {toCappedNumber(policy.summary.pending_notifications_count)}
-        </div>
-        <FormattedMessage
-          id='filtered_notifications_banner.mentions'
-          defaultMessage='{count, plural, one {mention} other {mentions}}'
-          values={{ count: policy.summary.pending_notifications_count }}
-        />
+        {toCappedNumber(policy.summary.pending_notifications_count)}
       </div>
     </Link>
   );

app/javascript/mastodon/locales/en.json

@@ -300,8 +300,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filtered_notifications_banner.mentions": "{count, plural, one {mention} other {mentions}}",
-  "filtered_notifications_banner.pending_requests": "Notifications from {count, plural, =0 {no one} one {one person} other {# people}} you may know",
+  "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
   "firehose.local": "This server",

app/javascript/mastodon/models/notification_group.ts

@@ -124,9 +124,9 @@ export function createNotificationGroupFromJSON(
     case 'mention':
     case 'poll':
     case 'update': {
-      const { status, ...groupWithoutStatus } = group;
+      const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
-        statusId: status.id,
+        statusId,
         sampleAccountIds,
         ...groupWithoutStatus,
       };

app/javascript/styles/mastodon/components.scss

@@ -10171,25 +10171,10 @@ noscript {
   }
 
   &__badge {
-    display: flex;
-    align-items: center;
-    border-radius: 999px;
-    background: var(--background-border-color);
-    color: $darker-text-color;
-    padding: 4px;
-    padding-inline-end: 8px;
-    gap: 6px;
-    font-weight: 500;
-    font-size: 11px;
-    line-height: 16px;
-    word-break: keep-all;
-
-    &__badge {
-      background: $ui-button-background-color;
-      color: $white;
-      border-radius: 100px;
-      padding: 2px 8px;
-    }
+    background: $ui-button-background-color;
+    color: $white;
+    border-radius: 100px;
+    padding: 2px 8px;
   }
 }
 

app/lib/activitypub/activity/block.rb

@@ -15,9 +15,9 @@ class ActivityPub::Activity::Block < ActivityPub::Activity
     UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
     RejectFollowService.new.call(target_account, @account) if target_account.requested?(@account)
 
-    unless delete_arrived_first?(@json['id'])
-      BlockWorker.perform_async(@account.id, target_account.id)
-      @account.block!(target_account, uri: @json['id'])
-    end
+    return if delete_arrived_first?(@json['id'])
+
+    BlockWorker.perform_async(@account.id, target_account.id)
+    @account.block!(target_account, uri: @json['id'])
   end
 end

app/lib/request.rb

@@ -318,11 +318,9 @@ class Request
           end
         end
 
-        if outer_e
-          raise outer_e
-        else
-          raise SocketError, "No address for #{host}"
-        end
+        raise outer_e if outer_e
+
+        raise SocketError, "No address for #{host}"
       end
 
       alias new open

app/lib/request_pool.rb

@@ -58,13 +58,11 @@ class RequestPool
 
         close
 
-        if @fresh || retries.positive?
-          raise
-        else
-          @http_client = http_client
-          retries     += 1
-          retry
-        end
+        raise if @fresh || retries.positive?
+
+        @http_client = http_client
+        retries     += 1
+        retry
       rescue
         # If this connection raises errors of any kind, it's
         # better if it gets reaped as soon as possible

app/lib/webfinger.rb

@@ -84,22 +84,18 @@ class Webfinger
 
   def body_from_host_meta
     host_meta_request.perform do |res|
-      if res.code == 200
-        body_from_webfinger(url_from_template(res.body_with_limit), false)
-      else
-        raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
-      end
+      raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}" unless res.code == 200
+
+      body_from_webfinger(url_from_template(res.body_with_limit), false)
     end
   end
 
   def url_from_template(str)
     link = Nokogiri::XML(str).at_xpath('//xmlns:Link[@rel="lrdd"]')
 
-    if link.present?
-      link['template'].gsub('{uri}', @uri)
-    else
-      raise Webfinger::Error, "Request for #{@uri} returned host-meta without link to Webfinger"
-    end
+    raise Webfinger::Error, "Request for #{@uri} returned host-meta without link to Webfinger" if link.blank?
+
+    link['template'].gsub('{uri}', @uri)
   rescue Nokogiri::XML::XPath::SyntaxError
     raise Webfinger::Error, "Invalid XML encountered in host-meta for #{@uri}"
   end

app/lib/webfinger_resource.rb

@@ -54,11 +54,9 @@ class WebfingerResource
   end
 
   def username_from_acct
-    if domain_matches_local?
-      local_username
-    else
-      raise ActiveRecord::RecordNotFound
-    end
+    raise ActiveRecord::RecordNotFound unless domain_matches_local?
+
+    local_username
   end
 
   def split_acct

app/models/concerns/account/counters.rb

@@ -38,10 +38,10 @@ module Account::Counters
     result = updated_account_stat(key, value.to_i)
 
     # Reload account_stat if it was loaded, taking into account newly-created unsaved records
-    if association(:account_stat).loaded?
-      account_stat.id = result.first['id'] if account_stat.new_record?
-      account_stat.reload
-    end
+    return unless association(:account_stat).loaded?
+
+    account_stat.id = result.first['id'] if account_stat.new_record?
+    account_stat.reload
   end
 
   def account_stat

app/models/concerns/user/ldap_authenticable.rb

@@ -8,9 +8,9 @@ module User::LdapAuthenticable
       ldap   = Net::LDAP.new(ldap_options)
       filter = format(Devise.ldap_search_filter, uid: Devise.ldap_uid, mail: Devise.ldap_mail, email: Net::LDAP::Filter.escape(params[:email]))
 
-      if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: params[:password]))
-        ldap_get_user(user_info.first)
-      end
+      return unless (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: params[:password]))
+
+      ldap_get_user(user_info.first)
     end
 
     def ldap_get_user(attributes = {})

app/models/tag.rb

@@ -178,9 +178,9 @@ class Tag < ApplicationRecord
   end
 
   def validate_display_name_change
-    unless HashtagNormalizer.new.normalize(display_name).casecmp(name.mb_chars).zero?
-      errors.add(:display_name,
-                 I18n.t('tags.does_not_match_previous_name'))
-    end
+    return if HashtagNormalizer.new.normalize(display_name).casecmp(name.mb_chars).zero?
+
+    errors.add(:display_name,
+               I18n.t('tags.does_not_match_previous_name'))
   end
 end

app/models/user.rb

@@ -433,16 +433,16 @@ class User < ApplicationRecord
 
     yield
 
-    if new_user
-      # Avoid extremely unlikely race condition when approving and confirming
-      # the user at the same time
-      reload unless approved?
+    return unless new_user
 
-      if approved?
-        prepare_new_user!
-      else
-        notify_staff_about_pending_account!
-      end
+    # Avoid extremely unlikely race condition when approving and confirming
+    # the user at the same time
+    reload unless approved?
+
+    if approved?
+      prepare_new_user!
+    else
+      notify_staff_about_pending_account!
     end
   end
 

app/services/fan_out_on_write_service.rb

@@ -139,10 +139,10 @@ class FanOutOnWriteService < BaseService
     redis.publish('timeline:public', anonymous_payload)
     redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload)
 
-    if @status.with_media?
-      redis.publish('timeline:public:media', anonymous_payload)
-      redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
-    end
+    return unless @status.with_media?
+
+    redis.publish('timeline:public:media', anonymous_payload)
+    redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
   end
 
   def deliver_to_conversation!

app/services/post_status_service.rb

@@ -98,20 +98,18 @@ class PostStatusService < BaseService
   def schedule_status!
     status_for_validation = @account.statuses.build(status_attributes)
 
-    if status_for_validation.valid?
-      # Marking the status as destroyed is necessary to prevent the status from being
-      # persisted when the associated media attachments get updated when creating the
-      # scheduled status.
-      status_for_validation.destroy
+    raise ActiveRecord::RecordInvalid unless status_for_validation.valid?
 
-      # The following transaction block is needed to wrap the UPDATEs to
-      # the media attachments when the scheduled status is created
+    # Marking the status as destroyed is necessary to prevent the status from being
+    # persisted when the associated media attachments get updated when creating the
+    # scheduled status.
+    status_for_validation.destroy
 
-      ApplicationRecord.transaction do
-        @status = @account.scheduled_statuses.create!(scheduled_status_attributes)
-      end
-    else
-      raise ActiveRecord::RecordInvalid
+    # The following transaction block is needed to wrap the UPDATEs to
+    # the media attachments when the scheduled status is created
+
+    ApplicationRecord.transaction do
+      @status = @account.scheduled_statuses.create!(scheduled_status_attributes)
     end
   end
 

app/services/process_hashtags_service.rb

@@ -31,10 +31,10 @@ class ProcessHashtagsService < BaseService
 
     removed_tags = @previous_tags - @current_tags
 
-    unless removed_tags.empty?
-      @account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
-        featured_tag.decrement(@status.id)
-      end
+    return if removed_tags.empty?
+
+    @account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
+      featured_tag.decrement(@status.id)
     end
   end
 end

app/workers/move_worker.rb

@@ -123,11 +123,11 @@ class MoveWorker
   end
 
   def add_account_note_if_needed!(account, id)
-    unless AccountNote.exists?(account: account, target_account: @target_account)
-      text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
-        I18n.t(id, acct: @source_account.acct)
-      end
-      AccountNote.create!(account: account, target_account: @target_account, comment: text)
+    return if AccountNote.exists?(account: account, target_account: @target_account)
+
+    text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
+      I18n.t(id, acct: @source_account.acct)
     end
+    AccountNote.create!(account: account, target_account: @target_account, comment: text)
   end
 end

app/workers/redownload_avatar_worker.rb

@@ -20,10 +20,7 @@ class RedownloadAvatarWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise e unless response_error_unsalvageable?(response)
+    # Give up
   end
 end

app/workers/redownload_header_worker.rb

@@ -20,10 +20,7 @@ class RedownloadHeaderWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise e unless response_error_unsalvageable?(response)
+    # Give up
   end
 end

app/workers/redownload_media_worker.rb

@@ -20,10 +20,7 @@ class RedownloadMediaWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise e unless response_error_unsalvageable?(response)
+    # Give up
   end
 end

app/workers/remote_account_refresh_worker.rb

@@ -15,10 +15,7 @@ class RemoteAccountRefreshWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise e unless response_error_unsalvageable?(response)
+    # Give up
   end
 end

lib/devise/strategies/two_factor_ldap_authenticatable.rb

@@ -13,11 +13,9 @@ module Devise
       def authenticate!
         resource = mapping.to.authenticate_with_ldap(params[scope])
 
-        if resource && !resource.otp_required_for_login?
-          success!(resource)
-        else
-          fail(:invalid) # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
-        end
+        fail(:invalid) unless resource && !resource.otp_required_for_login? # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
+
+        success!(resource)
       end
 
       protected

lib/devise/strategies/two_factor_pam_authenticatable.rb

@@ -12,11 +12,9 @@ module Devise
       def authenticate!
         resource = mapping.to.authenticate_with_pam(params[scope])
 
-        if resource && !resource.otp_required_for_login?
-          success!(resource)
-        else
-          fail(:invalid) # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
-        end
+        fail(:invalid) unless resource && !resource.otp_required_for_login? # rubocop:disable Style/SignalException -- method is from Warden::Strategies::Base
+
+        success!(resource)
       end
 
       protected

lib/mastodon/cli/accounts.rb

@@ -320,10 +320,10 @@ module Mastodon::CLI
 
       say("Visited #{processed} accounts, removed #{culled}#{dry_run_mode_suffix}", :green)
 
-      unless skip_domains.empty?
-        say('The following domains were not available during the check:', :yellow)
-        skip_domains.each { |domain| say("    #{domain}") }
-      end
+      return if skip_domains.empty?
+
+      say('The following domains were not available during the check:', :yellow)
+      skip_domains.each { |domain| say("    #{domain}") }
     end
 
     option :all, type: :boolean

lib/mastodon/cli/maintenance.rb

@@ -146,18 +146,18 @@ module Mastodon::CLI
           end
         end
 
-        if db_table_exists?(:severed_relationships)
-          SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
-            record.update_attribute(:local_account_id, id)
-          rescue ActiveRecord::RecordNotUnique
-            next
-          end
+        return unless db_table_exists?(:severed_relationships)
 
-          SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
-            record.update_attribute(:remote_account_id, id)
-          rescue ActiveRecord::RecordNotUnique
-            next
-          end
+        SeveredRelationship.where(local_account_id: other_account.id).reorder(nil).find_each do |record|
+          record.update_attribute(:local_account_id, id)
+        rescue ActiveRecord::RecordNotUnique
+          next
+        end
+
+        SeveredRelationship.where(remote_account_id: other_account.id).reorder(nil).find_each do |record|
+          record.update_attribute(:remote_account_id, id)
+        rescue ActiveRecord::RecordNotUnique
+          next
         end
       end
     end
@@ -331,14 +331,14 @@ module Mastodon::CLI
     end
 
     def deduplicate_users_process_remember_token
-      if migrator_version < 2022_01_18_183010
-        duplicate_record_ids_without_nulls(:users, 'remember_token').each do |row|
-          users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
-          say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
+      return unless migrator_version < 2022_01_18_183010
 
-          users.each do |user|
-            user.update!(remember_token: nil)
-          end
+      duplicate_record_ids_without_nulls(:users, 'remember_token').each do |row|
+        users = User.where(id: row['ids'].split(',')).order(updated_at: :desc).to_a.drop(1)
+        say "Unsetting remember token for those accounts: #{users.map { |user| user.account.acct }.join(', ')}", :yellow
+
+        users.each do |user|
+          user.update!(remember_token: nil)
         end
       end
     end

lib/mastodon/cli/media.rb

@@ -58,23 +58,23 @@ module Mastodon::CLI
         say("Visited #{processed} accounts and removed profile media totaling #{number_to_human_size(aggregate)}#{dry_run_mode_suffix}", :green, true)
       end
 
-      unless options[:prune_profiles] || options[:remove_headers]
-        processed, aggregate = parallelize_with_progress(MediaAttachment.cached.remote.where(created_at: ..time_ago)) do |media_attachment|
-          next if media_attachment.file.blank?
+      return if options[:prune_profiles] || options[:remove_headers]
 
-          size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
+      processed, aggregate = parallelize_with_progress(MediaAttachment.cached.remote.where(created_at: ..time_ago)) do |media_attachment|
+        next if media_attachment.file.blank?
 
-          unless dry_run?
-            media_attachment.file.destroy
-            media_attachment.thumbnail.destroy
-            media_attachment.save
-          end
+        size = (media_attachment.file_file_size || 0) + (media_attachment.thumbnail_file_size || 0)
 
-          size
+        unless dry_run?
+          media_attachment.file.destroy
+          media_attachment.thumbnail.destroy
+          media_attachment.save
         end
 
-        say("Removed #{processed} media attachments (approx. #{number_to_human_size(aggregate)})#{dry_run_mode_suffix}", :green, true)
+        size
       end
+
+      say("Removed #{processed} media attachments (approx. #{number_to_human_size(aggregate)})#{dry_run_mode_suffix}", :green, true)
     end
 
     option :start_after

lib/tasks/repo.rake

@@ -56,13 +56,11 @@ namespace :repo do
               loop do
                 response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
 
-                if response.code == 403
-                  sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
-                  puts "Sleeping for #{sleep_for} seconds to get over rate limit"
-                  sleep sleep_for
-                else
-                  break
-                end
+                break unless response.code == 403
+
+                sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
+                puts "Sleeping for #{sleep_for} seconds to get over rate limit"
+                sleep sleep_for
               end
 
               pull_request = Oj.load(response.to_s)