X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fstats.ex;h=5f8130ff88a024b73fa51ea06a76cf0e2761fde5;hb=457e0404737e02a49c68c1875ff3171e4c43dde0;hp=45fa27b557755fa7c61bc664e9750e329d49ea4f;hpb=9717166d105cec6f9c878653aec2d409265e80a6;p=akkoma

diff --git a/lib/pleroma/stats.ex b/lib/pleroma/stats.ex
index 45fa27b55..5f8130ff8 100644
--- a/lib/pleroma/stats.ex
+++ b/lib/pleroma/stats.ex
@@ -1,38 +1,41 @@
 defmodule Pleroma.Stats do
-  use Agent
   import Ecto.Query
   alias Pleroma.{User, Repo, Activity}
 
   def start_link do
-    agent = Agent.start_link(fn -> %{} end, name: __MODULE__)
-    schedule_update()
+    agent = Agent.start_link(fn -> {[], %{}} end, name: __MODULE__)
+    spawn(fn -> schedule_update() end)
     agent
   end
 
-  def get do
-    Agent.get(__MODULE__, fn stats -> stats end)
+  def get_stats do
+    Agent.get(__MODULE__, fn {_, stats} -> stats end)
+  end
+
+  def get_peers do
+    Agent.get(__MODULE__, fn {peers, _} -> peers end)
   end
 
   def schedule_update do
-    update_stats()
     spawn(fn ->
       Process.sleep(1000 * 60 * 60 * 1) # 1 hour
       schedule_update()
     end)
+    update_stats()
   end
 
   def update_stats do
     peers = from(u in Pleroma.User,
-      select: fragment("?->'host'", u.info),
+      select: fragment("distinct ?->'host'", u.info),
       where: u.local != ^true)
-    |> Repo.all() |> Enum.uniq()
+    |> Repo.all()
     domain_count = Enum.count(peers)
-    status_query = from p in Activity,
-      where: p.local == ^true,
-      where: fragment("?->'object'->>'type' = ?", p.data, ^"Note")
-    status_count = Repo.aggregate(status_query, :count, :id)
+    status_query = from(u in User.local_user_query,
+      select: fragment("sum((?->>'note_count')::int)", u.info))
+    status_count = Repo.one(status_query)
+    user_count = Repo.aggregate(User.local_user_query, :count, :id)
     Agent.update(__MODULE__, fn _ ->
-      %{peers: peers, domain_count: domain_count, status_count: status_count}
+      {peers, %{domain_count: domain_count, status_count: status_count, user_count: user_count}}
     end)
   end
 end