Show users their own posts in timeline.

This commit is contained in:
lain 2018-02-18 15:20:36 +01:00
parent 44586f2967
commit c974f6544f
4 changed files with 15 additions and 6 deletions

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)

View file

@ -27,7 +27,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
to = ["https://www.w3.org/ns/activitystreams#Public"]
mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
cc = [user.follower_address | mentioned_users]
if inReplyTo do
{to, Enum.uniq([inReplyTo.data["actor"] | cc])}
@ -47,7 +47,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
end
def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
if inReplyTo do
{Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
else

View file

@ -150,6 +150,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
params = params
|> Map.put("type", ["Create", "Announce"])
|> Map.put("blocking_user", user)
|> Map.put("user", user)
activities = ActivityPub.fetch_activities([user.ap_id | user.following], params)
|> Enum.reverse

View file

@ -13,7 +13,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def fetch_friend_statuses(user, opts \\ %{}) do
opts = Map.put(opts, "blocking_user", user)
opts = opts
|> Map.put("blocking_user", user)
|> Map.put("user", user)
ActivityPub.fetch_activities([user.ap_id | user.following], opts)
|> activities_to_statuses(%{for: user})
end