X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fcommon_api%2Futils.ex;h=a36ab5c158ae6984680f2843da7aff935b173d3c;hb=42612b1c8d356843b9e8785d3a91072f38fb50cf;hp=8f2625cefc2bdffe39fb18e322ac81231cb7bc08;hpb=0863ec27379a09ee8367fe61da9e63c90cfe18ee;p=akkoma
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 8f2625cef..a36ab5c15 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -1,11 +1,16 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.CommonAPI.Utils do
- alias Pleroma.{Repo, Object, Formatter, Activity}
+ alias Calendar.Strftime
+ alias Comeonin.Pbkdf2
+ alias Pleroma.{Activity, Formatter, Object, Repo}
+ alias Pleroma.User
+ alias Pleroma.Web
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.Endpoint
alias Pleroma.Web.MediaProxy
- alias Pleroma.User
- alias Calendar.Strftime
- alias Comeonin.Pbkdf2
# This is a hack for twidere.
def get_by_id_or_ap_id(id) do
@@ -111,33 +116,43 @@ defmodule Pleroma.Web.CommonAPI.Utils do
Enum.join([text | attachment_text], "
")
end
- def format_input(text, mentions, tags, "text/plain") do
+ def format_input(text, mentions, tags, format, options \\ [])
+
+ @doc """
+ Formatting text to plain text.
+ """
+ def format_input(text, mentions, tags, "text/plain", options) do
text
|> Formatter.html_escape("text/plain")
|> String.replace(~r/\r?\n/, "
")
|> (&{[], &1}).()
|> Formatter.add_links()
- |> Formatter.add_user_links(mentions)
+ |> Formatter.add_user_links(mentions, options[:user_links] || [])
|> Formatter.add_hashtag_links(tags)
|> Formatter.finalize()
end
- def format_input(text, mentions, _tags, "text/html") do
+ @doc """
+ Formatting text to html.
+ """
+ def format_input(text, mentions, _tags, "text/html", options) do
text
|> Formatter.html_escape("text/html")
- |> String.replace(~r/\r?\n/, "
")
|> (&{[], &1}).()
- |> Formatter.add_user_links(mentions)
+ |> Formatter.add_user_links(mentions, options[:user_links] || [])
|> Formatter.finalize()
end
- def format_input(text, mentions, tags, "text/markdown") do
+ @doc """
+ Formatting text to markdown.
+ """
+ def format_input(text, mentions, tags, "text/markdown", options) do
text
+ |> Formatter.mentions_escape(mentions)
|> Earmark.as_html!()
|> Formatter.html_escape("text/html")
- |> String.replace(~r/\r?\n/, "")
|> (&{[], &1}).()
- |> Formatter.add_user_links(mentions)
+ |> Formatter.add_user_links(mentions, options[:user_links] || [])
|> Formatter.add_hashtag_links(tags)
|> Formatter.finalize()
end
@@ -148,7 +163,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|> Enum.sort_by(fn {tag, _} -> -String.length(tag) end)
Enum.reduce(tags, text, fn {full, tag}, text ->
- url = "##{tag}"
+ url = "##{tag}"
String.replace(text, full, url)
end)
end