From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Tue, 13 Oct 2020 20:41:00 +0000 (+0900)
Subject: Fix a bear check when the activity object is nil (#14981)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b4c4af18dcec04f0c8ad89b45ce3cad20ddfdc12;p=mastodon.git

Fix a bear check when the activity object is nil (#14981)
---

diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 224451f41..2b5d3ffc2 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -74,7 +74,7 @@ class ActivityPub::Activity
     @object_uri ||= begin
       str = value_or_id(@object)
 
-      if str.start_with?('bear:')
+      if str&.start_with?('bear:')
         Addressable::URI.parse(str).query_values['u']
       else
         str