mirror of
https://git.pleroma.social/sjw/pleroma.git
synced 2024-12-25 15:15:26 +01:00
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:
commit
61c16193de
@ -29,14 +29,14 @@ defmodule Pleroma.User do
|
||||
def avatar_url(user) do
|
||||
case user.avatar do
|
||||
%{"url" => [%{"href" => href} | _]} -> href
|
||||
_ -> "#{Web.base_url()}/static/avi.png"
|
||||
_ -> "#{Web.base_url()}/images/avi.png"
|
||||
end
|
||||
end
|
||||
|
||||
def banner_url(user) do
|
||||
case user.info["banner"] do
|
||||
%{"url" => [%{"href" => href} | _]} -> href
|
||||
_ -> "#{Web.base_url()}/static/banner.png"
|
||||
_ -> "#{Web.base_url()}/images/banner.png"
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do
|
||||
at: "/media", from: "uploads", gzip: false
|
||||
plug Plug.Static,
|
||||
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_reloader configuration of your endpoint.
|
||||
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 3.5 KiB |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
@ -19,10 +19,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
|
||||
statuses_count: 5,
|
||||
note: user.bio,
|
||||
url: user.ap_id,
|
||||
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",
|
||||
avatar: "http://localhost:4001/images/avi.png",
|
||||
avatar_static: "http://localhost:4001/images/avi.png",
|
||||
header: "http://localhost:4001/images/banner.png",
|
||||
header_static: "http://localhost:4001/images/banner.png",
|
||||
source: %{
|
||||
note: "",
|
||||
privacy: "public",
|
||||
|
@ -33,8 +33,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest 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 = "http://localhost:4001/static/avi.png"
|
||||
banner = "http://localhost:4001/static/banner.png"
|
||||
image = "http://localhost:4001/images/avi.png"
|
||||
banner = "http://localhost:4001/images/banner.png"
|
||||
|
||||
represented = %{
|
||||
"id" => user.id,
|
||||
@ -66,8 +66,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest 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 = "http://localhost:4001/static/avi.png"
|
||||
banner = "http://localhost:4001/static/banner.png"
|
||||
image = "http://localhost:4001/images/avi.png"
|
||||
banner = "http://localhost:4001/images/banner.png"
|
||||
|
||||
represented = %{
|
||||
"id" => user.id,
|
||||
@ -100,8 +100,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
follower = insert(:user)
|
||||
{:ok, follower} = User.follow(follower, user)
|
||||
{:ok, user} = User.update_follower_count(user)
|
||||
image = "http://localhost:4001/static/avi.png"
|
||||
banner = "http://localhost:4001/static/banner.png"
|
||||
image = "http://localhost:4001/images/avi.png"
|
||||
banner = "http://localhost:4001/images/banner.png"
|
||||
|
||||
represented = %{
|
||||
"id" => follower.id,
|
||||
@ -134,8 +134,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do
|
||||
user = insert(:user)
|
||||
blocker = insert(:user)
|
||||
User.block(blocker, user)
|
||||
image = "http://localhost:4001/static/avi.png"
|
||||
banner = "http://localhost:4001/static/banner.png"
|
||||
image = "http://localhost:4001/images/avi.png"
|
||||
banner = "http://localhost:4001/images/banner.png"
|
||||
|
||||
represented = %{
|
||||
"id" => user.id,
|
||||
|
Loading…
Reference in New Issue
Block a user