hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change user.deactivated field to user.is_active

Browse source
This commit is contained in:
Mark Felder 2020-10-12 17:42:27 -05:00 • committed by Mark Felder
commit 860b5c7804
40 changed files with 125 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/mix/tasks/pleroma/email.ex
View file

@ -33,7 +33,7 @@ defmodule Mix.Tasks.Pleroma.Email do
Pleroma.User.Query.build(%{
local: true,
deactivated: false,
is_active: true,
confirmation_pending: true,
invisible: false
})

10
lib/mix/tasks/pleroma/user.ex
View file

@ -111,10 +111,10 @@ defmodule Mix.Tasks.Pleroma.User do
start_pleroma()
with %User{} = user <- User.get_cached_by_nickname(nickname) do
{:ok, user} = User.deactivate(user, !user.deactivated)
{:ok, user} = User.deactivate(user, user.is_active)
shell_info(
"Activation status of #{nickname}: #{if(user.deactivated, do: "de", else: "")}activated"
"Activation status of #{nickname}: #{unless(user.is_active, do: "de", else: "")}activated"
)
else
_ ->
@ -365,7 +365,7 @@ defmodule Mix.Tasks.Pleroma.User do
Pleroma.User.Query.build(%{
local: true,
deactivated: false,
is_active: true,
is_moderator: false,
is_admin: false,
invisible: false
@ -383,7 +383,7 @@ defmodule Mix.Tasks.Pleroma.User do
Pleroma.User.Query.build(%{
local: true,
deactivated: false,
is_active: true,
is_moderator: false,
is_admin: false,
invisible: false
@ -420,7 +420,7 @@ defmodule Mix.Tasks.Pleroma.User do
shell_info(
"#{user.nickname} moderator: #{user.is_moderator}, admin: #{user.is_admin}, locked: #{
user.is_locked
}, deactivated: #{user.deactivated}"
}, is_active: #{user.is_active}"
)
end)
end)

2
lib/pleroma/following_relationship.ex
View file

@ -152,7 +152,7 @@ defmodule Pleroma.FollowingRelationship do
|> join(:inner, [r], f in assoc(r, :follower))
|> where([r], r.state == ^:follow_pending)
|> where([r], r.following_id == ^id)
|> where([r, f], f.deactivated != true)
|> where([r, f], f.is_active == true)
|> select([r, f], f)
|> Repo.all()
end

2
lib/pleroma/notification.ex
View file

@ -115,7 +115,7 @@ defmodule Pleroma.Notification do
|> where(
[n, a],
fragment(
"? not in (SELECT ap_id FROM users WHERE deactivated = 'true')",
"? not in (SELECT ap_id FROM users WHERE is_active = 'false')",
a.actor
)
)

2
lib/pleroma/stats.ex
View file

