summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/following_relationship.ex6
-rw-r--r--lib/pleroma/user.ex5
-rw-r--r--lib/pleroma/user_relationship.ex20
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex36
-rw-r--r--lib/pleroma/web/mastodon_api/views/notification_view.ex44
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex29
6 files changed, 86 insertions, 54 deletions
diff --git a/lib/pleroma/following_relationship.ex b/lib/pleroma/following_relationship.ex
index 624bddfe4..a9538ea4e 100644
--- a/lib/pleroma/following_relationship.ex
+++ b/lib/pleroma/following_relationship.ex
@@ -151,4 +151,10 @@ defmodule Pleroma.FollowingRelationship do
)
|> Repo.all()
end
+
+ def find(following_relationships, follower, following) do
+ Enum.find(following_relationships, fn
+ fr -> fr.follower_id == follower.id and fr.following_id == following.id
+ end)
+ end
end
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 699256a3b..8ccb9242d 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -218,7 +218,10 @@ defmodule Pleroma.User do
end
end
- @doc "Dumps id to SQL-compatible format"
+ @doc """
+ Dumps Flake Id to SQL-compatible format (16-byte UUID).
+ E.g. "9pQtDGXuq4p3VlcJEm" -> <<0, 0, 1, 110, 179, 218, 42, 92, 213, 41, 44, 227, 95, 213, 0, 0>>
+ """
def binary_id(source_id) when is_binary(source_id) do
with {:ok, dumped_id} <- FlakeId.Ecto.CompatType.dump(source_id) do
dumped_id
diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex
index 519d2998d..011cf6822 100644
--- a/lib/pleroma/user_relationship.ex
+++ b/lib/pleroma/user_relationship.ex
@@ -8,6 +8,7 @@ defmodule Pleroma.UserRelationship do
import Ecto.Changeset
import Ecto.Query
+ alias Pleroma.FollowingRelationship
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.UserRelationship
@@ -124,6 +125,25 @@ defmodule Pleroma.UserRelationship do
end
end
+ @doc ":relationships option for StatusView / AccountView / NotificationView"
+ def view_relationships_option(nil = _reading_user, _actors) do
+ %{user_relationships: [], following_relationships: []}
+ end
+
+ def view_relationships_option(%User{} = reading_user, actors) do
+ user_relationships =
+ UserRelationship.dictionary(
+ [reading_user],
+ actors,
+ [:block, :mute, :notification_mute, :reblog_mute],
+ [:block, :inverse_subscription]
+ )
+
+ following_relationships = FollowingRelationship.all_between_user_sets([reading_user], actors)
+
+ %{user_relationships: user_relationships, following_relationships: following_relationships}
+ end
+
defp validate_not_self_relationship(%Ecto.Changeset{} = changeset) do
changeset
|> validate_change(:target_id, fn _, target_id ->
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 6b2eca1f3..2cdfac7af 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -5,20 +5,23 @@
defmodule Pleroma.Web.MastodonAPI.AccountView do
use Pleroma.Web, :view
+ alias Pleroma.FollowingRelationship
alias Pleroma.User
alias Pleroma.UserRelationship
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
- alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MediaProxy
- defp find_following_rel(following_relationships, follower, following) do
- Enum.find(following_relationships, fn
- fr -> fr.follower_id == follower.id and fr.following_id == following.id
- end)
- end
-
def render("index.json", %{users: users} = opts) do
+ relationships_opt =
+ if Map.has_key?(opts, :relationships) do
+ opts[:relationships]
+ else
+ UserRelationship.view_relationships_option(opts[:for], users)
+ end
+
+ opts = Map.put(opts, :relationships, relationships_opt)
+
users
|> render_many(AccountView, "show.json", opts)
|> Enum.filter(&Enum.any?/1)
@@ -53,7 +56,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
follow_state =
if following_relationships do
user_to_target_following_relation =
- find_following_rel(following_relationships, reading_user, target)
+ FollowingRelationship.find(following_relationships, reading_user, target)
User.get_follow_state(reading_user, target, user_to_target_following_relation)
else
@@ -62,7 +65,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
followed_by =
if following_relationships do
- case find_following_rel(following_relationships, target, reading_user) do
+ case FollowingRelationship.find(following_relationships, target, reading_user) do
%{state: "accept"} -> true
_ -> false
end
@@ -70,7 +73,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
User.following?(target, reading_user)
end
- # NOTE: adjust StatusView.relationships_opts/2 if adding new relation-related flags
+ # NOTE: adjust UserRelationship.view_relationships_option/2 on new relation-related flags
%{
id: to_string(target.id),
following: follow_state == "accept",
@@ -129,11 +132,16 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
}
end
- def render("relationships.json", %{user: user, targets: targets}) do
- relationships_opts = StatusView.relationships_opts(user, targets)
- opts = %{as: :target, user: user, relationships: relationships_opts}
+ def render("relationships.json", %{user: user, targets: targets} = opts) do
+ relationships_opt =
+ if Map.has_key?(opts, :relationships) do
+ opts[:relationships]
+ else
+ UserRelationship.view_relationships_option(user, targets)
+ end
- render_many(targets, AccountView, "relationship.json", opts)
+ render_opts = %{as: :target, user: user, relationships: relationships_opt}
+ render_many(targets, AccountView, "relationship.json", render_opts)
end
defp do_render("show.json", %{user: user} = opts) do
diff --git a/lib/pleroma/web/mastodon_api/views/notification_view.ex b/lib/pleroma/web/mastodon_api/views/notification_view.ex
index e9c618496..db434271c 100644
--- a/lib/pleroma/web/mastodon_api/views/notification_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/notification_view.ex
@@ -8,12 +8,13 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
alias Pleroma.Activity
alias Pleroma.Notification
alias Pleroma.User
+ alias Pleroma.UserRelationship
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.NotificationView
alias Pleroma.Web.MastodonAPI.StatusView
- def render("index.json", %{notifications: notifications, for: reading_user}) do
+ def render("index.json", %{notifications: notifications, for: reading_user} = opts) do
activities = Enum.map(notifications, & &1.activity)
parent_activities =
@@ -30,21 +31,28 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
|> Activity.with_preloaded_object(:left)
|> Pleroma.Repo.all()
- move_activities_targets =
- activities
- |> Enum.filter(&(Activity.mastodon_notification_type(&1) == "move"))
- |> Enum.map(&User.get_cached_by_ap_id(&1.data["target"]))
-
- actors =
- activities
- |> Enum.map(fn a -> User.get_cached_by_ap_id(a.data["actor"]) end)
- |> Enum.filter(& &1)
- |> Kernel.++(move_activities_targets)
+ relationships_opt =
+ if Map.has_key?(opts, :relationships) do
+ opts[:relationships]
+ else
+ move_activities_targets =
+ activities
+ |> Enum.filter(&(Activity.mastodon_notification_type(&1) == "move"))
+ |> Enum.map(&User.get_cached_by_ap_id(&1.data["target"]))
+
+ actors =
+ activities
+ |> Enum.map(fn a -> User.get_cached_by_ap_id(a.data["actor"]) end)
+ |> Enum.filter(& &1)
+ |> Kernel.++(move_activities_targets)
+
+ UserRelationship.view_relationships_option(reading_user, actors)
+ end
opts = %{
for: reading_user,
parent_activities: parent_activities,
- relationships: StatusView.relationships_opts(reading_user, actors)
+ relationships: relationships_opt
}
safe_render_many(notifications, NotificationView, "show.json", opts)
@@ -85,27 +93,27 @@ defmodule Pleroma.Web.MastodonAPI.NotificationView do
}
}
- relationships_opts = %{relationships: opts[:relationships]}
+ relationships_opt = %{relationships: opts[:relationships]}
case mastodon_type do
"mention" ->
- put_status(response, activity, reading_user, relationships_opts)
+ put_status(response, activity, reading_user, relationships_opt)
"favourite" ->
- put_status(response, parent_activity_fn.(), reading_user, relationships_opts)
+ put_status(response, parent_activity_fn.(), reading_user, relationships_opt)
"reblog" ->
- put_status(response, parent_activity_fn.(), reading_user, relationships_opts)
+ put_status(response, parent_activity_fn.(), reading_user, relationships_opt)
"move" ->
- put_target(response, activity, reading_user, relationships_opts)
+ put_target(response, activity, reading_user, relationships_opt)
"follow" ->
response
"pleroma:emoji_reaction" ->
response
- |> put_status(parent_activity_fn.(), reading_user, relationships_opts)
+ |> put_status(parent_activity_fn.(), reading_user, relationships_opt)
|> put_emoji(activity)
_ ->
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 0ef65b352..7b1cb7bf8 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -9,7 +9,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.Activity
alias Pleroma.ActivityExpiration
- alias Pleroma.FollowingRelationship
alias Pleroma.HTML
alias Pleroma.Object
alias Pleroma.Repo
@@ -72,24 +71,6 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
present?(user && user.ap_id in (object.data["announcements"] || []))
end
- def relationships_opts(_reading_user = nil, _actors) do
- %{user_relationships: [], following_relationships: []}
- end
-
- def relationships_opts(reading_user, actors) do
- user_relationships =
- UserRelationship.dictionary(
- [reading_user],
- actors,
- [:block, :mute, :notification_mute, :reblog_mute],
- [:block, :inverse_subscription]
- )
-
- following_relationships = FollowingRelationship.all_between_user_sets([reading_user], actors)
-
- %{user_relationships: user_relationships, following_relationships: following_relationships}
- end
-
def render("index.json", opts) do
# To do: check AdminAPIControllerTest on the reasons behind nil activities in the list
activities = Enum.filter(opts.activities, & &1)
@@ -105,13 +86,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|> Activity.with_set_thread_muted_field(opts[:for])
|> Repo.all()
- actors = Enum.map(activities ++ parent_activities, &get_user(&1.data["actor"]))
+ relationships_opt =
+ if Map.has_key?(opts, :relationships) do
+ opts[:relationships]
+ else
+ actors = Enum.map(activities ++ parent_activities, &get_user(&1.data["actor"]))
+ UserRelationship.view_relationships_option(opts[:for], actors)
+ end
opts =
opts
|> Map.put(:replied_to_activities, replied_to_activities)
|> Map.put(:parent_activities, parent_activities)
- |> Map.put(:relationships, relationships_opts(opts[:for], actors))
+ |> Map.put(:relationships, relationships_opt)
safe_render_many(activities, StatusView, "show.json", opts)
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-28 06:17:16 +0000