Merge pull request #462 from kmycode/upstream-20240115

Upstream 20240115
This commit is contained in:
KMY(雪あすか) 2024-01-15 19:58:03 +09:00 committed by GitHub
commit 90bd2a0f00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
341 changed files with 1113 additions and 558 deletions

View file

@ -44,11 +44,7 @@ class ReblogService < BaseService
def create_notification(reblog)
reblogged_status = reblog.reblog
if reblogged_status.account.local?
LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, 'reblog')
elsif reblogged_status.account.activitypub? && !reblogged_status.account.following?(reblog.account)
ActivityPub::DeliveryWorker.perform_async(build_json(reblog), reblog.account_id, reblogged_status.account.inbox_url)
end
LocalNotificationWorker.perform_async(reblogged_status.account_id, reblog.id, reblog.class.name, 'reblog') if reblogged_status.account.local?
end
def increment_statistics