X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fformatter.ex;h=fdf91f56e4877cc3c2c5e8aaf02db7e279170fb9;hb=932d346d35e0b16537ee2527ca2253f00c214c12;hp=50c4279f64c8a5bb8ee24c6a78528df75e2e17de;hpb=a9bfbcae800e88b85814c718b0c4bfa9d8dfcfaa;p=akkoma
diff --git a/lib/pleroma/formatter.ex b/lib/pleroma/formatter.ex
index 50c4279f6..fdf91f56e 100644
--- a/lib/pleroma/formatter.ex
+++ b/lib/pleroma/formatter.ex
@@ -1,20 +1,22 @@
defmodule Pleroma.Formatter do
alias Pleroma.User
+ alias Pleroma.Web.MediaProxy
- @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&]+[\w]/
+ @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) do
+ def parse_tags(text, data \\ %{}) do
Regex.scan(@tag_regex, text)
- |> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, tag} end)
+ |> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, String.downcase(tag)} end)
+ |> (fn map -> if data["sensitive"] in [true, "True", "true", "1"], do: [{"#nsfw", "nsfw"}] ++ map, else: map end).()
end
def parse_mentions(text) do
# Modified from https://www.w3.org/TR/html5/forms.html#valid-e-mail-address
- regex = ~r/@[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@?[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*/
+ regex = ~r/@[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@?[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*/u
Regex.scan(regex, text)
|> List.flatten
@@ -22,4 +24,123 @@ defmodule Pleroma.Formatter do
|> Enum.map(fn ("@" <> match = full_match) -> {full_match, User.get_cached_by_nickname(match)} end)
|> 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",
+ "association",
+ "auroraborealis",
+ "baby_in_a_box",
+ "bear",
+ "black_gold",
+ "christmasparty",
+ "crosscountryskiing",
+ "cupofcoffee",
+ "education",
+ "fashionista_finns",
+ "finnishlove",
+ "flag",
+ "forest",
+ "four_seasons_of_bbq",
+ "girlpower",
+ "handshake",
+ "happiness",
+ "headbanger",
+ "icebreaker",
+ "iceman",
+ "joulutorttu",
+ "kaamos",
+ "kalsarikannit_f",
+ "kalsarikannit_m",
+ "karjalanpiirakka",
+ "kicksled",
+ "kokko",
+ "lavatanssit",
+ "losthopes_f",
+ "losthopes_m",
+ "mattinykanen",
+ "meanwhileinfinland",
+ "moominmamma",
+ "nordicfamily",
+ "out_of_office",
+ "peacemaker",
+ "perkele",
+ "pesapallo",
+ "polarbear",
+ "pusa_hispida_saimensis",
+ "reindeer",
+ "sami",
+ "sauna_f",
+ "sauna_m",
+ "sauna_whisk",
+ "sisu",
+ "stuck",
+ "suomimainittu",
+ "superfood",
+ "swan",
+ "the_cap",
+ "the_conductor",
+ "the_king",
+ "the_voice",
+ "theoriginalsanta",
+ "tomoffinland",
+ "torillatavataan",
+ "unbreakable",
+ "waiting",
+ "white_nights",
+ "woollysocks"
+ ]
+
+ @finmoji_with_filenames Enum.map(@finmoji, fn (finmoji) ->
+ {finmoji, "/finmoji/128px/#{finmoji}-128.png"}
+ end)
+
+ @emoji_from_file (with {:ok, default} <- File.read("config/emoji.txt") do
+ custom =
+ with {:ok, custom} <- File.read("config/custom_emoji.txt") do
+ custom
+ else
+ _e -> ""
+ end
+ (default <> "\n" <> custom)
+ |> String.trim()
+ |> String.split(~r/\n+/)
+ |> Enum.map(fn(line) ->
+ [name, file] = String.split(line, ~r/,\s*/)
+ {name, file}
+ end)
+ else
+ _ -> []
+ end)
+
+ @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) ->
+ String.replace(text, ":#{emoji}:", "
")
+ end)
+ end
+
+ def get_emoji(text) do
+ Enum.filter(@emoji, fn ({emoji, _}) -> String.contains?(text, ":#{emoji}:") end)
+ end
+
+ def get_custom_emoji() do
+ @emoji
+ end
end