|
@@ -884,9 +884,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do |
|
|
%Object{data: %{"likes" => likes}} <- Object.normalize(object) do |
|
|
%Object{data: %{"likes" => likes}} <- Object.normalize(object) do |
|
|
q = from(u in User, where: u.ap_id in ^likes) |
|
|
q = from(u in User, where: u.ap_id in ^likes) |
|
|
|
|
|
|
|
|
users = |
|
|
|
|
|
Repo.all(q) |
|
|
|
|
|
|> Enum.filter(&(not User.blocks?(user, &1))) |
|
|
|
|
|
|
|
|
users = Repo.all(q) |
|
|
|
|
|
users = if is_nil(user) do |
|
|
|
|
|
users |
|
|
|
|
|
else |
|
|
|
|
|
Enum.filter(users, &(not User.blocks?(user, &1))) |
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
conn |
|
|
conn |
|
|
|> put_view(AccountView) |
|
|
|> put_view(AccountView) |
|
@@ -901,9 +904,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do |
|
|
%Object{data: %{"announcements" => announces}} <- Object.normalize(object) do |
|
|
%Object{data: %{"announcements" => announces}} <- Object.normalize(object) do |
|
|
q = from(u in User, where: u.ap_id in ^announces) |
|
|
q = from(u in User, where: u.ap_id in ^announces) |
|
|
|
|
|
|
|
|
users = |
|
|
|
|
|
Repo.all(q) |
|
|
|
|
|
|> Enum.filter(&(not User.blocks?(user, &1))) |
|
|
|
|
|
|
|
|
users = Repo.all(q) |
|
|
|
|
|
users = if is_nil(user) do |
|
|
|
|
|
users |
|
|
|
|
|
else |
|
|
|
|
|
Enum.filter(users, &(not User.blocks?(user, &1))) |
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
conn |
|
|
conn |
|
|
|> put_view(AccountView) |
|
|
|> put_view(AccountView) |
|
|