Browse Source

Fix nil error when removing status caused by race condition (#16099)

closed-social-v3
Eugen Rochko 7 months ago
committed by GitHub
parent
commit
f4b7c6b619
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
  1. +1
    -1
      app/lib/status_reach_finder.rb
  2. +4
    -0
      app/models/status.rb
  3. +1
    -1
      app/workers/activitypub/distribution_worker.rb

+ 1
- 1
app/lib/status_reach_finder.rb View File

@ -62,7 +62,7 @@ class StatusReachFinder
end
def followers_inboxes
if @status.reply? && @status.thread.account.local? && @status.distributable?
if @status.in_reply_to_local_account? && @status.distributable?
@status.account.followers.or(@status.thread.account.followers).inboxes
else
@status.account.followers.inboxes

+ 4
- 0
app/models/status.rb View File

@ -161,6 +161,10 @@ class Status < ApplicationRecord
attributes['local'] || uri.nil?
end
def in_reply_to_local_account?
reply? && thread&.account&.local?
end
def reblog?
!reblog_of_id.nil?
end

+ 1
- 1
app/workers/activitypub/distribution_worker.rb View File

@ -35,7 +35,7 @@ class ActivityPub::DistributionWorker
# Deliver the status to all followers.
# If the status is a reply to another local status, also forward it to that
# status' authors' followers.
@inboxes ||= if @status.reply? && @status.thread.account.local? && @status.distributable?
@inboxes ||= if @status.in_reply_to_local_account? && @status.distributable?
@account.followers.or(@status.thread.account.followers).inboxes
else
@account.followers.inboxes

Loading…
Cancel
Save