random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' into 'develop' 

Use uploaded avatar over legacy avatar when possible

See merge request gab/social/gab-social!45
This commit is contained in:
Alex Gleason 2020-03-05 04:59:08 +00:00
parent 3edd573c0c e039a535d5
commit fadc08fbad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/serializers/activitypub/actor_serializer.rb
View File

@ -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