hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show users their own posts in timeline.

Browse source
This commit is contained in:
lain 2018-02-18 15:20:36 +01:00
commit c974f6544f
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -151,11 +151,16 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
defp restrict_tag(query, _), do: query
defp restrict_recipients(query, []), do: query
defp restrict_recipients(query, recipients) do
defp restrict_recipients(query, [], user), do: query
defp restrict_recipients(query, recipients, nil) do
from activity in query,
where: fragment("? && ?", ^recipients, activity.recipients)
end
defp restrict_recipients(query, recipients, user) do
from activity in query,
where: fragment("? && ?", ^recipients, activity.recipients),
or_where: activity.actor == ^user.ap_id
end
defp restrict_local(query, %{"local_only" => true}) do
from activity in query, where: activity.local == true
@ -216,7 +221,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
order_by: [fragment("? desc nulls last", activity.id)]
base_query
|> restrict_recipients(recipients)
|> restrict_recipients(recipients, opts["user"])
|> restrict_tag(opts)
|> restrict_since(opts)
|> restrict_local(opts)