diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-09 10:53:51 -0500 | 
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-09 10:53:51 -0500 | 
| commit | d23804f191eb9e14cfb087863320ae90653c9544 (patch) | |
| tree | e2e18ee90e3a373571a1038befdd3e37a0942ce7 /lib | |
| parent | 6b14f0c514d19fe7c9717dd9d3ada29e442ba706 (diff) | |
| download | pleroma-d23804f191eb9e14cfb087863320ae90653c9544.tar.gz pleroma-d23804f191eb9e14cfb087863320ae90653c9544.zip  | |
Use the Pleroma.Config alias
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mix/tasks/pleroma/instance.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/application.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/emails/admin_email.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/emoji/loader.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/plugs/http_security_plug.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/user.ex | 52 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/object_age_policy.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/reject_non_public.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 6 | ||||
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 2 | 
12 files changed, 41 insertions, 41 deletions
diff --git a/lib/mix/tasks/pleroma/instance.ex b/lib/mix/tasks/pleroma/instance.ex index 86409738a..91440b453 100644 --- a/lib/mix/tasks/pleroma/instance.ex +++ b/lib/mix/tasks/pleroma/instance.ex @@ -145,7 +145,7 @@ defmodule Mix.Tasks.Pleroma.Instance do            options,            :uploads_dir,            "What directory should media uploads go in (when using the local uploader)?", -          Pleroma.Config.get([Pleroma.Uploaders.Local, :uploads]) +          Config.get([Pleroma.Uploaders.Local, :uploads])          )          |> Path.expand() @@ -154,7 +154,7 @@ defmodule Mix.Tasks.Pleroma.Instance do            options,            :static_dir,            "What directory should custom public files be read from (custom emojis, frontend bundle overrides, robots.txt, etc.)?", -          Pleroma.Config.get([:instance, :static_dir]) +          Config.get([:instance, :static_dir])          )          |> Path.expand() diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index 9615af122..32773d3c9 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -35,7 +35,7 @@ defmodule Pleroma.Application do    # See http://elixir-lang.org/docs/stable/elixir/Application.html    # for more information on OTP Applications    def start(_type, _args) do -    Pleroma.Config.Holder.save_default() +    Config.Holder.save_default()      Pleroma.HTML.compile_scrubbers()      Config.DeprecationWarnings.warn()      Pleroma.Plugs.HTTPSecurityPlug.warn_if_disabled() diff --git a/lib/pleroma/emails/admin_email.ex b/lib/pleroma/emails/admin_email.ex index 55f61024e..c67ba63ad 100644 --- a/lib/pleroma/emails/admin_email.ex +++ b/lib/pleroma/emails/admin_email.ex @@ -10,7 +10,7 @@ defmodule Pleroma.Emails.AdminEmail do    alias Pleroma.Config    alias Pleroma.Web.Router.Helpers -  defp instance_config, do: Pleroma.Config.get(:instance) +  defp instance_config, do: Config.get(:instance)    defp instance_name, do: instance_config()[:name]    defp instance_notify_email do diff --git a/lib/pleroma/emoji/loader.ex b/lib/pleroma/emoji/loader.ex index 3de2dc762..03a6bca0b 100644 --- a/lib/pleroma/emoji/loader.ex +++ b/lib/pleroma/emoji/loader.ex @@ -108,7 +108,7 @@ defmodule Pleroma.Emoji.Loader do        if File.exists?(emoji_txt) do          load_from_file(emoji_txt, emoji_groups)        else -        extensions = Pleroma.Config.get([:emoji, :pack_extensions]) +        extensions = Config.get([:emoji, :pack_extensions])          Logger.info(            "No emoji.txt found for pack \"#{pack_name}\", assuming all #{ diff --git a/lib/pleroma/plugs/http_security_plug.ex b/lib/pleroma/plugs/http_security_plug.ex index 472a3ff42..7d65cf078 100644 --- a/lib/pleroma/plugs/http_security_plug.ex +++ b/lib/pleroma/plugs/http_security_plug.ex @@ -82,14 +82,14 @@ defmodule Pleroma.Plugs.HTTPSecurityPlug do      connect_src = ["connect-src 'self' blob: ", static_url, ?\s, websocket_url]      connect_src = -      if Pleroma.Config.get(:env) == :dev do +      if Config.get(:env) == :dev do          [connect_src, " http://localhost:3035/"]        else          connect_src        end      script_src = -      if Pleroma.Config.get(:env) == :dev do +      if Config.get(:env) == :dev do          "script-src 'self' 'unsafe-eval'"        else          "script-src 'self'" diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 9d1314f81..0078f9831 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -388,8 +388,8 @@ defmodule Pleroma.User do    defp fix_follower_address(params), do: params    def remote_user_changeset(struct \\ %User{local: false}, params) do -    bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000) -    name_limit = Pleroma.Config.get([:instance, :user_name_length], 100) +    bio_limit = Config.get([:instance, :user_bio_length], 5000) +    name_limit = Config.get([:instance, :user_name_length], 100)      name =        case params[:name] do @@ -448,8 +448,8 @@ defmodule Pleroma.User do    end    def update_changeset(struct, params \\ %{}) do -    bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000) -    name_limit = Pleroma.Config.get([:instance, :user_name_length], 100) +    bio_limit = Config.get([:instance, :user_bio_length], 5000) +    name_limit = Config.get([:instance, :user_name_length], 100)      struct      |> cast( @@ -618,12 +618,12 @@ defmodule Pleroma.User do    def force_password_reset(user), do: update_password_reset_pending(user, true)    def register_changeset(struct, params \\ %{}, opts \\ []) do -    bio_limit = Pleroma.Config.get([:instance, :user_bio_length], 5000) -    name_limit = Pleroma.Config.get([:instance, :user_name_length], 100) +    bio_limit = Config.get([:instance, :user_bio_length], 5000) +    name_limit = Config.get([:instance, :user_name_length], 100)      need_confirmation? =        if is_nil(opts[:need_confirmation]) do -        Pleroma.Config.get([:instance, :account_activation_required]) +        Config.get([:instance, :account_activation_required])        else          opts[:need_confirmation]        end @@ -644,7 +644,7 @@ defmodule Pleroma.User do      |> validate_confirmation(:password)      |> unique_constraint(:email)      |> unique_constraint(:nickname) -    |> validate_exclusion(:nickname, Pleroma.Config.get([User, :restricted_nicknames])) +    |> validate_exclusion(:nickname, Config.get([User, :restricted_nicknames]))      |> validate_format(:nickname, local_nickname_regex())      |> validate_format(:email, @email_regex)      |> validate_length(:bio, max: bio_limit) @@ -659,7 +659,7 @@ defmodule Pleroma.User do    def maybe_validate_required_email(changeset, true), do: changeset    def maybe_validate_required_email(changeset, _) do -    if Pleroma.Config.get([:instance, :account_activation_required]) do +    if Config.get([:instance, :account_activation_required]) do        validate_required(changeset, [:email])      else        changeset @@ -679,7 +679,7 @@ defmodule Pleroma.User do    end    defp autofollow_users(user) do -    candidates = Pleroma.Config.get([:instance, :autofollowed_nicknames]) +    candidates = Config.get([:instance, :autofollowed_nicknames])      autofollowed_users =        User.Query.build(%{nickname: candidates, local: true, deactivated: false}) @@ -706,7 +706,7 @@ defmodule Pleroma.User do    def try_send_confirmation_email(%User{} = user) do      if user.confirmation_pending && -         Pleroma.Config.get([:instance, :account_activation_required]) do +         Config.get([:instance, :account_activation_required]) do        user        |> Pleroma.Emails.UserEmail.account_confirmation_email()        |> Pleroma.Emails.Mailer.deliver_async() @@ -763,7 +763,7 @@ defmodule Pleroma.User do    defdelegate following(user), to: FollowingRelationship    def follow(%User{} = follower, %User{} = followed, state \\ :follow_accept) do -    deny_follow_blocked = Pleroma.Config.get([:user, :deny_follow_blocked]) +    deny_follow_blocked = Config.get([:user, :deny_follow_blocked])      cond do        followed.deactivated -> @@ -964,7 +964,7 @@ defmodule Pleroma.User do    end    def get_cached_by_nickname_or_id(nickname_or_id, opts \\ []) do -    restrict_to_local = Pleroma.Config.get([:instance, :limit_to_local_content]) +    restrict_to_local = Config.get([:instance, :limit_to_local_content])      cond do        is_integer(nickname_or_id) or FlakeId.flake_id?(nickname_or_id) -> @@ -1160,7 +1160,7 @@ defmodule Pleroma.User do    @spec update_follower_count(User.t()) :: {:ok, User.t()}    def update_follower_count(%User{} = user) do -    if user.local or !Pleroma.Config.get([:instance, :external_user_synchronization]) do +    if user.local or !Config.get([:instance, :external_user_synchronization]) do        follower_count = FollowingRelationship.follower_count(user)        user @@ -1173,7 +1173,7 @@ defmodule Pleroma.User do    @spec update_following_count(User.t()) :: {:ok, User.t()}    def update_following_count(%User{local: false} = user) do -    if Pleroma.Config.get([:instance, :external_user_synchronization]) do +    if Config.get([:instance, :external_user_synchronization]) do        {:ok, maybe_fetch_follow_information(user)}      else        {:ok, user} @@ -1260,7 +1260,7 @@ defmodule Pleroma.User do    end    def subscribe(%User{} = subscriber, %User{} = target) do -    deny_follow_blocked = Pleroma.Config.get([:user, :deny_follow_blocked]) +    deny_follow_blocked = Config.get([:user, :deny_follow_blocked])      if blocks?(target, subscriber) and deny_follow_blocked do        {:error, "Could not subscribe: #{target.nickname} is blocking you"} @@ -1651,7 +1651,7 @@ defmodule Pleroma.User do      Pleroma.HTML.Scrubber.TwitterText    end -  def html_filter_policy(_), do: Pleroma.Config.get([:markup, :scrub_policy]) +  def html_filter_policy(_), do: Config.get([:markup, :scrub_policy])    def fetch_by_ap_id(ap_id), do: ActivityPub.make_user_from_ap_id(ap_id) @@ -1833,7 +1833,7 @@ defmodule Pleroma.User do    end    defp local_nickname_regex do -    if Pleroma.Config.get([:instance, :extended_nickname_format]) do +    if Config.get([:instance, :extended_nickname_format]) do        @extended_local_nickname_regex      else        @strict_local_nickname_regex @@ -1961,8 +1961,8 @@ defmodule Pleroma.User do    def get_mascot(%{mascot: mascot}) when is_nil(mascot) do      # use instance-default -    config = Pleroma.Config.get([:assets, :mascots]) -    default_mascot = Pleroma.Config.get([:assets, :default_mascot]) +    config = Config.get([:assets, :mascots]) +    default_mascot = Config.get([:assets, :default_mascot])      mascot = Keyword.get(config, default_mascot)      %{ @@ -2057,7 +2057,7 @@ defmodule Pleroma.User do    def validate_fields(changeset, remote? \\ false) do      limit_name = if remote?, do: :max_remote_account_fields, else: :max_account_fields -    limit = Pleroma.Config.get([:instance, limit_name], 0) +    limit = Config.get([:instance, limit_name], 0)      changeset      |> validate_length(:fields, max: limit) @@ -2071,8 +2071,8 @@ defmodule Pleroma.User do    end    defp valid_field?(%{"name" => name, "value" => value}) do -    name_limit = Pleroma.Config.get([:instance, :account_field_name_length], 255) -    value_limit = Pleroma.Config.get([:instance, :account_field_value_length], 255) +    name_limit = Config.get([:instance, :account_field_name_length], 255) +    value_limit = Config.get([:instance, :account_field_value_length], 255)      is_binary(name) && is_binary(value) && String.length(name) <= name_limit &&        String.length(value) <= value_limit @@ -2082,10 +2082,10 @@ defmodule Pleroma.User do    defp truncate_field(%{"name" => name, "value" => value}) do      {name, _chopped} = -      String.split_at(name, Pleroma.Config.get([:instance, :account_field_name_length], 255)) +      String.split_at(name, Config.get([:instance, :account_field_name_length], 255))      {value, _chopped} = -      String.split_at(value, Pleroma.Config.get([:instance, :account_field_value_length], 255)) +      String.split_at(value, Config.get([:instance, :account_field_value_length], 255))      %{"name" => name, "value" => value}    end @@ -2140,7 +2140,7 @@ defmodule Pleroma.User do    def add_pinnned_activity(user, %Pleroma.Activity{id: id}) do      if id not in user.pinned_activities do -      max_pinned_statuses = Pleroma.Config.get([:instance, :max_pinned_statuses], 0) +      max_pinned_statuses = Config.get([:instance, :max_pinned_statuses], 0)        params = %{pinned_activities: user.pinned_activities ++ [id]}        user diff --git a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex index b0ccb63c8..a62914135 100644 --- a/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/object_age_policy.ex @@ -98,7 +98,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy do    @impl true    def describe do      mrf_object_age = -      Pleroma.Config.get(:mrf_object_age) +      Config.get(:mrf_object_age)        |> Enum.into(%{})      {:ok, %{mrf_object_age: mrf_object_age}} diff --git a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex index 3092f3272..4fd63106d 100644 --- a/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex +++ b/lib/pleroma/web/activity_pub/mrf/reject_non_public.ex @@ -47,5 +47,5 @@ defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublic do    @impl true    def describe, -    do: {:ok, %{mrf_rejectnonpublic: Pleroma.Config.get(:mrf_rejectnonpublic) |> Enum.into(%{})}} +    do: {:ok, %{mrf_rejectnonpublic: Config.get(:mrf_rejectnonpublic) |> Enum.into(%{})}}  end diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index 9cea6bcf9..70a2ca053 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -155,7 +155,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do      %{host: actor_host} = URI.parse(actor)      reject_deletes = -      Pleroma.Config.get([:mrf_simple, :reject_deletes]) +      Config.get([:mrf_simple, :reject_deletes])        |> MRF.subdomains_regex()      if MRF.subdomain_match?(reject_deletes, actor_host) do diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 15594125f..9c38b73eb 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -143,7 +143,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do    def make_poll_data(%{poll: %{options: options, expires_in: expires_in}} = data)        when is_list(options) do -    limits = Pleroma.Config.get([:instance, :poll_limits]) +    limits = Config.get([:instance, :poll_limits])      with :ok <- validate_poll_expiration(expires_in, limits),           :ok <- validate_poll_options_amount(options, limits), @@ -502,7 +502,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do    def make_report_content_html(nil), do: {:ok, {nil, [], []}}    def make_report_content_html(comment) do -    max_size = Pleroma.Config.get([:instance, :max_report_comment_size], 1000) +    max_size = Config.get([:instance, :max_report_comment_size], 1000)      if String.length(comment) <= max_size do        {:ok, format_input(comment, "text/plain")} @@ -564,7 +564,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do    end    def validate_character_limit(full_payload, _attachments) do -    limit = Pleroma.Config.get([:instance, :limit]) +    limit = Config.get([:instance, :limit])      length = String.length(full_payload)      if length <= limit do diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex index 077fabe47..6f35826da 100644 --- a/lib/pleroma/web/media_proxy/media_proxy.ex +++ b/lib/pleroma/web/media_proxy/media_proxy.ex @@ -106,7 +106,7 @@ defmodule Pleroma.Web.MediaProxy do    def build_url(sig_base64, url_base64, filename \\ nil) do      [ -      Pleroma.Config.get([:media_proxy, :base_url], Web.base_url()), +      Config.get([:media_proxy, :base_url], Web.base_url()),        "proxy",        sig_base64,        url_base64, diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 8314e75b4..f02c4075c 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -83,7 +83,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do    def frontend_configurations(conn, _params) do      config = -      Pleroma.Config.get(:frontend_configurations, %{}) +      Config.get(:frontend_configurations, %{})        |> Enum.into(%{})      json(conn, config)  | 
