Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases 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
parent cf367fdbd5
commit 860b5c7804
40 changed files with 125 additions and 107 deletions
Show Stats 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

18
priv/repo/migrations/20201012173004_refactor_deactivated_user_field.exs Normal file
View File

@ -0,0 +1,18 @@
defmodule Pleroma.Repo.Migrations.RefactorDeactivatedUserField do
use Ecto.Migration
def up do
# Flip the values before we change the meaning of the column
execute("UPDATE users SET deactivated = NOT deactivated;")
execute("ALTER TABLE users RENAME COLUMN deactivated TO is_active;")
execute("ALTER TABLE users ALTER COLUMN is_active SET DEFAULT true;")
execute("ALTER INDEX users_deactivated_index RENAME TO users_is_active_index;")
end
def down do
execute("UPDATE users SET is_active = NOT is_active;")
execute("ALTER TABLE users RENAME COLUMN is_active TO deactivated;")
execute("ALTER TABLE users ALTER COLUMN deactivated SET DEFAULT false;")
execute("ALTER INDEX users_is_active_index RENAME TO users_deactivated_index;")
end
end

12
test/mix/tasks/pleroma/email_test.exs
View File

@ -63,7 +63,7 @@ defmodule Mix.Tasks.Pleroma.EmailTest do
insert(:user, %{
confirmation_pending: true,
confirmation_token: "mytoken",
deactivated: false,
is_active: true,
email: "local1@pleroma.com",
local: true
})
@ -72,7 +72,7 @@ defmodule Mix.Tasks.Pleroma.EmailTest do
insert(:user, %{
confirmation_pending: true,
confirmation_token: "mytoken",
deactivated: false,
is_active: true,
email: "local2@pleroma.com",
local: true
})
@ -90,28 +90,28 @@ defmodule Mix.Tasks.Pleroma.EmailTest do
insert(:user, %{
confirmation_pending: false,
confirmation_token: "mytoken",
deactivated: false,
is_active: true,
email: "confirmed@pleroma.com",
local: true
})
# remote user
insert(:user, %{
deactivated: false,
is_active: true,
email: "remote@not-pleroma.com",
local: false
})
# deactivated user =
insert(:user, %{
deactivated: true,
is_active: false,
email: "deactivated@pleroma.com",
local: false
})
# invisible user
insert(:user, %{
deactivated: false,
is_active: true,
email: "invisible@pleroma.com",
local: true,
invisible: true

12
test/mix/tasks/pleroma/user_test.exs
View File

@ -102,7 +102,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
assert_received {:mix_shell, :info, [message]}
assert message =~ " deleted"
assert %{deactivated: true} = User.get_by_nickname(user.nickname)
assert %{is_active: false} = User.get_by_nickname(user.nickname)
assert called(Pleroma.Web.Federator.publish(:_))
end
@ -140,7 +140,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
assert_received {:mix_shell, :info, [message]}
assert message =~ " deleted"
assert %{deactivated: true} = User.get_by_nickname(user.nickname)
assert %{is_active: false} = User.get_by_nickname(user.nickname)
assert called(Pleroma.Web.Federator.publish(:_))
refute Pleroma.Repo.get(Pleroma.Activity, like_activity.id)
@ -167,11 +167,11 @@ defmodule Mix.Tasks.Pleroma.UserTest do
assert message =~ " deactivated"
user = User.get_cached_by_nickname(user.nickname)
assert user.deactivated
refute user.is_active
end
test "user is activated" do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
Mix.Tasks.Pleroma.User.run(["toggle_activated", user.nickname])
@ -179,7 +179,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
assert message =~ " activated"
user = User.get_cached_by_nickname(user.nickname)
refute user.deactivated
assert user.is_active
end
test "no user to toggle" do
@ -210,7 +210,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
user = User.get_cached_by_nickname(user.nickname)
assert Enum.empty?(Enum.filter(User.get_friends(user), & &1.local))
assert user.deactivated
refute user.is_active
end
test "no user to deactivate" do

32
test/pleroma/user_test.exs
View File

@ -202,11 +202,11 @@ defmodule Pleroma.UserTest do
test "doesn't return follow requests for deactivated accounts" do
locked = insert(:user, is_locked: true)
pending_follower = insert(:user, %{deactivated: true})
pending_follower = insert(:user, %{is_active: false})
CommonAPI.follow(pending_follower, locked)
assert true == pending_follower.deactivated
refute pending_follower.is_active
assert [] = User.get_follow_requests(locked)
end
@ -275,7 +275,7 @@ defmodule Pleroma.UserTest do
test "can't follow a deactivated users" do
user = insert(:user)
followed = insert(:user, %{deactivated: true})
followed = insert(:user, %{is_active: false})
{:error, _} = User.follow(user, followed)
end
@ -1316,11 +1316,11 @@ defmodule Pleroma.UserTest do
describe ".deactivate" do
test "can de-activate then re-activate a user" do
user = insert(:user)
assert false == user.deactivated
assert user.is_active
{:ok, user} = User.deactivate(user)
assert true == user.deactivated
refute user.is_active
{:ok, user} = User.deactivate(user, false)
assert false == user.deactivated
assert user.is_active
end
test "hide a user from followers" do
@ -1544,7 +1544,7 @@ defmodule Pleroma.UserTest do
follower = User.get_cached_by_id(follower.id)
refute User.following?(follower, user)
assert %{deactivated: true} = User.get_by_id(user.id)
assert %{is_active: false} = User.get_by_id(user.id)
assert [] == User.get_follow_requests(locked_user)
@ -1585,8 +1585,8 @@ defmodule Pleroma.UserTest do
{:ok, job} = User.delete(user)
{:ok, _} = ObanHelpers.perform(job)
assert %{deactivated: true} = User.get_cached_by_id(user.id)
assert %{deactivated: true} = User.get_by_id(user.id)
assert %{is_active: false} = User.get_cached_by_id(user.id)
assert %{is_active: false} = User.get_by_id(user.id)
end
end
@ -1622,7 +1622,7 @@ defmodule Pleroma.UserTest do
registration_reason: "ahhhhh",
confirmation_token: "qqqq",
domain_blocks: ["lain.com"],
deactivated: true,
is_active: false,
ap_enabled: true,
is_moderator: true,
is_admin: true,
@ -1664,7 +1664,7 @@ defmodule Pleroma.UserTest do
registration_reason: nil,
confirmation_token: nil,
domain_blocks: [],
deactivated: true,
is_active: false,
ap_enabled: false,
is_moderator: false,
is_admin: false,
@ -1750,7 +1750,7 @@ defmodule Pleroma.UserTest do
end
test "returns :deactivated for deactivated user" do
user = insert(:user, local: true, confirmation_pending: false, deactivated: true)
user = insert(:user, local: true, confirmation_pending: false, is_active: false)
assert User.account_status(user) == :deactivated
end
@ -1908,7 +1908,7 @@ defmodule Pleroma.UserTest do
users =
Enum.map(1..total, fn _ ->
insert(:user, last_digest_emailed_at: days_ago(20), deactivated: false)
insert(:user, last_digest_emailed_at: days_ago(20), is_active: true)
end)
inactive_users_ids =
@ -1926,7 +1926,7 @@ defmodule Pleroma.UserTest do
users =
Enum.map(1..total, fn _ ->
insert(:user, last_digest_emailed_at: days_ago(20), deactivated: false)
insert(:user, last_digest_emailed_at: days_ago(20), is_active: true)
end)
{inactive, active} = Enum.split(users, trunc(total / 2))
@ -1959,7 +1959,7 @@ defmodule Pleroma.UserTest do
users =
Enum.map(1..total, fn _ ->
insert(:user, last_digest_emailed_at: days_ago(20), deactivated: false)
insert(:user, last_digest_emailed_at: days_ago(20), is_active: true)
end)
[sender | recipients] = users
@ -2029,7 +2029,7 @@ defmodule Pleroma.UserTest do
user1 = insert(:user, local: false, ap_id: "http://localhost:4001/users/masto_closed")
user2 = insert(:user, local: false, ap_id: "http://localhost:4001/users/fuser2")
insert(:user, local: true)
insert(:user, local: false, deactivated: true)
insert(:user, local: false, is_active: false)
{:ok, user1: user1, user2: user2}
end

2
test/pleroma/web/activity_pub/side_effects/delete_test.exs
View File

@ -39,7 +39,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects.DeleteTest do
{:ok, _delete, _} = SideEffects.handle(delete)
ObanHelpers.perform_all()
assert User.get_cached_by_ap_id(user.ap_id).deactivated
refute User.get_cached_by_ap_id(user.ap_id).is_active
end
end

2
test/pleroma/web/activity_pub/side_effects_test.exs
View File

@ -170,7 +170,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
{:ok, _, _} = SideEffects.handle(delete)
ObanHelpers.perform_all()
assert User.get_cached_by_id(user.id).deactivated
refute User.get_cached_by_id(user.id).is_active
end
test "when activation is required", %{delete: delete, user: user} do

2
test/pleroma/web/activity_pub/transmogrifier/chat_message_test.exs
View File

@ -134,7 +134,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.ChatMessageTest do
ap_id: data["actor"],
local: false,
last_refreshed_at: DateTime.utc_now(),
deactivated: true
is_active: false
)
_recipient = insert(:user, ap_id: List.first(data["to"]), local: true)

2
test/pleroma/web/activity_pub/transmogrifier/delete_handling_test.exs
View File

@ -97,7 +97,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.DeleteHandlingTest do
{:ok, _} = Transmogrifier.handle_incoming(data)
ObanHelpers.perform_all()
assert User.get_cached_by_ap_id(ap_id).deactivated
refute User.get_cached_by_ap_id(ap_id).is_active
end
test "it fails for incoming user deletes with spoofed origin" do

2
test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
View File

@ -154,7 +154,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.NoteHandlingTest do
test "it does not work for deactivated users" do
data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()
insert(:user, ap_id: data["actor"], deactivated: true)
insert(:user, ap_id: data["actor"], is_active: false)
assert {:error, _} = Transmogrifier.handle_incoming(data)
end

2
test/pleroma/web/admin_api/controllers/status_controller_test.exs
View File

@ -47,7 +47,7 @@ defmodule Pleroma.Web.AdminAPI.StatusControllerTest do
assert account["id"] == actor.id
assert account["nickname"] == actor.nickname
assert account["deactivated"] == actor.deactivated
assert account["is_active"] == actor.is_active
assert account["confirmation_pending"] == actor.confirmation_pending
end
end

36
test/pleroma/web/admin_api/controllers/user_controller_test.exs
View File

@ -169,7 +169,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
assert user.note_count == 1
assert user.follower_count == 1
assert user.following_count == 1
refute user.deactivated
assert user.is_active
with_mock Pleroma.Web.Federator,
publish: fn _ -> nil end,
@ -181,7 +181,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
ObanHelpers.perform_all()
assert User.get_by_nickname(user.nickname).deactivated
refute User.get_by_nickname(user.nickname).is_active
log_entry = Repo.one(ModerationLog)
@ -191,7 +191,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
assert json_response(conn, 200) == [user.nickname]
user = Repo.get(User, user.id)
assert user.deactivated
refute user.is_active
assert user.avatar == %{}
assert user.banner == %{}
@ -621,7 +621,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
"roles" => %{"admin" => true, "moderator" => false}
}),
user_response(old_admin, %{
"deactivated" => false,
"is_active" => true,
"roles" => %{"admin" => true, "moderator" => false}
})
]
@ -694,11 +694,11 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
users =
[
user_response(admin, %{
"deactivated" => false,
"is_active" => true,
"roles" => %{"admin" => true, "moderator" => false}
}),
user_response(second_admin, %{
"deactivated" => false,
"is_active" => true,
"roles" => %{"admin" => true, "moderator" => false}
})
]
@ -723,7 +723,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
"page_size" => 50,
"users" => [
user_response(moderator, %{
"deactivated" => false,
"is_active" => true,
"roles" => %{"admin" => false, "moderator" => true}
})
]
@ -839,10 +839,10 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
test "it works with multiple filters" do
admin = insert(:user, nickname: "john", is_admin: true)
token = insert(:oauth_admin_token, user: admin)
user = insert(:user, nickname: "bob", local: false, deactivated: true)
user = insert(:user, nickname: "bob", local: false, is_active: false)
insert(:user, nickname: "ken", local: true, deactivated: true)
insert(:user, nickname: "bobb", local: false, deactivated: false)
insert(:user, nickname: "ken", local: true, is_active: false)
insert(:user, nickname: "bobb", local: false, is_active: true)
conn =
build_conn()
@ -873,8 +873,8 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
end
test "PATCH /api/pleroma/admin/users/activate", %{admin: admin, conn: conn} do
user_one = insert(:user, deactivated: true)
user_two = insert(:user, deactivated: true)
user_one = insert(:user, is_active: false)
user_two = insert(:user, is_active: false)
conn =
patch(
@ -884,7 +884,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
)
response = json_response(conn, 200)
assert Enum.map(response["users"], & &1["deactivated"]) == [false, false]
assert Enum.map(response["users"], & &1["is_active"]) == [true, true]
log_entry = Repo.one(ModerationLog)
@ -893,8 +893,8 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
end
test "PATCH /api/pleroma/admin/users/deactivate", %{admin: admin, conn: conn} do
user_one = insert(:user, deactivated: false)
user_two = insert(:user, deactivated: false)
user_one = insert(:user, is_active: true)
user_two = insert(:user, is_active: true)
conn =
patch(
@ -904,7 +904,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
)
response = json_response(conn, 200)
assert Enum.map(response["users"], & &1["deactivated"]) == [true, true]
assert Enum.map(response["users"], & &1["is_active"]) == [false, false]
log_entry = Repo.one(ModerationLog)
@ -940,7 +940,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
assert json_response(conn, 200) ==
user_response(
user,
%{"deactivated" => !user.deactivated}
%{"is_active" => user.is_active}
)
log_entry = Repo.one(ModerationLog)
@ -951,7 +951,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
defp user_response(user, attrs \\ %{}) do
%{
"deactivated" => user.deactivated,
"is_active" => user.is_active,
"id" => user.id,
"email" => user.email,
"nickname" => user.nickname,

8
test/pleroma/web/admin_api/search_test.exs
View File

@ -47,9 +47,9 @@ defmodule Pleroma.Web.AdminAPI.SearchTest do
end
test "it returns active/deactivated users" do
insert(:user, deactivated: true)
insert(:user, deactivated: true)
insert(:user, deactivated: false)
insert(:user, is_active: false)
insert(:user, is_active: false)
insert(:user, is_active: true)
{:ok, _results, active_count} =
Search.user(%{
@ -70,7 +70,7 @@ defmodule Pleroma.Web.AdminAPI.SearchTest do
test "it returns specific user" do
insert(:user)
insert(:user)
user = insert(:user, nickname: "bob", local: true, deactivated: false)
user = insert(:user, nickname: "bob", local: true, is_active: true)
{:ok, _results, total_count} = Search.user(%{query: ""})

2
test/pleroma/web/common_api_test.exs
View File

@ -518,7 +518,7 @@ defmodule Pleroma.Web.CommonAPITest do
end
test "deactivated users can't post" do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
assert {:error, _} = CommonAPI.post(user, %{status: "ye"})
end

4
test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
View File

@ -126,7 +126,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
end
test "returns 404 for deactivated user", %{conn: conn} do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
assert %{"error" => "Can't find user"} =
conn
@ -256,7 +256,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
end
test "deactivated user", %{conn: conn} do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
assert %{"error" => "Can't find user"} ==
conn

2
test/pleroma/web/mastodon_api/controllers/auth_controller_test.exs
View File

@ -136,7 +136,7 @@ defmodule Pleroma.Web.MastodonAPI.AuthControllerTest do
end
test "it returns 204 when user is deactivated", %{conn: conn, user: user} do
{:ok, user} = Repo.update(Ecto.Changeset.change(user, deactivated: true, local: true))
{:ok, user} = Repo.update(Ecto.Changeset.change(user, is_active: false, local: true))
conn = post(conn, "/auth/password?email=#{user.email}")
assert empty_json_response(conn)

2
test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs
View File

@ -57,7 +57,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceControllerTest do
user = insert(:user, %{local: true})
user2 = insert(:user, %{local: true})
{:ok, _user2} = User.deactivate(user2, !user2.deactivated)
{:ok, _user2} = User.deactivate(user2, user2.is_active)
insert(:user, %{local: false, nickname: "u@peer1.com"})
insert(:user, %{local: false, nickname: "u@peer2.com"})

2
test/pleroma/web/mastodon_api/mastodon_api_test.exs
View File

@ -16,7 +16,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPITest do
describe "follow/3" do
test "returns error when followed user is deactivated" do
follower = insert(:user)
user = insert(:user, local: true, deactivated: true)
user = insert(:user, local: true, is_active: false)
assert {:error, _error} = MastodonAPI.follow(follower, user)
end

2
test/pleroma/web/mastodon_api/views/account_view_test.exs
View File

@ -211,7 +211,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
test "Represent a deactivated user for an admin" do
admin = insert(:user, is_admin: true)
deactivated_user = insert(:user, deactivated: true)
deactivated_user = insert(:user, is_active: false)
represented = AccountView.render("show.json", %{user: deactivated_user, for: admin})
assert represented[:pleroma][:deactivated] == true
end

4
test/pleroma/web/mongoose_im_controller_test.exs
View File

@ -9,7 +9,7 @@ defmodule Pleroma.Web.MongooseIMControllerTest do
test "/user_exists", %{conn: conn} do
_user = insert(:user, nickname: "lain")
_remote_user = insert(:user, nickname: "alice", local: false)
_deactivated_user = insert(:user, nickname: "konata", deactivated: true)
_deactivated_user = insert(:user, nickname: "konata", is_active: false)
res =
conn
@ -46,7 +46,7 @@ defmodule Pleroma.Web.MongooseIMControllerTest do
_deactivated_user =
insert(:user,
nickname: "konata",
deactivated: true,
is_active: false,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt("cool")
)

2
test/pleroma/web/o_auth/o_auth_controller_test.exs
View File

@ -956,7 +956,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
user =
insert(:user,
password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password),
deactivated: true
is_active: false
)
app = insert(:oauth_app)

2
test/pleroma/web/plugs/user_enabled_plug_test.exs
View File

@ -33,7 +33,7 @@ defmodule Pleroma.Web.Plugs.UserEnabledPlugTest do
end
test "with a user that is deactivated, it removes that user", %{conn: conn} do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
conn =
conn

2
test/pleroma/web/twitter_api/remote_follow_controller_test.exs
View File

@ -141,7 +141,7 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
end
test "returns error when user is deactivated", %{conn: conn} do
user = insert(:user, deactivated: true)
user = insert(:user, is_active: false)
user2 = insert(:user)
response =

6
test/pleroma/web/twitter_api/util_controller_test.exs
View File

@ -164,7 +164,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
user = User.get_cached_by_id(user.id)
assert user.deactivated == true
refute user.is_active
end
test "with valid permissions and invalid password, it returns an error", %{conn: conn} do
@ -178,7 +178,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
assert response == %{"error" => "Invalid password."}
user = User.get_cached_by_id(user.id)
refute user.deactivated
assert user.is_active
end
end
@ -428,7 +428,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
assert json_response(conn, 200) == %{"status" => "success"}
user = User.get_by_id(user.id)
assert user.deactivated == true
refute user.is_active
assert user.name == nil
assert user.bio == ""
assert user.password_hash == nil