From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Wed, 3 Jun 2020 06:33:30 +0000 (+0900)
Subject: Fix activity not being signed (#13948)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=643065799bbb0a842a321a2a0434df347146b3e6;p=mastodon.git

Fix activity not being signed (#13948)
---

diff --git a/app/services/concerns/payloadable.rb b/app/services/concerns/payloadable.rb
index 7f9f21c4b..3e45570c3 100644
--- a/app/services/concerns/payloadable.rb
+++ b/app/services/concerns/payloadable.rb
@@ -5,8 +5,9 @@ module Payloadable
     signer    = options.delete(:signer)
     sign_with = options.delete(:sign_with)
     payload   = ActiveModelSerializers::SerializableResource.new(record, options.merge(serializer: serializer, adapter: ActivityPub::Adapter)).as_json
+    object    = record.respond_to?(:virtual_object) ? record.virtual_object : record
 
-    if (record.respond_to?(:sign?) && record.sign?) && signer && signing_enabled?
+    if (object.respond_to?(:sign?) && object.sign?) && signer && signing_enabled?
       ActivityPub::LinkedDataSignature.new(payload).sign!(signer, sign_with: sign_with)
     else
       payload