projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting.
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index 7336e85408ba568fe21d3ddc76c96d930cb5cef0..7b0edee75d3728d2283dff4a5f02a9e9eeda2abc 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-23,7
+23,7
@@
defmodule Pleroma.User do
field(:search_distance, :float, virtual: true)
field(:last_refreshed_at, :naive_datetime)
has_many(:notifications, Notification)
field(:search_distance, :float, virtual: true)
field(:last_refreshed_at, :naive_datetime)
has_many(:notifications, Notification)
- embeds_one
:info, Pleroma.User.Info
+ embeds_one
(:info, Pleroma.User.Info)
timestamps()
end
timestamps()
end
@@
-411,22
+411,23
@@
defmodule Pleroma.User do
end
def increase_note_count(%User{} = user) do
end
def increase_note_count(%User{} = user) do
- note_count = (user.info["note_count"] || 0) + 1
- new_info = Map.put(user.info, "note_count", note_count)
+ info_cng = User.Info.add_to_note_count(user.info, 1)
- cs = info_changeset(user, %{info: new_info})
+ cng =
+ change(user)
+ |> put_embed(:info, info_cng)
- update_and_set_cache(c
s
)
+ update_and_set_cache(c
ng
)
end
def decrease_note_count(%User{} = user) do
end
def decrease_note_count(%User{} = user) do
- note_count = user.info["note_count"] || 0
- note_count = if note_count <= 0, do: 0, else: note_count - 1
- new_info = Map.put(user.info, "note_count", note_count)
+ info_cng = User.Info.add_to_note_count(user.info, -1)
- cs = info_changeset(user, %{info: new_info})
+ cng =
+ change(user)
+ |> put_embed(:info, info_cng)
- update_and_set_cache(c
s
)
+ update_and_set_cache(c
ng
)
end
def update_note_count(%User{} = user) do
end
def update_note_count(%User{} = user) do
@@
-457,11
+458,15
@@
defmodule Pleroma.User do
follower_count = Repo.one(follower_count_query)
follower_count = Repo.one(follower_count_query)
- new_info = Map.put(user.info, "follower_count", follower_count)
+ info_cng =
+ user.info
+ |> User.Info.set_follower_count(follower_count)
- cs = info_changeset(user, %{info: new_info})
+ cng =
+ change(user)
+ |> put_embed(:info, info_cng)
- update_and_set_cache(c
s
)
+ update_and_set_cache(c
ng
)
end
def get_users_from_set_query(ap_ids, false) do
end
def get_users_from_set_query(ap_ids, false) do
@@
-614,8
+619,10
@@
defmodule Pleroma.User do
def deactivate(%User{} = user, status \\ true) do
info_cng = User.Info.set_activation_status(user.info, status)
def deactivate(%User{} = user, status \\ true) do
info_cng = User.Info.set_activation_status(user.info, status)
- cng = change(user)
- |> put_embed(:info, info_cng)
+
+ cng =
+ change(user)
+ |> put_embed(:info, info_cng)
update_and_set_cache(cng)
end
update_and_set_cache(cng)
end