projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Salmon: generate private key with native crypto if available.
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index 728d2b3e8e383da7dc4bd59f673beab8a5b5a56c..fbcbca9796e7e6dba95b9b32b8dba5a94d204a78 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-1,15
+1,16
@@
defmodule Pleroma.Formatter do
alias Pleroma.User
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
@tag_regex ~r/\#\w+/u
def linkify(text) do
Regex.replace(@link_regex, text, "<a href='\\0'>\\0</a>")
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, String.downcase(tag)} end)
Regex.scan(@tag_regex, text)
|> Enum.map(fn (["#" <> tag = full_tag]) -> {full_tag, String.downcase(tag)} end)
+ |> (fn map -> if data["sensitive"], do: [{"#nsfw", "nsfw"}] ++ map, else: map end).()
end
def parse_mentions(text) do
end
def parse_mentions(text) do
@@
-109,7
+110,7
@@
defmodule Pleroma.Formatter do
def emojify(text, additional \\ nil) do
all_emoji = if additional do
def emojify(text, additional \\ nil) do
all_emoji = if additional do
- @emoji ++ Map.to_list(additional)
+ Map.to_list(additional) ++ @emoji
else
@emoji
end
else
@emoji
end
@@
-122,4
+123,8
@@
defmodule Pleroma.Formatter do
def get_emoji(text) do
Enum.filter(@emoji, fn ({emoji, _}) -> String.contains?(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
end