Merge pull request #137 from Y-zu-don-maintenance-org/4.1.18

4.1.18
2024-07-05 18:59:51 +09:00
parent fbef81ab51 ff90ebffaa
commit c92b5559a9
83 changed files with 1344 additions and 293 deletions
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -111,7 +111,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
  def find_existing_status
    status   = status_from_uri(object_uri)
    status ||= Status.find_by(uri: @object['atomUri']) if @object['atomUri'].present?
-    status
+    status if status&.account_id == @account.id
  end

  def process_status_params