diff options
author | lain <lain@soykaf.club> | 2020-07-10 12:26:53 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-10 12:26:53 +0200 |
commit | b39eb6ecc573c310801fe49f35d92246ddcb6226 (patch) | |
tree | 32b20b5a0ec3f5c8d44f1157087868adfaa549b0 /lib/pleroma/web/common_api/utils.ex | |
parent | 208baf157ad0c8be470566d5d51d0214c229e6a5 (diff) | |
parent | 8aa7143f464562ca2a0572087c526f26d1a3b7ef (diff) | |
download | pleroma-b39eb6ecc573c310801fe49f35d92246ddcb6226.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 6 |
1 files changed, 3 insertions, 3 deletions
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 |