Skip to content
GitLab
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
14b086ee
Commit
14b086ee
authored
Jan 15, 2018
by
eal
Browse files
Add a default profile picture and banner.
This removes the placehold.it dependency.
parent
d49109ca
Pipeline
#486
passed with stage
in 2 minutes and 23 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user.ex
View file @
14b086ee
...
...
@@ -29,14 +29,14 @@ defmodule Pleroma.User do
def
avatar_url
(
user
)
do
case
user
.
avatar
do
%{
"url"
=>
[%{
"href"
=>
href
}
|
_
]}
->
href
_
->
"
https://placehold.it/48x48
"
_
->
"
#{
Web
.
base_url
()
}
/static/avi.png
"
end
end
def
banner_url
(
user
)
do
case
user
.
info
[
"banner"
]
do
%{
"url"
=>
[%{
"href"
=>
href
}
|
_
]}
->
href
_
->
nil
_
->
"
#{
Web
.
base_url
()
}
/static/banner.png"
end
end
...
...
lib/pleroma/web/mastodon_api/views/account_view.ex
View file @
14b086ee
...
...
@@ -5,19 +5,15 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
alias
Pleroma
.
Web
.
CommonAPI
.
Utils
alias
Pleroma
.
Web
.
MediaProxy
defp
image_url
(%{
"url"
=>
[
%{
"href"
=>
href
}
|
_
]}),
do
:
href
defp
image_url
(
_
),
do
:
nil
def
render
(
"accounts.json"
,
%{
users:
users
}
=
opts
)
do
render_many
(
users
,
AccountView
,
"account.json"
,
opts
)
end
def
render
(
"account.json"
,
%{
user:
user
})
do
image
=
User
.
avatar_url
(
user
)
|>
MediaProxy
.
url
()
header
=
User
.
banner_url
(
user
)
|>
MediaProxy
.
url
()
user_info
=
User
.
user_info
(
user
)
header
=
(
image_url
(
user
.
info
[
"banner"
])
||
"https://placehold.it/700x335"
)
|>
MediaProxy
.
url
()
%{
id:
to_string
(
user
.
id
),
username:
hd
(
String
.
split
(
user
.
nickname
,
"@"
)),
...
...
lib/pleroma/web/twitter_api/views/user_view.ex
View file @
14b086ee
...
...
@@ -45,7 +45,7 @@ def render("user.json", %{user: user = %User{}} = assigns) do
"screen_name"
=>
user
.
nickname
,
"statuses_count"
=>
user_info
[
:note_count
],
"statusnet_profile_url"
=>
user
.
ap_id
,
"cover_photo"
=>
image_url
(
user
.
info
[
"banner"
]
)
|>
MediaProxy
.
url
(),
"cover_photo"
=>
User
.
banner_url
(
user
)
|>
MediaProxy
.
url
(),
"background_image"
=>
image_url
(
user
.
info
[
"background"
])
|>
MediaProxy
.
url
(),
}
...
...
priv/static/static/avi.png
0 → 100644
View file @
14b086ee
3.52 KB
priv/static/static/banner.png
0 → 100644
View file @
14b086ee
1.26 KB
test/web/mastodon_api/account_view_test.exs
View file @
14b086ee
...
...
@@ -19,10 +19,10 @@ test "Represent a user account" do
statuses_count:
5
,
note:
user
.
bio
,
url:
user
.
ap_id
,
avatar:
"http
s
://
placehold.it/48x48
"
,
avatar_static:
"http
s
://
placehold.it/48x48
"
,
header:
"http
s
://
placehold.it/700x335
"
,
header_static:
"http
s
://
placehold.it/700x335
"
,
avatar:
"http://
localhost:4001/static/avi.png
"
,
avatar_static:
"http://
localhost:4001/static/avi.png
"
,
header:
"http://
localhost:4001/static/banner.png
"
,
header_static:
"http://
localhost:4001/static/banner.png
"
,
source:
%{
note:
""
,
privacy:
"public"
,
...
...
test/web/ostatus/user_representer_test.exs
View file @
14b086ee
...
...
@@ -21,6 +21,7 @@ test "returns a user with id, uri, name and link" do
<summary>#{user.bio}</summary>
<name>#{user.nickname}</name>
<link rel="avatar" href="#{User.avatar_url(user)}" />
<link rel="header" href="#{User.banner_url(user)}" />
"""
assert
clean
(
res
)
==
clean
(
expected
)
...
...
test/web/twitter_api/views/user_view_test.exs
View file @
14b086ee
...
...
@@ -33,7 +33,8 @@ test "A user" do
{
:ok
,
user
}
=
User
.
update_follower_count
(
user
)
Cachex
.
set
(
:user_cache
,
"user_info:
#{
user
.
id
}
"
,
User
.
user_info
(
Repo
.
get!
(
User
,
user
.
id
)))
image
=
"https://placehold.it/48x48"
image
=
"http://localhost:4001/static/avi.png"
banner
=
"http://localhost:4001/static/banner.png"
represented
=
%{
"id"
=>
user
.
id
,
...
...
@@ -54,7 +55,7 @@ test "A user" do
"statusnet_blocking"
=>
false
,
"rights"
=>
%{},
"statusnet_profile_url"
=>
user
.
ap_id
,
"cover_photo"
=>
nil
,
"cover_photo"
=>
banner
,
"background_image"
=>
nil
}
...
...
@@ -64,7 +65,9 @@ test "A user" do
test
"A user for a given other follower"
,
%{
user:
user
}
do
{
:ok
,
follower
}
=
UserBuilder
.
insert
(%{
following:
[
User
.
ap_followers
(
user
)]})
{
:ok
,
user
}
=
User
.
update_follower_count
(
user
)
image
=
"https://placehold.it/48x48"
image
=
"http://localhost:4001/static/avi.png"
banner
=
"http://localhost:4001/static/banner.png"
represented
=
%{
"id"
=>
user
.
id
,
"name"
=>
user
.
name
,
...
...
@@ -84,7 +87,7 @@ test "A user for a given other follower", %{user: user} do
"statusnet_blocking"
=>
false
,
"rights"
=>
%{},
"statusnet_profile_url"
=>
user
.
ap_id
,
"cover_photo"
=>
nil
,
"cover_photo"
=>
banner
,
"background_image"
=>
nil
}
...
...
@@ -95,7 +98,9 @@ test "A user that follows you", %{user: user} do
follower
=
insert
(
:user
)
{
:ok
,
follower
}
=
User
.
follow
(
follower
,
user
)
{
:ok
,
user
}
=
User
.
update_follower_count
(
user
)
image
=
"https://placehold.it/48x48"
image
=
"http://localhost:4001/static/avi.png"
banner
=
"http://localhost:4001/static/banner.png"
represented
=
%{
"id"
=>
follower
.
id
,
"name"
=>
follower
.
name
,
...
...
@@ -115,7 +120,7 @@ test "A user that follows you", %{user: user} do
"statusnet_blocking"
=>
false
,
"rights"
=>
%{},
"statusnet_profile_url"
=>
follower
.
ap_id
,
"cover_photo"
=>
nil
,
"cover_photo"
=>
banner
,
"background_image"
=>
nil
}
...
...
@@ -126,7 +131,9 @@ test "A blocked user for the blocker", %{user: user} do
user
=
insert
(
:user
)
blocker
=
insert
(
:user
)
User
.
block
(
blocker
,
user
)
image
=
"https://placehold.it/48x48"
image
=
"http://localhost:4001/static/avi.png"
banner
=
"http://localhost:4001/static/banner.png"
represented
=
%{
"id"
=>
user
.
id
,
"name"
=>
user
.
name
,
...
...
@@ -146,7 +153,7 @@ test "A blocked user for the blocker", %{user: user} do
"statusnet_blocking"
=>
true
,
"rights"
=>
%{},
"statusnet_profile_url"
=>
user
.
ap_id
,
"cover_photo"
=>
nil
,
"cover_photo"
=>
banner
,
"background_image"
=>
nil
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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