diff options
| -rw-r--r-- | lib/pleroma/user.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 | ||||
| -rw-r--r-- | priv/static/images/avi.png (renamed from priv/static/static/avi.png) | bin | 3604 -> 3604 bytes | |||
| -rw-r--r-- | priv/static/images/banner.png (renamed from priv/static/static/banner.png) | bin | 1293 -> 1293 bytes | |||
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 8 | ||||
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 16 |
6 files changed, 15 insertions, 15 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 6ba2b165c..81cec8265 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -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 diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 725d2ee64..ec88df692 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -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. diff --git a/priv/static/static/avi.png b/priv/static/images/avi.png Binary files differindex 336fd15ef..336fd15ef 100644 --- a/priv/static/static/avi.png +++ b/priv/static/images/avi.png diff --git a/priv/static/static/banner.png b/priv/static/images/banner.png Binary files differindex 467c075d6..467c075d6 100644 --- a/priv/static/static/banner.png +++ b/priv/static/images/banner.png diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index 061fc2693..5eefa61e1 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -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", diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index e68230a86..d5d2f0adc 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -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, |
