From 39446f1357421d9048bac67db800ba93a934fbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?KMY=EF=BC=88=E9=9B=AA=E3=81=82=E3=81=99=E3=81=8B=EF=BC=89?=
 <tt@kmycode.net>
Date: Thu, 30 Nov 2023 17:39:04 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20=E6=97=A2=E7=9F=A5=E3=81=AE=E6=8A=95?=
 =?UTF-8?q?=E7=A8=BF=E3=81=AE=E5=8F=82=E7=85=A7=E3=83=BB=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E3=81=8C=E8=AA=8D=E8=AD=98=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=20(#320)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/lib/activitypub/activity/update.rb        |  2 ++
 .../process_references_service_spec.rb        | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 1e98eecd58..8658684b03 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -33,6 +33,8 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
     ActivityPub::ProcessStatusUpdateService.new.call(@status, @json, @object, request_id: @options[:request_id])
 
     forward_for_conversation
+
+    @status
   end
 
   def forward_for_conversation
diff --git a/spec/services/process_references_service_spec.rb b/spec/services/process_references_service_spec.rb
index 37818b2d45..db4abf7084 100644
--- a/spec/services/process_references_service_spec.rb
+++ b/spec/services/process_references_service_spec.rb
@@ -241,6 +241,37 @@ RSpec.describe ProcessReferencesService, type: :service do
         end
       end
     end
+
+    context 'when already fetched remote post' do
+      let(:account) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
+      let!(:remote_status) { Fabricate(:status, account: account, uri: 'https://example.com/test_post', url: 'https://example.com/test_post', text: 'Lorem ipsum') }
+      let(:object_json) do
+        {
+          id: 'https://example.com/test_post',
+          to: ActivityPub::TagManager::COLLECTIONS[:public],
+          '@context': ActivityPub::TagManager::CONTEXT,
+          type: 'Note',
+          actor: account.uri,
+          attributedTo: account.uri,
+          content: 'Lorem ipsum',
+        }
+      end
+      let(:text) { 'BT:https://example.com/test_post' }
+
+      before do
+        stub_request(:get, 'https://example.com/test_post').to_return(status: 200, body: Oj.dump(object_json), headers: { 'Content-Type' => 'application/activity+json' })
+      end
+
+      it 'reference it' do
+        expect(subject.size).to eq 1
+        expect(subject[0][1]).to eq 'BT'
+
+        status = Status.find_by(id: subject[0][0])
+        expect(status).to_not be_nil
+        expect(status.id).to eq remote_status.id
+        expect(status.url).to eq 'https://example.com/test_post'
+      end
+    end
   end
 
   describe 'editing new status' do