diff options
| -rw-r--r-- | lib/pleroma/config.ex | 10 | ||||
| -rw-r--r-- | lib/pleroma/user.ex | 25 | ||||
| -rw-r--r-- | lib/pleroma/user/media.ex | 26 | ||||
| -rw-r--r-- | lib/pleroma/web/views/email_view.ex | 4 | ||||
| -rw-r--r-- | test/pleroma/config_test.exs | 27 |
5 files changed, 69 insertions, 23 deletions
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex index 54e332595..6baa4319d 100644 --- a/lib/pleroma/config.ex +++ b/lib/pleroma/config.ex @@ -103,4 +103,14 @@ defmodule Pleroma.Config do def feature_enabled?(feature_name) do get([:features, feature_name]) not in [nil, false, :disabled, :auto] end + + def uri do + key = Module.concat(["Pleroma.Web.Endpoint"]) + url = get([key, :url]) |> Map.new() + struct(URI, url) + end + + def url, do: URI.to_string(uri()) + + def host, do: uri().host end diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 9365fae2b..992411306 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -33,7 +33,6 @@ defmodule Pleroma.User do alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI.Utils, as: CommonUtils - alias Pleroma.Web.Endpoint alias Pleroma.Web.OAuth alias Pleroma.Web.RelMe alias Pleroma.Workers.BackgroundWorker @@ -353,28 +352,12 @@ defmodule Pleroma.User do def invisible?(%User{invisible: true}), do: true def invisible?(_), do: false - def avatar_url(user, options \\ []) do - case user.avatar do - %{"url" => [%{"href" => href} | _]} -> - href - - _ -> - unless options[:no_default] do - Config.get([:assets, :default_user_avatar], "#{Endpoint.url()}/images/avi.png") - end - end - end - - def banner_url(user, options \\ []) do - case user.banner do - %{"url" => [%{"href" => href} | _]} -> href - _ -> !options[:no_default] && "#{Endpoint.url()}/images/banner.png" - end - end + defdelegate avatar_url(user, options \\ []), to: User.Media + defdelegate banner_url(user, options \\ []), to: User.Media # Should probably be renamed or removed @spec ap_id(User.t()) :: String.t() - def ap_id(%User{nickname: nickname}), do: "#{Endpoint.url()}/users/#{nickname}" + def ap_id(%User{nickname: nickname}), do: "#{Config.url()}/users/#{nickname}" @spec ap_followers(User.t()) :: String.t() def ap_followers(%User{follower_address: fa}) when is_binary(fa), do: fa @@ -1177,7 +1160,7 @@ defmodule Pleroma.User do @spec get_by_nickname(String.t()) :: User.t() | nil def get_by_nickname(nickname) do Repo.get_by(User, nickname: nickname) || - if Regex.match?(~r(@#{Pleroma.Web.Endpoint.host()})i, nickname) do + if Regex.match?(~r(@#{Config.host()})i, nickname) do Repo.get_by(User, nickname: local_nickname(nickname)) end end diff --git a/lib/pleroma/user/media.ex b/lib/pleroma/user/media.ex new file mode 100644 index 000000000..c81660bc6 --- /dev/null +++ b/lib/pleroma/user/media.ex @@ -0,0 +1,26 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.User.Media do + alias Pleroma.Config + + def avatar_url(user, options \\ []) do + case user.avatar do + %{"url" => [%{"href" => href} | _]} -> + href + + _ -> + unless options[:no_default] do + Config.get([:assets, :default_user_avatar], "#{Config.url()}/images/avi.png") + end + end + end + + def banner_url(user, options \\ []) do + case user.banner do + %{"url" => [%{"href" => href} | _]} -> href + _ -> !options[:no_default] && "#{Config.url()}/images/banner.png" + end + end +end diff --git a/lib/pleroma/web/views/email_view.ex b/lib/pleroma/web/views/email_view.ex index f7659b994..8f9f8efcc 100644 --- a/lib/pleroma/web/views/email_view.ex +++ b/lib/pleroma/web/views/email_view.ex @@ -8,7 +8,7 @@ defmodule Pleroma.Web.EmailView do import Phoenix.HTML.Link def avatar_url(user) do - Pleroma.User.avatar_url(user) + Pleroma.User.Media.avatar_url(user) end def format_date(date) when is_binary(date) do @@ -18,6 +18,6 @@ defmodule Pleroma.Web.EmailView do end def admin_user_url(%{id: id}) do - Pleroma.Web.Endpoint.url() <> "/pleroma/admin/#/users/" <> id + Pleroma.Config.url() <> "/pleroma/admin/#/users/" <> id end end diff --git a/test/pleroma/config_test.exs b/test/pleroma/config_test.exs index 3158a2ec8..0ae4db82d 100644 --- a/test/pleroma/config_test.exs +++ b/test/pleroma/config_test.exs @@ -136,4 +136,31 @@ defmodule Pleroma.ConfigTest do Pleroma.Config.delete([:lorem]) Pleroma.Config.delete([:ipsum]) end + + describe "URI functions" do + setup do + url = [host: "lain.com", scheme: "https", port: 443] + clear_config([Pleroma.Web.Endpoint, :url], url) + end + + test "uri/0" do + expected = %URI{ + scheme: "https", + host: "lain.com", + port: 443 + } + + assert Pleroma.Config.uri() == expected + end + + test "url/0" do + expected = "https://lain.com" + assert Pleroma.Config.url() == expected + end + + test "host/0" do + expected = "lain.com" + assert Pleroma.Config.host() == expected + end + end end |