diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-03-15 21:54:24 +0000 |
| commit | bb49d8f5a0dbbad65a8f65a28cc2d0847b518067 (patch) | |
| tree | 938fb7fd74053a816c21948b28d5f6cfb7443f37 /lib/pleroma/web/common_api/utils.ex | |
| parent | e8493431bfc16977e43715bf8bdb09ac46580028 (diff) | |
| parent | 8d15d6c3ab9aecb82ba5126bb5efef20b3dfef41 (diff) | |
| download | pleroma-2.0.1.tar.gz | |
Merge branch 'release/2.0.1' into 'stable'v2.0.1
2.0.1 release
See merge request pleroma/pleroma!2298
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 8746273c4..635e7cd38 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -331,7 +331,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, "text/markdown", options) do text |> Formatter.mentions_escape(options) - |> Earmark.as_html!() + |> Earmark.as_html!(%Earmark.Options{renderer: Pleroma.EarmarkRenderer}) |> Formatter.linkify(options) |> Formatter.html_escape("text/html") end @@ -591,7 +591,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do limit = Pleroma.Config.get([:instance, :limit]) length = String.length(full_payload) - if length < limit do + if length <= limit do :ok else {:error, dgettext("errors", "The status is over the character limit")} |