X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=68ffe184b7b36fa031ecdbca12259fd88ec5609e;hb=4524721fba0582774b7c38fdc1f270c43fd8d53b;hp=59d4fb839f4254eba5c039187871555b547e5d12;hpb=4db5954786b60df84b833feb360fd8c81be956d9;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 59d4fb839..68ffe184b 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -265,6 +265,7 @@ defmodule Pleroma.User do
   def update_follower_count(%User{} = user) do
     follower_count_query = from u in User,
       where: fragment("? @> ?", u.following, ^user.follower_address),
+      where: u.id != ^user.id,
       select: count(u.id)
 
     follower_count = Repo.one(follower_count_query)
@@ -286,12 +287,12 @@ defmodule Pleroma.User do
 
   def get_recipients_from_activity(%Activity{data: %{"to" => to}}) do
     query = from u in User,
-      where: u.local == true
-
-    query = from u in query,
       where: u.ap_id in ^to,
       or_where: fragment("? \\\?| ?", u.following, ^to)
 
+    query = from u in query,
+      where: u.local == true
+
     Repo.all(query)
   end