X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Fuser.ex;h=7b0edee75d3728d2283dff4a5f02a9e9eeda2abc;hb=756764266cb5319a775845635b91b04aacf16aae;hp=7336e85408ba568fe21d3ddc76c96d930cb5cef0;hpb=47d883d3abb4d64721b2a8ed925021dfeeaa4459;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 7336e8540..7b0edee75 100644
--- 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)
-    embeds_one :info, Pleroma.User.Info
+    embeds_one(:info, Pleroma.User.Info)
 
     timestamps()
   end
@@ -411,22 +411,23 @@ defmodule Pleroma.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(cs)
+    update_and_set_cache(cng)
   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(cs)
+    update_and_set_cache(cng)
   end
 
   def update_note_count(%User{} = user) do
@@ -457,11 +458,15 @@ defmodule Pleroma.User do
 
     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(cs)
+    update_and_set_cache(cng)
   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)
-    cng = change(user)
-    |> put_embed(:info, info_cng)
+
+    cng =
+      change(user)
+      |> put_embed(:info, info_cng)
 
     update_and_set_cache(cng)
   end