X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=c98b942ff317335e47fe05d4d44233467480ccbe;hb=e278d470232f4e8081bbbe358137400074673e75;hp=9a774e7b7da9e793ab16ce44c7216c1cfb00026c;hpb=f41f017bbca232c2ab3cd41ad23ef95d5ad13e36;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 9a774e7b7..c98b942ff 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -273,7 +273,7 @@ defmodule Pleroma.User do
          Pleroma.Config.get([:instance, :account_activation_required]) do
       user
       |> Pleroma.UserEmail.account_confirmation_email()
-      |> Pleroma.Mailer.deliver()
+      |> Pleroma.Mailer.deliver_async()
     else
       {:ok, :noop}
     end
@@ -888,26 +888,28 @@ defmodule Pleroma.User do
     )
   end
 
-  def mute(muter, %User{ap_id: ap_id} = muted) do
-    if following?(muter, muter) do
-      unfollow(muter, muter)
-    end
+  def mute(muter, %User{ap_id: ap_id}) do
+    info_cng =
+      muter.info
+      |> User.Info.add_to_mutes(ap_id)
 
-    mutes = muter.info["mutes"] || []
-    new_mutes = Enum.uniq([ap_id | mutes])
-    new_info = Map.put(muter.info, "mutes", new_mutes)
+    cng =
+      change(muter)
+      |> put_embed(:info, info_cng)
 
-    cs = User.info_changeset(muter, %{info: new_info})
-    update_and_set_cache(cs)
+    update_and_set_cache(cng)
   end
 
-  def unmute(user, %{ap_id: ap_id}) do
-    mutes = user.info["mutes"] || []
-    new_mutes = List.delete(mutes, ap_id)
-    new_info = Map.put(user.info, "mutes", new_mutes)
+  def unmute(muter, %{ap_id: ap_id}) do
+    info_cng =
+      muter.info
+      |> User.Info.remove_from_mutes(ap_id)
+
+    cng =
+      change(muter)
+      |> put_embed(:info, info_cng)
 
-    cs = User.info_changeset(user, %{info: new_info})
-    update_and_set_cache(cs)
+    update_and_set_cache(cng)
   end
 
   def block(blocker, %User{ap_id: ap_id} = blocked) do
@@ -952,7 +954,7 @@ defmodule Pleroma.User do
     update_and_set_cache(cng)
   end
 
-  def mutes?(user, %{ap_id: ap_id}), do: Enum.member?(user.info["mutes"] || [], ap_id)
+  def mutes?(user, %{ap_id: ap_id}), do: Enum.member?(user.info.mutes, ap_id)
 
   def blocks?(user, %{ap_id: ap_id}) do
     blocks = user.info.blocks
@@ -965,6 +967,9 @@ defmodule Pleroma.User do
       end)
   end
 
+  def muted_users(user),
+    do: Repo.all(from(u in User, where: u.ap_id in ^user.info.mutes))
+
   def blocked_users(user),
     do: Repo.all(from(u in User, where: u.ap_id in ^user.info.blocks))
 
@@ -1279,4 +1284,13 @@ defmodule Pleroma.User do
       inserted_at: NaiveDateTime.utc_now()
     }
   end
+
+  def all_superusers do
+    from(
+      u in User,
+      where: u.local == true,
+      where: fragment("?->'is_admin' @> 'true' OR ?->'is_moderator' @> 'true'", u.info, u.info)
+    )
+    |> Repo.all()
+  end
 end