projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/masto-put-settings' into 'develop'
[akkoma]
/
lib
/
pleroma
/
formatter.ex
diff --git
a/lib/pleroma/formatter.ex
b/lib/pleroma/formatter.ex
index b6079551c022c5c83701b077ac09af482355aa5e..46d0d926a814b2177c4aeefff7cc79e37b8f74e6 100644
(file)
--- a/
lib/pleroma/formatter.ex
+++ b/
lib/pleroma/formatter.ex
@@
-5,7
+5,7
@@
defmodule Pleroma.Formatter do
alias Pleroma.Emoji
@tag_regex ~r/\#\w+/u
alias Pleroma.Emoji
@tag_regex ~r/\#\w+/u
- @mardown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
+ @mar
k
down_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
def parse_tags(text, data \\ %{}) do
Regex.scan(@tag_regex, text)
def parse_tags(text, data \\ %{}) do
Regex.scan(@tag_regex, text)
@@
-85,7
+85,7
@@
defmodule Pleroma.Formatter do
def mentions_escape(text, mentions) do
mentions
|> Enum.reduce(text, fn {name, _}, acc ->
def mentions_escape(text, mentions) do
mentions
|> Enum.reduce(text, fn {name, _}, acc ->
- escape_name = String.replace(name, @mardown_characters_regex, "\\\\\\1")
+ escape_name = String.replace(name, @mar
k
down_characters_regex, "\\\\\\1")
String.replace(acc, name, escape_name)
end)
end
String.replace(acc, name, escape_name)
end)
end