Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences (#37795)

Browse Source
This commit is contained in:
Nicholas La Roux
2026-02-17 09:56:46 -05:00
committed by GitHub
parent 0b66e74426
commit 438602c488
31 changed files with 132 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/fasp/request.rb
View File

@@ -27,9 +27,9 @@ class Fasp::Request
headers = request_headers(verb, url, body)
key = Linzer.new_ed25519_key(@provider.server_private_key_pem, @provider.remote_identifier)
response = HTTP
.headers(headers)
.use(http_signature: { key:, covered_components: COVERED_COMPONENTS })
.send(verb, url, body:)
.headers(headers)
.use(http_signature: { key:, covered_components: COVERED_COMPONENTS })
.send(verb, url, body:)
validate!(response)
@provider.delivery_failure_tracker.track_success!

8
app/lib/feed_manager.rb
View File

@@ -214,10 +214,10 @@ class FeedManager
# This is a bit tricky because we need posts tagged with this hashtag that are not
# also tagged with another followed hashtag or from a followed user
scope = from_tag.statuses
.where(id: timeline_status_ids)
.where.not(account: into_account)
.where.not(account: into_account.following)
.tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id))
.where(id: timeline_status_ids)
.where.not(account: into_account)
.where.not(account: into_account.following)
.tagged_with_none(TagFollow.where(account: into_account).pluck(:tag_id))
scope.select(:id, :reblog_of_id).reorder(nil).find_each do |status|
remove_from_feed(:home, into_account.id, status, aggregate_reblogs: into_account.user&.aggregates_reblogs?)

8
app/lib/vacuum/statuses_vacuum.rb
View File

@@ -18,8 +18,8 @@ class Vacuum::StatusesVacuum
# Side-effects not covered by foreign keys, such
# as the search index, must be handled first.
statuses.direct_visibility
.includes(mentions: :account)
.find_each(&:unlink_from_conversations!)
.includes(mentions: :account)
.find_each(&:unlink_from_conversations!)
if Chewy.enabled?
remove_from_index(statuses.ids, 'chewy:queue:StatusesIndex')
remove_from_index(statuses.ids, 'chewy:queue:PublicStatusesIndex')
@@ -33,8 +33,8 @@ class Vacuum::StatusesVacuum
def statuses_scope
Status.unscoped.kept
.joins(:account).merge(Account.remote)
.where(statuses: { id: ...retention_period_as_id })
.joins(:account).merge(Account.remote)
.where(statuses: { id: ...retention_period_as_id })
end
def retention_period_as_id