diff options
author | kaniini <nenolod@gmail.com> | 2018-12-12 07:28:47 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2018-12-12 07:28:47 +0000 |
commit | 2592b3c81a5af20536c3cc9709e3971d6cfb1e68 (patch) | |
tree | 89fba8fe2ed33bb25ef554f67e4659e255f81709 /lib/pleroma/user.ex | |
parent | 2999a08e3590c43c623730b0cbf6b93045ac08c1 (diff) | |
parent | 89b3729afa130a62a47ed6372350ebfc5acb4064 (diff) | |
download | pleroma-2592b3c81a5af20536c3cc9709e3971d6cfb1e68.tar.gz |
Merge branch 'support/issue_442' into 'develop'
[#442] fix warnings
See merge request pleroma/pleroma!536
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r-- | lib/pleroma/user.ex | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index bcc34b38f..e146b562c 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -212,7 +212,7 @@ defmodule Pleroma.User do end def maybe_direct_follow(%User{} = follower, %User{} = followed) do - if !User.ap_enabled?(followed) do + if not User.ap_enabled?(followed) do follow(follower, followed) else {:ok, follower} @@ -736,7 +736,8 @@ defmodule Pleroma.User do source_data: %{"publicKey" => %{"publicKeyPem" => public_key_pem}} }) do key = - :public_key.pem_decode(public_key_pem) + public_key_pem + |> :public_key.pem_decode() |> hd() |> :public_key.pem_entry_decode() @@ -774,13 +775,10 @@ defmodule Pleroma.User do def ap_enabled?(%User{info: info}), do: info.ap_enabled def ap_enabled?(_), do: false - def get_or_fetch(uri_or_nickname) do - if String.starts_with?(uri_or_nickname, "http") do - get_or_fetch_by_ap_id(uri_or_nickname) - else - get_or_fetch_by_nickname(uri_or_nickname) - end - end + @doc "Gets or fetch a user by uri or nickname." + @spec get_or_fetch(String.t()) :: User.t() + def get_or_fetch("http" <> _host = uri), do: get_or_fetch_by_ap_id(uri) + def get_or_fetch(nickname), do: get_or_fetch_by_nickname(nickname) # wait a period of time and return newest version of the User structs # this is because we have synchronous follow APIs and need to simulate them @@ -821,7 +819,9 @@ defmodule Pleroma.User do {String.trim(name, ":"), url} end) - CommonUtils.format_input(bio, mentions, tags, "text/plain") |> Formatter.emojify(emoji) + bio + |> CommonUtils.format_input(mentions, tags, "text/plain") + |> Formatter.emojify(emoji) end def tag(user_identifiers, tags) when is_list(user_identifiers) do |