aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex112
-rw-r--r--lib/pleroma/user_mute.ex71
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex6
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/account_controller.ex8
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex4
-rw-r--r--lib/pleroma/web/streamer/worker.ex3
6 files changed, 161 insertions, 43 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 9dd1ad8fc..383c45992 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -23,6 +23,7 @@ defmodule Pleroma.User do
alias Pleroma.RepoStreamer
alias Pleroma.User
alias Pleroma.UserBlock
+ alias Pleroma.UserMute
alias Pleroma.Web
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
@@ -119,11 +120,17 @@ defmodule Pleroma.User do
has_many(:notifications, Notification)
has_many(:registrations, Registration)
has_many(:deliveries, Delivery)
+
has_many(:blocker_blocks, UserBlock, foreign_key: :blocker_id)
has_many(:blockee_blocks, UserBlock, foreign_key: :blockee_id)
has_many(:blocked_users, through: [:blocker_blocks, :blockee])
has_many(:blocker_users, through: [:blockee_blocks, :blocker])
+ has_many(:muter_mutes, UserMute, foreign_key: :muter_id)
+ has_many(:mutee_mutes, UserMute, foreign_key: :mutee_id)
+ has_many(:muted_users, through: [:muter_mutes, :mutee])
+ has_many(:muter_users, through: [:mutee_mutes, :muter])
+
field(:info, :map, default: %{})
# `:blocks` is deprecated (replaced with `blocked_users` relation)
@@ -968,12 +975,12 @@ defmodule Pleroma.User do
end
@spec mute(User.t(), User.t(), boolean()) :: {:ok, User.t()} | {:error, String.t()}
- def mute(muter, %User{ap_id: ap_id}, notifications? \\ true) do
- add_to_mutes(muter, ap_id, notifications?)
+ def mute(muter, %User{} = mutee, notifications? \\ true) do
+ add_to_mutes(muter, mutee, notifications?)
end
- def unmute(muter, %{ap_id: ap_id}) do
- remove_from_mutes(muter, ap_id)
+ def unmute(muter, %User{} = mutee) do
+ remove_from_mutes(muter, mutee)
end
def subscribe(subscriber, %{ap_id: ap_id}) do
@@ -1041,7 +1048,11 @@ defmodule Pleroma.User do
end
def mutes?(nil, _), do: false
- def mutes?(user, %{ap_id: ap_id}), do: Enum.member?(user.mutes, ap_id)
+ def mutes?(%User{} = user, %User{} = target), do: mutes_user?(user, target)
+
+ def mutes_user?(%User{} = user, %User{} = target) do
+ UserMute.exists?(user, target)
+ end
@spec muted_notifications?(User.t() | nil, User.t() | map()) :: boolean()
def muted_notifications?(nil, _), do: false
@@ -1049,17 +1060,17 @@ defmodule Pleroma.User do
def muted_notifications?(user, %{ap_id: ap_id}),
do: Enum.member?(user.muted_notifications, ap_id)
+ def blocks?(nil, _), do: false
+
def blocks?(%User{} = user, %User{} = target) do
- blocks_ap_id?(user, target) || blocks_domain?(user, target)
+ blocks_user?(user, target) || blocks_domain?(user, target)
end
- def blocks?(nil, _), do: false
-
- def blocks_ap_id?(%User{} = user, %User{} = target) do
+ def blocks_user?(%User{} = user, %User{} = target) do
UserBlock.exists?(user, target)
end
- def blocks_ap_id?(_, _), do: false
+ def blocks_user?(_, _), do: false
def blocks_domain?(%User{} = user, %User{} = target) do
domain_blocks = Pleroma.Web.ActivityPub.MRF.subdomains_regex(user.domain_blocks)
@@ -1077,7 +1088,16 @@ defmodule Pleroma.User do
@spec muted_users(User.t()) :: [User.t()]
def muted_users(user) do
- User.Query.build(%{ap_id: user.mutes, deactivated: false})
+ user
+ |> assoc(:muted_users)
+ |> restrict_deactivated()
+ |> Repo.all()
+ end
+
+ def muted_ap_ids(user) do
+ user
+ |> assoc(:muted_users)
+ |> select([u], u.ap_id)
|> Repo.all()
end
@@ -1096,6 +1116,35 @@ defmodule Pleroma.User do
|> Repo.all()
end
+ defp related_ap_ids_sql(join_table, source_column, target_column) do
+ "(SELECT array_agg(u.ap_id) FROM users as u " <>
+ "INNER JOIN #{join_table} AS join_table " <>
+ "ON join_table.#{source_column} = $1 " <>
+ "WHERE u.id = join_table.#{target_column})"
+ end
+
+ @related_ap_ids_sql_params %{
+ blocked_users: ["user_blocks", "blocker_id", "blockee_id"],
+ muted_users: ["user_mutes", "muter_id", "mutee_id"]
+ }
+
+ def related_ap_ids(user, relations) when is_list(relations) do
+ query =
+ relations
+ |> Enum.map(fn r -> @related_ap_ids_sql_params[r] end)
+ |> Enum.filter(& &1)
+ |> Enum.map(fn [join_table, source_column, target_column] ->
+ related_ap_ids_sql(join_table, source_column, target_column)
+ end)
+ |> Enum.join(", ")
+
+ with {:ok, %{rows: [ap_ids_arrays]}} <-
+ Repo.query("SELECT #{query}", [FlakeId.from_string(user.id)]) do
+ ap_ids_arrays = Enum.map(ap_ids_arrays, &(&1 || []))
+ {:ok, ap_ids_arrays}
+ end
+ end
+
@spec subscribers(User.t()) :: [User.t()]
def subscribers(user) do
User.Query.build(%{ap_id: user.subscribers, deactivated: false})
@@ -1877,32 +1926,27 @@ defmodule Pleroma.User do
UserBlock.delete(user, blocked)
end
- defp set_mutes(user, mutes) do
- params = %{mutes: mutes}
-
- user
- |> cast(params, [:mutes])
- |> validate_required([:mutes])
- |> update_and_set_cache()
- end
-
- def add_to_mutes(user, muted, notifications?) do
- with {:ok, user} <- set_mutes(user, Enum.uniq([muted | user.mutes])) do
- set_notification_mutes(
- user,
- Enum.uniq([muted | user.muted_notifications]),
- notifications?
- )
+ defp add_to_mutes(%User{} = user, %User{ap_id: ap_id} = muted_user, notifications?) do
+ with {:ok, user_mute} <- UserMute.create(user, muted_user),
+ {:ok, _user} <-
+ set_notification_mutes(
+ user,
+ Enum.uniq([ap_id | user.muted_notifications]),
+ notifications?
+ ) do
+ {:ok, user_mute}
end
end
- def remove_from_mutes(user, muted) do
- with {:ok, user} <- set_mutes(user, List.delete(user.mutes, muted)) do
- set_notification_mutes(
- user,
- List.delete(user.muted_notifications, muted),
- true
- )
+ defp remove_from_mutes(user, %User{ap_id: ap_id} = muted_user) do
+ with {:ok, user_mute} <- UserMute.delete(user, muted_user),
+ {:ok, _user} <-
+ set_notification_mutes(
+ user,
+ List.delete(user.muted_notifications, ap_id),
+ true
+ ) do
+ {:ok, user_mute}
end
end
diff --git a/lib/pleroma/user_mute.ex b/lib/pleroma/user_mute.ex
new file mode 100644
index 000000000..417a5ff84
--- /dev/null
+++ b/lib/pleroma/user_mute.ex
@@ -0,0 +1,71 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.UserMute do
+ use Ecto.Schema
+
+ import Ecto.Changeset
+ import Ecto.Query
+
+ alias Pleroma.Repo
+ alias Pleroma.User
+ alias Pleroma.UserMute
+
+ schema "user_mutes" do
+ belongs_to(:muter, User, type: FlakeId.Ecto.CompatType)
+ belongs_to(:mutee, User, type: FlakeId.Ecto.CompatType)
+
+ timestamps(updated_at: false)
+ end
+
+ def changeset(%UserMute{} = user_mute, params \\ %{}) do
+ user_mute
+ |> cast(params, [:muter_id, :mutee_id])
+ |> validate_required([:muter_id, :mutee_id])
+ |> unique_constraint(:mutee_id, name: :user_mutes_muter_id_mutee_id_index)
+ |> validate_not_self_mute()
+ end
+
+ def exists?(%User{} = muter, %User{} = mutee) do
+ UserMute
+ |> where(muter_id: ^muter.id, mutee_id: ^mutee.id)
+ |> Repo.exists?()
+ end
+
+ def create(%User{} = muter, %User{} = mutee) do
+ %UserMute{}
+ |> changeset(%{muter_id: muter.id, mutee_id: mutee.id})
+ |> Repo.insert(
+ on_conflict: :replace_all_except_primary_key,
+ conflict_target: [:muter_id, :mutee_id]
+ )
+ end
+
+ def delete(%User{} = muter, %User{} = mutee) do
+ attrs = %{muter_id: muter.id, mutee_id: mutee.id}
+
+ case Repo.get_by(UserMute, attrs) do
+ %UserMute{} = existing_record -> Repo.delete(existing_record)
+ nil -> {:ok, nil}
+ end
+ end
+
+ defp validate_not_self_mute(%Ecto.Changeset{} = changeset) do
+ changeset
+ |> validate_change(:mutee_id, fn _, mutee_id ->
+ if mutee_id == get_field(changeset, :muter_id) do
+ [mutee_id: "can't be equal to muter_id"]
+ else
+ []
+ end
+ end)
+ |> validate_change(:muter_id, fn _, muter_id ->
+ if muter_id == get_field(changeset, :mutee_id) do
+ [muter_id: "can't be equal to mutee_id"]
+ else
+ []
+ end
+ end)
+ end
+end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 82203ef5c..cba2abfc3 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -858,7 +858,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_muted(query, %{"with_muted" => val}) when val in [true, "true", "1"], do: query
defp restrict_muted(query, %{"muting_user" => %User{} = user} = opts) do
- mutes = user.mutes
+ mutes = opts["muted_ap_ids"] || User.muted_ap_ids(user)
query =
from([activity] in query,
@@ -875,8 +875,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_muted(query, _), do: query
- defp restrict_blocked(query, %{"blocking_user" => %User{} = user}) do
- blocked_ap_ids = User.blocked_ap_ids(user)
+ defp restrict_blocked(query, %{"blocking_user" => %User{} = user} = opts) do
+ blocked_ap_ids = opts["blocked_ap_ids"] || User.blocked_ap_ids(user)
domain_blocks = user.domain_blocks || []
query =
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 7c94a35d9..e37d3bb07 100644
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -323,7 +323,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
def mute(%{assigns: %{user: muter, account: muted}} = conn, params) do
notifications? = params |> Map.get("notifications", true) |> truthy_param?()
- with {:ok, muter} <- User.mute(muter, muted, notifications?) do
+ with {:ok, _user_mute} <- User.mute(muter, muted, notifications?) do
+ # TODO: remove `muter` refresh once `muted_notifications` field is deprecated
+ muter = User.get_cached_by_id(muter.id)
render(conn, "relationship.json", user: muter, target: muted)
else
{:error, message} -> json_response(conn, :forbidden, %{error: message})
@@ -332,7 +334,9 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
@doc "POST /api/v1/accounts/:id/unmute"
def unmute(%{assigns: %{user: muter, account: muted}} = conn, _params) do
- with {:ok, muter} <- User.unmute(muter, muted) do
+ with {:ok, _user_mute} <- User.unmute(muter, muted) do
+ # TODO: remove `muter` refresh once `muted_notifications` field is deprecated
+ muter = User.get_cached_by_id(muter.id)
render(conn, "relationship.json", user: muter, target: muted)
else
{:error, message} -> json_response(conn, :forbidden, %{error: message})
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index e30fed610..37dc8e194 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -50,8 +50,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
id: to_string(target.id),
following: User.following?(user, target),
followed_by: User.following?(target, user),
- blocking: User.blocks_ap_id?(user, target),
- blocked_by: User.blocks_ap_id?(target, user),
+ blocking: User.blocks_user?(user, target),
+ blocked_by: User.blocks_user?(target, user),
muting: User.mutes?(user, target),
muting_notifications: User.muted_notifications?(user, target),
subscribing: User.subscribed_to?(user, target),
diff --git a/lib/pleroma/web/streamer/worker.ex b/lib/pleroma/web/streamer/worker.ex
index 672dd52ee..45f9c7c53 100644
--- a/lib/pleroma/web/streamer/worker.ex
+++ b/lib/pleroma/web/streamer/worker.ex
@@ -129,8 +129,7 @@ defmodule Pleroma.Web.Streamer.Worker do
end
defp should_send?(%User{} = user, %Activity{} = item) do
- blocks = User.blocked_ap_ids(user)
- mutes = user.mutes || []
+ {:ok, [blocks, mutes]} = User.related_ap_ids(user, [:blocked_users, :muted_users])
reblog_mutes = user.muted_reblogs || []
recipient_blocks = MapSet.new(blocks ++ mutes)
recipients = MapSet.new(item.recipients)
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 17:46:52 +0000