X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=66ca92f270a8f80cb33bf085c44989dc2d4a89a2;hb=1f1caab138120cf3e08e9d9311570f2c646003d0;hp=fdf91f56e4877cc3c2c5e8aaf02db7e279170fb9;hpb=0f194dc56bc5dc58e42d8cc32f376c2635f2598c;p=akkoma
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index fdf91f56e..66ca92f27 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -2,11 +2,6 @@ defmodule Pleroma.Formatter do
alias Pleroma.User
alias Pleroma.Web.MediaProxy
- @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u
- def linkify(text) do
- Regex.replace(@link_regex, text, "\\0")
- end
-
@tag_regex ~r/\#\w+/u
def parse_tags(text, data \\ %{}) do
Regex.scan(@tag_regex, text)
@@ -25,15 +20,6 @@ defmodule Pleroma.Formatter do
|> Enum.filter(fn ({_match, user}) -> user end)
end
- def html_escape(text) do
- Regex.split(@link_regex, text, include_captures: true)
- |> Enum.map_every(2, fn chunk ->
- {:safe, part} = Phoenix.HTML.html_escape(chunk)
- part
- end)
- |> Enum.join("")
- end
-
@finmoji [
"a_trusted_friend",
"alandislands",
@@ -124,14 +110,12 @@ defmodule Pleroma.Formatter do
@emoji @finmoji_with_filenames ++ @emoji_from_file
- def emojify(text, additional \\ nil) do
- all_emoji = if additional do
- Map.to_list(additional) ++ @emoji
- else
- @emoji
- end
-
- Enum.reduce(all_emoji, text, fn ({emoji, file}, text) ->
+ def emojify(text, emoji \\ @emoji)
+ def emojify(text, nil), do: text
+ def emojify(text, emoji) do
+ Enum.reduce(emoji, text, fn ({emoji, file}, text) ->
+ emoji = HtmlSanitizeEx.strip_tags(emoji)
+ file = HtmlSanitizeEx.strip_tags(file)
String.replace(text, ":#{emoji}:", "
")
end)
end
@@ -143,4 +127,74 @@ defmodule Pleroma.Formatter do
def get_custom_emoji() do
@emoji
end
+
+ @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~\(\)]+[\w\/]/u
+
+ def html_escape(text) do
+ Regex.split(@link_regex, text, include_captures: true)
+ |> Enum.map_every(2, fn chunk ->
+ {:safe, part} = Phoenix.HTML.html_escape(chunk)
+ part
+ end)
+ |> Enum.join("")
+ end
+
+ @doc "changes http:... links to html links"
+ def add_links({subs, text}) do
+ links = Regex.scan(@link_regex, text)
+ |> Enum.map(fn ([url]) -> {Ecto.UUID.generate, url} end)
+
+ uuid_text = links
+ |> Enum.reduce(text, fn({uuid, url}, acc) -> String.replace(acc, url, uuid) end)
+
+ subs = subs ++ Enum.map(links, fn({uuid, url}) ->
+ {uuid, "#{url}"}
+ end)
+
+ {subs, uuid_text}
+ end
+
+ @doc "Adds the links to mentioned users"
+ def add_user_links({subs, text}, mentions) do
+ mentions = mentions
+ |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
+ |> Enum.map(fn({name, user}) -> {name, user, Ecto.UUID.generate} end)
+
+ uuid_text = mentions
+ |> Enum.reduce(text, fn ({match, _user, uuid}, text) ->
+ String.replace(text, match, uuid)
+ end)
+
+ subs = subs ++ Enum.map(mentions, fn ({match, %User{ap_id: ap_id}, uuid}) ->
+ short_match = String.split(match, "@") |> tl() |> hd()
+ {uuid, "@#{short_match}"}
+ end)
+
+ {subs, uuid_text}
+ end
+
+ @doc "Adds the hashtag links"
+ def add_hashtag_links({subs, text}, tags) do
+ tags = tags
+ |> Enum.sort_by(fn ({name, _}) -> -String.length(name) end)
+ |> Enum.map(fn({name, short}) -> {name, short, Ecto.UUID.generate} end)
+
+ uuid_text = tags
+ |> Enum.reduce(text, fn ({match, _short, uuid}, text) ->
+ String.replace(text, match, uuid)
+ end)
+
+ subs = subs ++ Enum.map(tags, fn ({_, tag, uuid}) ->
+ url = "##{tag}"
+ {uuid, url}
+ end)
+
+ {subs, uuid_text}
+ end
+
+ def finalize({subs, text}) do
+ Enum.reduce(subs, text, fn({uuid, replacement}, result_text) ->
+ String.replace(result_text, uuid, replacement)
+ end)
+ end
end