Various refactoring and typespec improvements
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
@@ -18,18 +18,20 @@ defmodule Mobilizon.Service.Formatter do
|
||||
@link_regex ~r"((?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~%:/?#[\]@!\$&'\(\)\*\+,;=.]+)|[0-9a-z+\-\.]+:[0-9a-z$-_.+!*'(),]+"ui
|
||||
@markdown_characters_regex ~r/(`|\*|_|{|}|[|]|\(|\)|#|\+|-|\.|!)/
|
||||
|
||||
def escape_mention_handler("@" <> nickname = mention, buffer, _, _) do
|
||||
@spec escape_mention_handler(String.t(), String.t(), any(), any()) :: String.t()
|
||||
defp escape_mention_handler("@" <> nickname = mention, buffer, _, _) do
|
||||
case Actors.get_actor_by_name(nickname) do
|
||||
%Actor{} ->
|
||||
# escape markdown characters with `\\`
|
||||
# (we don't want something like @user__name to be parsed by markdown)
|
||||
String.replace(mention, @markdown_characters_regex, "\\\\\\1")
|
||||
|
||||
_ ->
|
||||
nil ->
|
||||
buffer
|
||||
end
|
||||
end
|
||||
|
||||
@spec mention_handler(String.t(), String.t(), any(), map()) :: {String.t(), map()}
|
||||
def mention_handler("@" <> nickname, buffer, _opts, acc) do
|
||||
case Actors.get_actor_by_name(nickname) do
|
||||
# %Actor{preferred_username: preferred_username} = actor ->
|
||||
@@ -58,7 +60,7 @@ defmodule Mobilizon.Service.Formatter do
|
||||
|
||||
{link, %{acc | mentions: MapSet.put(acc.mentions, {"@" <> nickname, actor})}}
|
||||
|
||||
_ ->
|
||||
nil ->
|
||||
{buffer, acc}
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user