@ -75,7 +75,7 @@ defmodule Pleroma.Stats do
users_query =
from(u in User,
where: u.deactivated != true,
where: u.is_active == true,
where: u.local == true,
where: not is_nil(u.nickname),
where: not u.invisible

28
lib/pleroma/user.ex
View file

@ -117,7 +117,7 @@ defmodule Pleroma.User do
field(:confirmation_token, :string, default: nil)
field(:default_scope, :string, default: "public")
field(:domain_blocks, {:array, :string}, default: [])
field(:deactivated, :boolean, default: false)
field(:is_active, :boolean, default: true)
field(:no_rich_text, :boolean, default: false)
field(:ap_enabled, :boolean, default: false)
field(:is_moderator, :boolean, default: false)
@ -286,7 +286,7 @@ defmodule Pleroma.User do
@doc "Returns status account"
@spec account_status(User.t()) :: account_status()
def account_status(%User{deactivated: true}), do: :deactivated
def account_status(%User{is_active: false}), do: :deactivated
def account_status(%User{password_reset_pending: true}), do: :password_reset_pending
def account_status(%User{local: true, approval_pending: true}), do: :approval_pending
@ -388,7 +388,7 @@ defmodule Pleroma.User do
@spec restrict_deactivated(Ecto.Query.t()) :: Ecto.Query.t()
def restrict_deactivated(query) do
from(u in query, where: u.deactivated != ^true)
from(u in query, where: u.is_active == ^true)
end
defp truncate_fields_param(params) do
@ -785,7 +785,7 @@ defmodule Pleroma.User do
candidates = Config.get([:instance, :autofollowed_nicknames])
autofollowed_users =
User.Query.build(%{nickname: candidates, local: true, deactivated: false})
User.Query.build(%{nickname: candidates, local: true, is_active: true})
|> Repo.all()
follow_all(user, autofollowed_users)
@ -946,7 +946,7 @@ defmodule Pleroma.User do
deny_follow_blocked = Config.get([:user, :deny_follow_blocked])
cond do
followed.deactivated ->
followed.is_active == false ->
{:error, "Could not follow user: #{followed.nickname} is deactivated."}
deny_follow_blocked and blocks?(followed, follower) ->
@ -1181,7 +1181,7 @@ defmodule Pleroma.User do
@spec get_followers_query(User.t(), pos_integer() | nil) :: Ecto.Query.t()
def get_followers_query(%User{} = user, nil) do
User.Query.build(%{followers: user, deactivated: false})
User.Query.build(%{followers: user, is_active: true})
end
def get_followers_query(%User{} = user, page) do
@ -1357,7 +1357,7 @@ defmodule Pleroma.User do
@spec get_users_from_set([String.t()], keyword()) :: [User.t()]
def get_users_from_set(ap_ids, opts \\ []) do
local_only = Keyword.get(opts, :local_only, true)
criteria = %{ap_id: ap_ids, deactivated: false}
criteria = %{ap_id: ap_ids, is_active: true}
criteria = if local_only, do: Map.put(criteria, :local, true), else: criteria
User.Query.build(criteria)
@ -1368,7 +1368,7 @@ defmodule Pleroma.User do
def get_recipients_from_activity(%Activity{recipients: to, actor: actor}) do
to = [actor | to]
query = User.Query.build(%{recipients_from_activity: to, local: true, deactivated: false})
query = User.Query.build(%{recipients_from_activity: to, local: true, is_active: true})
query
|> Repo.all()
@ -1600,7 +1600,7 @@ defmodule Pleroma.User do
end
def deactivate(%User{} = user, status) do
with {:ok, user} <- set_activation_status(user, status) do
with {:ok, user} <- set_activation_status(user, !status) do
user
|> get_followers()
|> Enum.filter(& &1.local)
@ -1688,7 +1688,7 @@ defmodule Pleroma.User do
registration_reason: nil,
confirmation_token: nil,
domain_blocks: [],
deactivated: true,
is_active: false,
ap_enabled: false,
is_moderator: false,
is_admin: false,
@ -2056,7 +2056,7 @@ defmodule Pleroma.User do
@spec all_superusers() :: [User.t()]
def all_superusers do
User.Query.build(%{super_users: true, local: true, deactivated: false})
User.Query.build(%{super_users: true, local: true, is_active: true})
|> Repo.all()
end
@ -2097,7 +2097,7 @@ defmodule Pleroma.User do
left_join: a in Pleroma.Activity,
on: u.ap_id == a.actor,
where: not is_nil(u.nickname),
where: u.deactivated != ^true,
where: u.is_active == ^true,
where: u.id not in ^has_read_notifications,
group_by: u.id,
having:
@ -2218,9 +2218,9 @@ defmodule Pleroma.User do
end
# Internal function; public one is `deactivate/2`
defp set_activation_status(user, deactivated) do
defp set_activation_status(user, status) do
user
|> cast(%{deactivated: deactivated}, [:deactivated])
|> cast(%{is_active: status}, [:is_active])
|> update_and_set_cache()
end

2
lib/pleroma/user/query.ex
View file

@ -151,7 +151,7 @@ defmodule Pleroma.User.Query do
end
defp compose_query({:deactivated, true}, query) do
where(query, [u], u.deactivated == ^true)
where(query, [u], u.is_active == false)
end
defp compose_query({:confirmation_pending, bool}, query) do

2
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -56,7 +56,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp check_actor_is_active(actor) when is_binary(actor) do
case User.get_cached_by_ap_id(actor) do
%User{deactivated: deactivated} -> not deactivated
%User{is_active: true} -> true
_ -> false
end
end

2
lib/pleroma/web/activity_pub/object_validators/common_validations.ex
View file

@ -35,7 +35,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectValidators.CommonValidations do
cng
|> validate_change(field_name, fn field_name, actor ->
case User.get_cached_by_ap_id(actor) do
%User{deactivated: true} ->
%User{is_active: false} ->
[{field_name, "user is deactivated"}]
%User{} ->

4
lib/pleroma/web/admin_api/controllers/user_controller.ex
View file

@ -172,9 +172,9 @@ defmodule Pleroma.Web.AdminAPI.UserController do
def toggle_activation(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do
user = User.get_cached_by_nickname(nickname)
{:ok, updated_user} = User.deactivate(user, !user.deactivated)
{:ok, updated_user} = User.deactivate(user, !user.is_active)
action = if user.deactivated, do: "activate", else: "deactivate"
action = if !user.is_active, do: "activate", else: "deactivate"
ModerationLog.insert_log(%{
actor: admin,

2
lib/pleroma/web/admin_api/views/account_view.ex
View file

@ -73,7 +73,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
"avatar" => avatar,
"nickname" => user.nickname,
"display_name" => display_name,
"deactivated" => user.deactivated,
"is_active" => user.is_active,
"local" => user.local,
"roles" => User.roles(user),
"tags" => user.tags || [],

2
lib/pleroma/web/api_spec/operations/admin/report_operation.ex
View file

@ -182,7 +182,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.ReportOperation do
properties:
Map.merge(Account.schema().properties, %{
nickname: %Schema{type: :string},
deactivated: %Schema{type: :boolean},
is_active: %Schema{type: :boolean},
local: %Schema{type: :boolean},
roles: %Schema{
type: :object,

2
lib/pleroma/web/api_spec/operations/admin/status_operation.ex
View file

@ -132,7 +132,7 @@ defmodule Pleroma.Web.ApiSpec.Admin.StatusOperation do
avatar: %Schema{type: :string},
nickname: %Schema{type: :string},
display_name: %Schema{type: :string},
deactivated: %Schema{type: :boolean},
is_active: %Schema{type: :boolean},
local: %Schema{type: :boolean},
roles: %Schema{
type: :object,

2
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -376,7 +376,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
defp maybe_put_allow_following_move(data, _, _), do: data
defp maybe_put_activation_status(data, user, %User{is_admin: true}) do
Kernel.put_in(data, [:pleroma, :deactivated], user.deactivated)
Kernel.put_in(data, [:pleroma, :deactivated], !user.is_active)
end
defp maybe_put_activation_status(data, _, _), do: data

4
lib/pleroma/web/mongoose_im/mongoose_im_controller.ex
View file

@ -14,7 +14,7 @@ defmodule Pleroma.Web.MongooseIM.MongooseIMController do
plug(RateLimiter, [name: :authentication, params: ["user"]] when action == :check_password)
def user_exists(conn, %{"user" => username}) do
with %User{} <- Repo.get_by(User, nickname: username, local: true, deactivated: false) do
with %User{} <- Repo.get_by(User, nickname: username, local: true, is_active: true) do
conn
|> json(true)
else
@ -26,7 +26,7 @@ defmodule Pleroma.Web.MongooseIM.MongooseIMController do
end
def check_password(conn, %{"user" => username, "pass" => password}) do
with %User{password_hash: password_hash, deactivated: false} <-
with %User{password_hash: password_hash, is_active: true} <-
Repo.get_by(User, nickname: username, local: true),
true <- AuthenticationPlug.checkpw(password, password_hash) do
conn

2
lib/pleroma/web/pleroma_api/views/emoji_reaction_view.ex
View file

@ -26,7 +26,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionView do
user_ap_ids
|> Enum.map(&Pleroma.User.get_cached_by_ap_id/1)
|> Enum.filter(fn
%{deactivated: false} -> true
%{is_active: true} -> true
_ -> false
end)
end

2
lib/pleroma/web/twitter_api/twitter_api.ex
View file

@ -59,7 +59,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
def password_reset(nickname_or_email) do
with true <- is_binary(nickname_or_email),
%User{local: true, email: email, deactivated: false} = user when is_binary(email) <-
%User{local: true, email: email, is_active: true} = user when is_binary(email) <-
User.get_by_nickname_or_email(nickname_or_email),
{:ok, token_record} <- Pleroma.PasswordResetToken.create_token(user) do
user