Refactoring of Actors context
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -44,8 +44,11 @@ defmodule Mobilizon.Actors.Follower do
|
||||
@spec ensure_url(Ecto.Changeset.t()) :: Ecto.Changeset.t()
|
||||
defp ensure_url(%Ecto.Changeset{data: %__MODULE__{url: nil}} = changeset) do
|
||||
case fetch_change(changeset, :url) do
|
||||
{:ok, _url} -> changeset
|
||||
:error -> generate_url(changeset)
|
||||
{:ok, _url} ->
|
||||
changeset
|
||||
|
||||
:error ->
|
||||
generate_url(changeset)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -86,8 +86,11 @@ defmodule Mobilizon.Addresses do
|
||||
|> filter_by_contry(Keyword.get(options, :country))
|
||||
|
||||
case Keyword.get(options, :single, false) do
|
||||
true -> Repo.one(query)
|
||||
false -> Repo.all(query)
|
||||
true ->
|
||||
Repo.one(query)
|
||||
|
||||
false ->
|
||||
Repo.all(query)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -75,8 +75,11 @@ defmodule Mobilizon.Media do
|
||||
|> Repo.transaction()
|
||||
|
||||
case transaction do
|
||||
{:ok, %{picture: %Picture{} = picture}} -> {:ok, picture}
|
||||
{:error, :remove, error, _} -> {:error, error}
|
||||
{:ok, %{picture: %Picture{} = picture}} ->
|
||||
{:ok, picture}
|
||||
|
||||
{:error, :remove, error, _} ->
|
||||
{:error, error}
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -154,8 +154,11 @@ defmodule Mobilizon.Users.User do
|
||||
case changeset do
|
||||
%Ecto.Changeset{valid?: true, changes: %{email: email}} ->
|
||||
case EmailChecker.valid?(email) do
|
||||
false -> add_error(changeset, :email, "Email doesn't fit required format")
|
||||
true -> changeset
|
||||
false ->
|
||||
add_error(changeset, :email, "Email doesn't fit required format")
|
||||
|
||||
true ->
|
||||
changeset
|
||||
end
|
||||
|
||||
_ ->
|
||||
|
||||
@@ -59,8 +59,11 @@ defmodule Mobilizon.Users do
|
||||
query = user_by_email_query(email, activated)
|
||||
|
||||
case Repo.one(query) do
|
||||
nil -> {:error, :user_not_found}
|
||||
user -> {:ok, user}
|
||||
nil ->
|
||||
{:error, :user_not_found}
|
||||
|
||||
user ->
|
||||
{:ok, user}
|
||||
end
|
||||
end
|
||||
|
||||
@@ -147,8 +150,11 @@ defmodule Mobilizon.Users do
|
||||
case actor do
|
||||
nil ->
|
||||
case get_actors_for_user(user) do
|
||||
[] -> nil
|
||||
actors -> hd(actors)
|
||||
[] ->
|
||||
nil
|
||||
|
||||
actors ->
|
||||
hd(actors)
|
||||
end
|
||||
|
||||
actor ->
|
||||
|
||||
Reference in New Issue
Block a user