projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
lib
/
pleroma
/
activity.ex
diff --git
a/lib/pleroma/activity.ex
b/lib/pleroma/activity.ex
index 9043530c9caebfb5fbdc93cc937464210a145a5a..9c1c804e060640bb8555923abe80bb131af6ca00 100644
(file)
--- a/
lib/pleroma/activity.ex
+++ b/
lib/pleroma/activity.ex
@@
-106,7
+106,10
@@
defmodule Pleroma.Activity do
end
def get_by_id(id) do
end
def get_by_id(id) do
- Repo.get(Activity, id)
+ Activity
+ |> where([a], a.id == ^id)
+ |> restrict_deactivated_users()
+ |> Repo.one()
end
def get_by_id_with_object(id) do
end
def get_by_id_with_object(id) do
@@
-174,6
+177,7
@@
defmodule Pleroma.Activity do
def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do
create_by_object_ap_id(ap_id)
def get_create_by_object_ap_id(ap_id) when is_binary(ap_id) do
create_by_object_ap_id(ap_id)
+ |> restrict_deactivated_users()
|> Repo.one()
end
|> Repo.one()
end
@@
-204,12
+208,14
@@
defmodule Pleroma.Activity do
def create_by_object_ap_id_with_object(_), do: nil
def create_by_object_ap_id_with_object(_), do: nil
- def get_create_by_object_ap_id_with_object(ap_id) do
+ def get_create_by_object_ap_id_with_object(ap_id)
when is_binary(ap_id)
do
ap_id
|> create_by_object_ap_id_with_object()
|> Repo.one()
end
ap_id
|> create_by_object_ap_id_with_object()
|> Repo.one()
end
+ def get_create_by_object_ap_id_with_object(_), do: nil
+
defp get_in_reply_to_activity_from_object(%Object{data: %{"inReplyTo" => ap_id}}) do
get_create_by_object_ap_id_with_object(ap_id)
end
defp get_in_reply_to_activity_from_object(%Object{data: %{"inReplyTo" => ap_id}}) do
get_create_by_object_ap_id_with_object(ap_id)
end
@@
-258,4
+264,14
@@
defmodule Pleroma.Activity do
|> where([s], s.actor == ^actor)
|> Repo.all()
end
|> where([s], s.actor == ^actor)
|> Repo.all()
end
+
+ def restrict_deactivated_users(query) do
+ from(activity in query,
+ where:
+ fragment(
+ "? not in (SELECT ap_id FROM users WHERE info->'deactivated' @> 'true')",
+ activity.actor
+ )
+ )
+ end
end
end