defmodule Pleroma.Formatter do
alias Pleroma.User
- @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&]+[\w]/u
+ @link_regex ~r/https?:\/\/[\w\.\/?=\-#%&@~]+[\w\/]/u
def linkify(text) do
Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>")
end
{finmoji, "/finmoji/128px/#{finmoji}-128.png"}
end)
- @emoji @finmoji_with_filenames
+ @emoji_from_file (with {:ok, file} <- File.read("config/emoji.txt") do
+ file
+ |> String.trim
+ |> String.split("\n")
+ |> Enum.map(fn(line) ->
+ [name, file] = String.split(line, ", ")
+ {name, file}
+ end)
+ else
+ _ -> []
+ end)
+
+ @emoji @finmoji_with_filenames ++ @emoji_from_file
def emojify(text, additional \\ nil) do
all_emoji = if additional do
- @emoji ++ Map.to_list(additional)
+ Map.to_list(additional) ++ @emoji
else
@emoji
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