Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
6f090f98
Commit
6f090f98
authored
Mar 25, 2019
by
feld
Browse files
Attempt to fix incorrect federation of default instance avatars
parent
15aa94f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user.ex
View file @
6f090f98
...
...
@@ -90,6 +90,14 @@ def avatar_url(user) do
end
end
# Do not return instance default avatar for federation
def
avatar_url_ap
(
user
)
do
case
user
.
avatar
do
%{
"url"
=>
[%{
"href"
=>
href
}
|
_
]}
->
href
_
->
nil
end
end
def
banner_url
(
user
)
do
case
user
.
info
.
banner
do
%{
"url"
=>
[%{
"href"
=>
href
}
|
_
]}
->
href
...
...
lib/pleroma/web/activity_pub/utils.ex
View file @
6f090f98
...
...
@@ -230,6 +230,21 @@ def update_object_in_activities(%{data: %{"id" => id}} = object) do
end
)
end
# Only federate user icon if not nil
# Prevents federating instance default avatars
def
maybe_make_icon
(
user
)
do
if
User
.
avatar_url_ap
(
user
)
do
%{
"icon"
=>
%{
"type"
=>
"Image"
,
"url"
=>
User
.
avatar_url_ap
(
user
)
}
}
else
[]
end
end
#### Like-related helpers
@doc
"""
...
...
lib/pleroma/web/activity_pub/views/user_view.ex
View file @
6f090f98
...
...
@@ -87,16 +87,13 @@ def render("user.json", %{user: user}) do
"publicKeyPem"
=>
public_key
},
"endpoints"
=>
endpoints
,
"icon"
=>
%{
"type"
=>
"Image"
,
"url"
=>
User
.
avatar_url
(
user
)
},
"image"
=>
%{
"type"
=>
"Image"
,
"url"
=>
User
.
banner_url
(
user
)
},
"tag"
=>
user
.
info
.
source_data
[
"tag"
]
||
[]
}
|>
Map
.
merge
(
Utils
.
maybe_make_icon
(
user
))
|>
Map
.
merge
(
Utils
.
make_json_ld_header
())
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment