projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change user.locked field to user.is_locked
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 410c9cbac1a67cd78fd0c13a6098c66e16262d4e..87c8bfbd11d7f50f83295cb6cde45ad3e7aea8be 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-107,7
+107,7
@@
defmodule Pleroma.User do
field(:note_count, :integer, default: 0)
field(:follower_count, :integer, default: 0)
field(:following_count, :integer, default: 0)
field(:note_count, :integer, default: 0)
field(:follower_count, :integer, default: 0)
field(:following_count, :integer, default: 0)
- field(:locked, :boolean, default: false)
+ field(:
is_
locked, :boolean, default: false)
field(:confirmation_pending, :boolean, default: false)
field(:password_reset_pending, :boolean, default: false)
field(:approval_pending, :boolean, default: false)
field(:confirmation_pending, :boolean, default: false)
field(:password_reset_pending, :boolean, default: false)
field(:approval_pending, :boolean, default: false)
@@
-436,7
+436,7
@@
defmodule Pleroma.User do
:avatar,
:ap_enabled,
:banner,
:avatar,
:ap_enabled,
:banner,
- :locked,
+ :
is_
locked,
:last_refreshed_at,
:uri,
:follower_address,
:last_refreshed_at,
:uri,
:follower_address,
@@
-479,7
+479,7
@@
defmodule Pleroma.User do
:public_key,
:inbox,
:shared_inbox,
:public_key,
:inbox,
:shared_inbox,
- :locked,
+ :
is_
locked,
:no_rich_text,
:default_scope,
:banner,
:no_rich_text,
:default_scope,
:banner,
@@
-813,7
+813,8
@@
defmodule Pleroma.User do
def send_welcome_email(_), do: {:ok, :noop}
@spec try_send_confirmation_email(User.t()) :: {:ok, :enqueued | :noop}
def send_welcome_email(_), do: {:ok, :noop}
@spec try_send_confirmation_email(User.t()) :: {:ok, :enqueued | :noop}
- def try_send_confirmation_email(%User{confirmation_pending: true} = user) do
+ def try_send_confirmation_email(%User{confirmation_pending: true, email: email} = user)
+ when is_binary(email) do
if Config.get([:instance, :account_activation_required]) do
send_confirmation_email(user)
{:ok, :enqueued}
if Config.get([:instance, :account_activation_required]) do
send_confirmation_email(user)
{:ok, :enqueued}
@@
-846,7
+847,7
@@
defmodule Pleroma.User do
@spec maybe_direct_follow(User.t(), User.t()) :: {:ok, User.t()} | {:error, String.t()}
# "Locked" (self-locked) users demand explicit authorization of follow requests
@spec maybe_direct_follow(User.t(), User.t()) :: {:ok, User.t()} | {:error, String.t()}
# "Locked" (self-locked) users demand explicit authorization of follow requests
- def maybe_direct_follow(%User{} = follower, %User{local: true, locked: true} = followed) do
+ def maybe_direct_follow(%User{} = follower, %User{local: true,
is_
locked: true} = followed) do
follow(follower, followed, :follow_pending)
end
follow(follower, followed, :follow_pending)
end
@@
-914,9
+915,7
@@
defmodule Pleroma.User do
FollowingRelationship.unfollow(follower, followed)
{:ok, followed} = update_follower_count(followed)
FollowingRelationship.unfollow(follower, followed)
{:ok, followed} = update_follower_count(followed)
- {:ok, follower} =
- follower
- |> update_following_count()
+ {:ok, follower} = update_following_count(follower)
{:ok, follower, followed}
{:ok, follower, followed}
@@
-955,7
+954,7
@@
defmodule Pleroma.User do
end
def locked?(%User{} = user) do
end
def locked?(%User{} = user) do
- user.locked || false
+ user.
is_
locked || false
end
def get_by_id(id) do
end
def get_by_id(id) do
@@
-1602,7
+1601,7
@@
defmodule Pleroma.User do
note_count: 0,
follower_count: 0,
following_count: 0,
note_count: 0,
follower_count: 0,
following_count: 0,
- locked: false,
+
is_
locked: false,
confirmation_pending: false,
password_reset_pending: false,
approval_pending: false,
confirmation_pending: false,
password_reset_pending: false,
approval_pending: false,
@@
-2071,6
+2070,13
@@
defmodule Pleroma.User do
Enum.map(users, &toggle_confirmation/1)
end
Enum.map(users, &toggle_confirmation/1)
end
+ @spec need_confirmation(User.t(), boolean()) :: {:ok, User.t()} | {:error, Changeset.t()}
+ def need_confirmation(%User{} = user, bool) do
+ user
+ |> confirmation_changeset(need_confirmation: bool)
+ |> update_and_set_cache()
+ end
+
def get_mascot(%{mascot: %{} = mascot}) when not is_nil(mascot) do
mascot
end
def get_mascot(%{mascot: %{} = mascot}) when not is_nil(mascot) do
mascot
end
@@
-2285,7
+2291,9
@@
defmodule Pleroma.User do
# if pinned activity was scheduled for deletion, we reschedule it for deletion
if data["expires_at"] do
# if pinned activity was scheduled for deletion, we reschedule it for deletion
if data["expires_at"] do
- {:ok, expires_at, _} = DateTime.from_iso8601(data["expires_at"])
+ # MRF.ActivityExpirationPolicy used UTC timestamps for expires_at in original implementation
+ {:ok, expires_at} =
+ data["expires_at"] |> Pleroma.EctoType.ActivityPub.ObjectValidators.DateTime.cast()
Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
activity_id: id,
Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
activity_id: id,