Merge branch 'move-backend-images' into 'develop'

Move avi.png & banner.png from /priv/static/static to /priv/static/images

See merge request pleroma/pleroma!60
This commit is contained in:
lambda 2018-02-03 13:05:20 +00:00
commit 61c16193de
6 changed files with 15 additions and 15 deletions

View file

@ -29,14 +29,14 @@ defmodule Pleroma.User do
def avatar_url(user) do def avatar_url(user) do
case user.avatar do case user.avatar do
%{"url" => [%{"href" => href} | _]} -> href %{"url" => [%{"href" => href} | _]} -> href
_ -> "#{Web.base_url()}/static/avi.png" _ -> "#{Web.base_url()}/images/avi.png"
end end
end end
def banner_url(user) do def banner_url(user) do
case user.info["banner"] do case user.info["banner"] do
%{"url" => [%{"href" => href} | _]} -> href %{"url" => [%{"href" => href} | _]} -> href
_ -> "#{Web.base_url()}/static/banner.png" _ -> "#{Web.base_url()}/images/banner.png"
end end
end end

View file

@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do
at: "/media", from: "uploads", gzip: false at: "/media", from: "uploads", gzip: false
plug Plug.Static, plug Plug.Static,
at: "/", from: :pleroma, at: "/", from: :pleroma,
only: ~w(index.html static finmoji emoji packs sounds instance sw.js) only: ~w(index.html static finmoji emoji packs sounds images instance sw.js)
# Code reloading can be explicitly enabled under the # Code reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint. # :code_reloader configuration of your endpoint.

View file

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

View file

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View file

@ -19,10 +19,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
statuses_count: 5, statuses_count: 5,
note: user.bio, note: user.bio,
url: user.ap_id, url: user.ap_id,
avatar: "http://localhost:4001/static/avi.png", avatar: "http://localhost:4001/images/avi.png",
avatar_static: "http://localhost:4001/static/avi.png", avatar_static: "http://localhost:4001/images/avi.png",
header: "http://localhost:4001/static/banner.png", header: "http://localhost:4001/images/banner.png",
header_static: "http://localhost:4001/static/banner.png", header_static: "http://localhost:4001/images/banner.png",
source: %{ source: %{
note: "", note: "",
privacy: "public", privacy: "public",

View file

@ -33,8 +33,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
{:ok, user} = User.update_follower_count(user) {:ok, user} = User.update_follower_count(user)
Cachex.set(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id))) Cachex.set(:user_cache, "user_info:#{user.id}", User.user_info(Repo.get!(User, user.id)))
image = "http://localhost:4001/static/avi.png" image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/static/banner.png" banner = "http://localhost:4001/images/banner.png"
represented = %{ represented = %{
"id" => user.id, "id" => user.id,
@ -66,8 +66,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
test "A user for a given other follower", %{user: user} do test "A user for a given other follower", %{user: user} do
{:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]}) {:ok, follower} = UserBuilder.insert(%{following: [User.ap_followers(user)]})
{:ok, user} = User.update_follower_count(user) {:ok, user} = User.update_follower_count(user)
image = "http://localhost:4001/static/avi.png" image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/static/banner.png" banner = "http://localhost:4001/images/banner.png"
represented = %{ represented = %{
"id" => user.id, "id" => user.id,
@ -100,8 +100,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
follower = insert(:user) follower = insert(:user)
{:ok, follower} = User.follow(follower, user) {:ok, follower} = User.follow(follower, user)
{:ok, user} = User.update_follower_count(user) {:ok, user} = User.update_follower_count(user)
image = "http://localhost:4001/static/avi.png" image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/static/banner.png" banner = "http://localhost:4001/images/banner.png"
represented = %{ represented = %{
"id" => follower.id, "id" => follower.id,
@ -134,8 +134,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
user = insert(:user) user = insert(:user)
blocker = insert(:user) blocker = insert(:user)
User.block(blocker, user) User.block(blocker, user)
image = "http://localhost:4001/static/avi.png" image = "http://localhost:4001/images/avi.png"
banner = "http://localhost:4001/static/banner.png" banner = "http://localhost:4001/images/banner.png"
represented = %{ represented = %{
"id" => user.id, "id" => user.id,