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

Merge branch 'fix/avatar-cover-update-issue' into 'develop' 

avatar/header serializer issue for accounts with imported data from legacy fixed

See merge request gab/social/gab-social!17
This commit is contained in:
Rob Colbert 2019-07-22 21:14:29 +00:00
parent 4abdf8404e 0015e2c585
commit 38c08355e6
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/rest/account_serializer.rb
View File

@ -33,7 +33,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
end
def avatar
if object.avatar_remote_url and object.avatar_remote_url.start_with? "gab://avatar/"
if object.avatar_file_name.nil? and object.avatar_remote_url and object.avatar_remote_url.start_with? "gab://avatar/"
return object.avatar_remote_url.sub("gab://avatar/", "https://gab.com/media/user/")
end
@ -41,7 +41,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
end
def avatar_static
if object.avatar_remote_url and object.avatar_remote_url.start_with? "gab://avatar/"
if object.avatar_file_name.nil? and object.avatar_remote_url and object.avatar_remote_url.start_with? "gab://avatar/"
return object.avatar_remote_url.sub("gab://avatar/", "https://gab.com/media/user/")
end
@ -49,7 +49,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
end
def header
if object.header_remote_url and object.header_remote_url.start_with? "gab://header/"
if object.header_file_name.nil? and object.header_remote_url and object.header_remote_url.start_with? "gab://header/"
return object.header_remote_url.sub("gab://header/", "https://gab.com/media/user/")
end
@ -57,7 +57,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
end
def header_static
if object.header_remote_url and object.header_remote_url.start_with? "gab://header/"
if object.header_file_name.nil? and object.header_remote_url and object.header_remote_url.start_with? "gab://header/"
return object.header_remote_url.sub("gab://header/", "https://gab.com/media/user/")
end