sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Credo warnings

Browse Source
This commit is contained in:
Egor Kislitsyn 2019-09-24 14:49:02 +07:00
parent 1bea67cb5e
commit 035f22f784
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
View File

@ -1348,7 +1348,7 @@ def index(%{assigns: %{user: user}} = conn, _params) do
end end
def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _params) do
with {:ok, _user} <- User.update_info(user, &User.Info.mastodon_settings_update(&1, settings)) do with {:ok, _} <- User.update_info(user, &User.Info.mastodon_settings_update(&1, settings)) do
json(conn, %{}) json(conn, %{})
else else
e -> e ->

5
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View File

@ -15,10 +15,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
action_fallback(:errors) action_fallback(:errors)
def confirm_email(conn, %{"user_id" => uid, "token" => token}) do def confirm_email(conn, %{"user_id" => uid, "token" => token}) do
new_info = [need_confirmation: false]
with %User{info: info} = user <- User.get_cached_by_id(uid), with %User{info: info} = user <- User.get_cached_by_id(uid),
true <- user.local and info.confirmation_pending and info.confirmation_token == token, true <- user.local and info.confirmation_pending and info.confirmation_token == token,
{:ok, _} <- {:ok, _} <- User.update_info(user, &User.Info.confirmation_changeset(&1, new_info)) do
User.update_info(user, &User.Info.confirmation_changeset(&1, need_confirmation: false)) do
redirect(conn, to: "/") redirect(conn, to: "/")
end end
end end