diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-12-10 18:33:36 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-12-10 18:33:36 +0000 |
| commit | bda25b999b5176c73380bff9a1ce6be51cba4820 (patch) | |
| tree | b37c841539f8544848fee2124572a0abe9a47953 /lib/pleroma/web/common_api/utils.ex | |
| parent | 993c8c8bd4e94985c647f4f9e927cbaa7148e6a0 (diff) | |
| parent | ab98c92d86f91b0c83f482e002e4a518b93f65ca (diff) | |
| download | pleroma-bda25b999b5176c73380bff9a1ce6be51cba4820.tar.gz | |
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 728f24c7e..8f2625cef 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -122,7 +122,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do |> Formatter.finalize() end - def format_input(text, mentions, tags, "text/html") do + def format_input(text, mentions, _tags, "text/html") do text |> Formatter.html_escape("text/html") |> String.replace(~r/\r?\n/, "<br>") @@ -236,7 +236,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do end end - def emoji_from_profile(%{info: info} = user) do + def emoji_from_profile(%{info: _info} = user) do (Formatter.get_emoji(user.bio) ++ Formatter.get_emoji(user.name)) |> Enum.map(fn {shortcode, url} -> %{ |