fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-04 18:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

MastoAPI: Add media timelines.

Browse source
This commit is contained in:
eal 2017-11-14 15:41:16 +02:00
parent 083cd169d2
commit c84723b679
2 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -159,6 +159,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end end
defp restrict_favorited_by(query, _), do: query defp restrict_favorited_by(query, _), do: query
defp restrict_media(query, %{"only_media" => true}) do
from activity in query,
where: fragment("not (? #> '{\"object\",\"attachment\"}' = ?)", activity.data, ^[])
end
defp restrict_media(query, _), do: query
# Only search through last 100_000 activities by default # Only search through last 100_000 activities by default
defp restrict_recent(query, %{"whole_db" => true}), do: query defp restrict_recent(query, %{"whole_db" => true}), do: query
defp restrict_recent(query, _) do defp restrict_recent(query, _) do
@ -191,6 +197,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> restrict_favorited_by(opts) |> restrict_favorited_by(opts)
|> restrict_recent(opts) |> restrict_recent(opts)
|> restrict_blocked(opts) |> restrict_blocked(opts)
|> restrict_media(opts)
|> Repo.all |> Repo.all
|> Enum.reverse |> Enum.reverse
end end

17
test/web/mastodon_api/mastodon_api_controller_test.exs
View file

@ -249,6 +249,23 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert id == to_string(note_two.id) assert id == to_string(note_two.id)
end end
test "gets an users media", %{conn: conn} do
note = insert(:note_activity)
user = User.get_by_ap_id(note.data["actor"])
file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"}
media = TwitterAPI.upload(file, "json")
|> Poison.decode!
{:ok, image_post} = TwitterAPI.create_status(user, %{"status" => "cofe", "media_ids" => [media["media_id"]]})
conn = conn
|> get("/api/v1/accounts/#{user.id}/statuses", %{"only_media" => true})
assert [%{"id" => id}] = json_response(conn, 200)
assert id == to_string(image_post.id)
end
end end
describe "user relationships" do describe "user relationships" do