Commit fadc08fb authored by Alex Gleason's avatar Alex Gleason

Merge branch 'bugfixes' into 'develop'

Use uploaded avatar over legacy avatar when possible

See merge request gab/social/gab-social!45
parents 3edd573c e039a535
......@@ -92,13 +92,13 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end
def icon
return object.avatar if object.avatar?
return object.avatar_remote_url if is_gab_avatar?
object.avatar
end
def image
return object.header if object.header?
return object.header_remote_url if is_gab_header?
object.header
end
def public_key
......@@ -118,11 +118,11 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
end
def is_gab_avatar?
object.avatar_remote_url&.start_with?('gab://')
object.avatar_remote_url&.start_with?('gab://') or false
end
def is_gab_header?
object.header_remote_url&.start_with?('gab://')
object.header_remote_url&.start_with?('gab://') or false
end
def manually_approves_followers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment