X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=f28f0deb0cad55c2b418f444cef94b28522f77e3;hb=2eba8e74ccf2de0ad65b213bb166917c32db9d68;hp=af0e569a49f2280f51df92ac8d2899146eb4765f;hpb=396c32a6da5d028675b2d3c4154ac9045596ad31;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index af0e569a4..f28f0deb0 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -54,18 +54,10 @@ defmodule Pleroma.User do
   end
 
   def user_info(%User{} = user) do
-    note_count_query = from a in Object,
-      where: fragment("? @> ?", a.data, ^%{actor: user.ap_id, type: "Note"}),
-      select: count(a.id)
-
-    follower_count_query = from u in User,
-      where: fragment("? @> ?", u.following, ^user.follower_address),
-      select: count(u.id)
-
     %{
       following_count: length(user.following),
-      note_count: Repo.one(note_count_query),
-      follower_count: Repo.one(follower_count_query)
+      note_count: user.info["note_count"] || 0,
+      follower_count: user.info["follower_count"] || 0
     }
   end
 
@@ -127,9 +119,13 @@ defmodule Pleroma.User do
       following = [ap_followers | follower.following]
       |> Enum.uniq
 
-      follower
+      follower = follower
       |> follow_changeset(%{following: following})
       |> Repo.update
+
+      {:ok, followed} = update_follower_count(followed)
+
+      follower
     end
   end
 
@@ -142,7 +138,10 @@ defmodule Pleroma.User do
       { :ok, follower } = follower
       |> follow_changeset(%{following: following})
       |> Repo.update
-      { :ok, follower, Utils.fetch_latest_follow(follower, followed)}
+
+      {:ok, followed} = update_follower_count(followed)
+
+      {:ok, follower, Utils.fetch_latest_follow(follower, followed)}
     else
       {:error, "Not subscribed!"}
     end
@@ -186,4 +185,49 @@ defmodule Pleroma.User do
       end
     end
   end
+
+  # TODO: these queries could be more efficient if the type in postgresql wasn't map, but array.
+  def get_followers(%User{id: id, follower_address: follower_address}) do
+    q = from u in User,
+      where: fragment("? @> ?", u.following, ^follower_address ),
+      where: u.id != ^id
+
+    {:ok, Repo.all(q)}
+  end
+
+  def get_friends(%User{id: id, following: following}) do
+    q = from u in User,
+      where: u.follower_address in ^following,
+      where: u.id != ^id
+
+    {:ok, Repo.all(q)}
+  end
+
+  def update_note_count(%User{} = user) do
+    note_count_query = from a in Object,
+      where: fragment("? @> ?", a.data, ^%{actor: user.ap_id, type: "Note"}),
+      select: count(a.id)
+
+    note_count = Repo.one(note_count_query)
+
+    new_info = Map.put(user.info, "note_count", note_count)
+
+    cs = info_changeset(user, %{info: new_info})
+
+    Repo.update(cs)
+  end
+
+  def update_follower_count(%User{} = user) do
+    follower_count_query = from u in User,
+      where: fragment("? @> ?", u.following, ^user.follower_address),
+      select: count(u.id)
+
+    follower_count = Repo.one(follower_count_query)
+
+    new_info = Map.put(user.info, "follower_count", follower_count)
+
+    cs = info_changeset(user, %{info: new_info})
+
+    Repo.update(cs)
+  end
 end