diff options
author | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
commit | 9e54ef086b45c9df38eb293e4db2ea653261c83b (patch) | |
tree | 4510ec649a6db5116b4a50c0fe9363592938a45b /lib/pleroma/web/common_api | |
parent | 034ac43f3a91178694d3c621c52ce68207ec4f69 (diff) | |
parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
download | pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.tar.gz |
Merge branch 'develop' into feature/account-export
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 21f4d43e9..3b71adf0e 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -274,7 +274,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do def format_input(text, format, options \\ []) @doc """ - Formatting text to plain text. + Formatting text to plain text, BBCode, HTML, or Markdown """ def format_input(text, "text/plain", options) do text @@ -285,9 +285,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do end).() end - @doc """ - Formatting text as BBCode. - """ def format_input(text, "text/bbcode", options) do text |> String.replace(~r/\r/, "") @@ -297,18 +294,12 @@ defmodule Pleroma.Web.CommonAPI.Utils do |> Formatter.linkify(options) end - @doc """ - Formatting text to html. - """ def format_input(text, "text/html", options) do text |> Formatter.html_escape("text/html") |> Formatter.linkify(options) end - @doc """ - Formatting text to markdown. - """ def format_input(text, "text/markdown", options) do text |> Formatter.mentions_escape(options) |