projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#114] `mix format`
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 0cd7bc46303a7f602a0df762bf031f810d68fc15..7e792cb0c2ac83a4261f29f70abf86a65e178783 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-38,7
+38,9
@@
defmodule Pleroma.User do
timestamps()
end
timestamps()
end
- def auth_active?(user), do: user.info && !user.info.confirmation_pending
+ def auth_active?(%User{} = user), do: user.info && !user.info.confirmation_pending
+
+ def superuser?(%User{} = user), do: user.info && User.Info.superuser?(user.info)
def avatar_url(user) do
case user.avatar do
def avatar_url(user) do
case user.avatar do
@@
-191,7
+193,7
@@
defmodule Pleroma.User do
|> validate_format(:email, @email_regex)
|> validate_length(:bio, max: 1000)
|> validate_length(:name, min: 1, max: 100)
|> validate_format(:email, @email_regex)
|> validate_length(:bio, max: 1000)
|> validate_length(:name, min: 1, max: 100)
- |> put_change(:info, User.Info.confirmation_
update
(%User.Info{}, confirmation_status))
+ |> put_change(:info, User.Info.confirmation_
changeset
(%User.Info{}, confirmation_status))
if changeset.valid? do
hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
if changeset.valid? do
hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
@@
-210,8
+212,8
@@
defmodule Pleroma.User do
@doc "Inserts provided changeset, performs post-registration actions (confirmation email sending etc.)"
def register(%Ecto.Changeset{} = changeset) do
@doc "Inserts provided changeset, performs post-registration actions (confirmation email sending etc.)"
def register(%Ecto.Changeset{} = changeset) do
- with {:ok, user} <- Repo.insert(changeset)
do
- {:ok, _} = try_send_confirmation_email(user)
+ with {:ok, user} <- Repo.insert(changeset)
,
+ {:ok, _} = try_send_confirmation_email(user) do
{:ok, user}
end
end
{:ok, user}
end
end