]> cat aescling's git repositories - mastodon.git/commitdiff
Fix nil error in focal_point? (#6537)
authorEugen Rochko <eugen@zeonfederated.com>
Thu, 22 Feb 2018 16:42:33 +0000 (17:42 +0100)
committerGitHub <noreply@github.com>
Thu, 22 Feb 2018 16:42:33 +0000 (17:42 +0100)
app/serializers/activitypub/image_serializer.rb

index f8484c87f8647981c9a35f94fd452e6b724898ab..3c08f77e8313985ff63d42d13dd0870efc2c4998 100644 (file)
@@ -19,7 +19,7 @@ class ActivityPub::ImageSerializer < ActiveModel::Serializer
   end
 
   def focal_point?
-    object.respond_to?(:meta) && object.meta['focus'].is_a?(Hash)
+    object.respond_to?(:meta) && object.meta.is_a?(Hash) && object.meta['focus'].is_a?(Hash)
   end
 
   def focal_point