Merge 69c051bc92 into 74fc4dbacf

refactor: Only remove pointer-events when necessary (#35390 )
Use excluding in simple applications
2025-07-17 17:58:14 +00:00 · 2025-07-15 17:05:58 +00:00 · 2025-07-15 15:57:31 +00:00 · 2025-07-03 18:29:53 -04:00
6 changed files with 5 additions and 7 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2848,7 +2848,6 @@ a.account__display-name {
    &__pane {
      height: 100%;
      overflow: hidden;
-      pointer-events: none;
      display: flex;
      justify-content: flex-end;
      min-width: 285px;
@ -2860,7 +2859,6 @@ a.account__display-name {
      &__inner {
        position: fixed;
        width: 285px;
-        pointer-events: auto;
        height: 100%;
      }
    }
--- a/app/models/account_suggestions/source.rb
+++ b/app/models/account_suggestions/source.rb
@ -19,7 +19,7 @@ class AccountSuggestions::Source
      .where.not(follow_requests_sql, id: account.id)
      .not_excluded_by_account(account)
      .not_domain_blocked_by_account(account)
-      .where.not(id: account.id)
+      .excluding(account)
      .where.not(follow_recommendation_mutes_sql, id: account.id)
  end

--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@ -198,7 +198,7 @@ class ActivityPub::ProcessAccountService < BaseService
  end

  def process_duplicate_accounts!
-    return unless Account.where(uri: @account.uri).where.not(id: @account.id).exists?
+    return unless Account.where(uri: @account.uri).excluding(@account).exists?

    AccountMergingWorker.perform_async(@account.id)
  end
--- a/app/validators/unique_username_validator.rb
+++ b/app/validators/unique_username_validator.rb
@ -7,7 +7,7 @@ class UniqueUsernameValidator < ActiveModel::Validator
    return if account.username.blank?

    scope = Account.with_username(account.username).with_domain(account.domain)
-    scope = scope.where.not(id: account.id) if account.persisted?
+    scope = scope.excluding(account) if account.persisted?

    account.errors.add(:username, :taken) if scope.exists?
  end
--- a/app/workers/account_merging_worker.rb
+++ b/app/workers/account_merging_worker.rb
@ -10,7 +10,7 @@ class AccountMergingWorker

    return true if account.nil? || account.local?

-    Account.where(uri: account.uri).where.not(id: account.id).find_each do |duplicate|
+    Account.where(uri: account.uri).excluding(account).find_each do |duplicate|
      account.merge_with!(duplicate)
      duplicate.destroy
    end
--- a/app/workers/backup_worker.rb
+++ b/app/workers/backup_worker.rb
@ -22,7 +22,7 @@ class BackupWorker

    BackupService.new.call(backup)

-    user.backups.where.not(id: backup.id).destroy_all
+    user.backups.excluding(backup).destroy_all
    UserMailer.backup_ready(user, backup).deliver_later
  end
 end
Author	SHA1	Message	Date
Matt Jankowski	24d418d0a7	Merge `69c051bc92` into `74fc4dbacf`	2025-07-15 17:05:58 +00:00
diondiondion	74fc4dbacf	refactor: Only remove pointer-events when necessary (#35390 ) Some checks failed Check i18n / check-i18n (push) Waiting to run Details Chromatic / Run Chromatic (push) Waiting to run Details CodeQL / Analyze (javascript) (push) Waiting to run Details CodeQL / Analyze (ruby) (push) Waiting to run Details Check formatting / lint (push) Waiting to run Details CSS Linting / lint (push) Waiting to run Details Ruby Testing / build (production) (push) Waiting to run Details Ruby Testing / build (test) (push) Waiting to run Details Ruby Testing / test (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / test (3.2) (push) Blocked by required conditions Details Ruby Testing / test (3.3) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.2) (push) Blocked by required conditions Details Ruby Testing / ImageMagick tests (3.3) (push) Blocked by required conditions Details Ruby Testing / End to End testing (.ruby-version) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.2) (push) Blocked by required conditions Details Ruby Testing / End to End testing (3.3) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, docker.elastic.co/elasticsearch/elasticsearch:8.10.2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (.ruby-version, opensearchproject/opensearch:2) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.2, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Ruby Testing / Elastic Search integration testing (3.3, docker.elastic.co/elasticsearch/elasticsearch:7.17.13) (push) Blocked by required conditions Details Crowdin / Upload translations / upload-translations (push) Has been cancelled Details Haml Linting / lint (push) Has been cancelled Details Ruby Linting / lint (push) Has been cancelled Details Historical data migration test / test (14-alpine) (push) Has been cancelled Details Historical data migration test / test (15-alpine) (push) Has been cancelled Details Historical data migration test / test (16-alpine) (push) Has been cancelled Details Historical data migration test / test (17-alpine) (push) Has been cancelled Details	2025-07-15 15:57:31 +00:00
Matt Jankowski	69c051bc92	Use `excluding` in simple applications	2025-07-03 18:29:53 -04:00