]> cat aescling's git repositories - mastodon.git/commitdiff
Do not check for file existence when serializing ActivityPub actor (#8386)
authorThibG <thib@sitedethib.com>
Thu, 23 Aug 2018 14:39:22 +0000 (16:39 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Thu, 23 Aug 2018 14:39:22 +0000 (16:39 +0200)
When serializing an ActivityPub actor, Mastodon checks for the existence
of the avatar/header files. This is not necessary, only check if avatar/header
is set.

https://github.com/thoughtbot/paperclip/blob/fd8bf49d3895de2904b43f95d11af0736fbd0f5b/README.md#checking-a-file-exists

app/serializers/activitypub/actor_serializer.rb

index 41c9aa44e81da49eeafb85123fb6c46b24cd7dc6..5054bd68360f243182a74c7e22e46a6b3748f2d1 100644 (file)
@@ -93,11 +93,11 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer
   end
 
   def avatar_exists?
-    object.avatar.exists?
+    object.avatar?
   end
 
   def header_exists?
-    object.header.exists?
+    object.header?
   end
 
   def manually_approves_followers