From: unarist <m.unarist@gmail.com>
Date: Sun, 17 Sep 2017 11:51:34 +0000 (+0900)
Subject: Raise an error on getting activity uri for remote status (#4984)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3f07f1b2b18affd0c48f3673d124cfbea6b9e380;p=mastodon.git

Raise an error on getting activity uri for remote status (#4984)

We had returned `nil` for that case, but this raises an error instead, as a wrong usage of the method.
This method is currently only used in ActivitySerializer.
---

diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 929e87852..1b4e271db 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -37,7 +37,7 @@ class ActivityPub::TagManager
   end
 
   def activity_uri_for(target)
-    return nil unless %i(note comment activity).include?(target.object_type) && target.local?
+    raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
     activity_account_status_url(target.account, target)
   end