sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-27 06:15:08 +01:00
Code Issues Releases Wiki Activity

MastoAPI: Return reblogs, too.

Browse Source
This commit is contained in:
Roger Braun 2017-09-17 14:20:54 +02:00
parent 62ca2617cd
commit 260f09dd6c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -141,9 +141,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
defp restrict_actor(query, _), do: query
defp restrict_type(query, %{"type" => type}) when is_binary(type) do
restrict_type(query, %{"type" => [type]})
end
defp restrict_type(query, %{"type" => type}) do
from activity in query,
where: fragment("?->>'type' = ?", activity.data, ^type)
where: fragment("?->>'type' = ANY(?)", activity.data, ^type)
end
defp restrict_type(query, _), do: query

9
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -77,7 +77,10 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
def home_timeline(%{assigns: %{user: user}} = conn, params) do
activities = ActivityPub.fetch_activities([user.ap_id | user.following], Map.put(params, "type", "Create"))
params = params
|> Map.put("type", ["Create", "Announce"])
activities = ActivityPub.fetch_activities([user.ap_id | user.following], params)
|> Enum.reverse
conn
@ -87,7 +90,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
def public_timeline(%{assigns: %{user: user}} = conn, params) do
params = params
|> Map.put("type", "Create")
|> Map.put("type", ["Create", "Announce"])
|> Map.put("local_only", !!params["local"])
activities = ActivityPub.fetch_public_activities(params)
@ -102,7 +105,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
def user_statuses(%{assigns: %{user: user}} = conn, params) do
with %User{ap_id: ap_id} <- Repo.get(User, params["id"]) do
params = params
|> Map.put("type", "Create")
|> Map.put("type", ["Create", "Announce"])
|> Map.put("actor_id", ap_id)
activities = ActivityPub.fetch_activities([], params)