diff options
author | lain <lain@soykaf.club> | 2018-11-13 19:46:34 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-11-13 19:46:34 +0100 |
commit | 2cf40237ff44cdb04b20546ca51efb671270dbc2 (patch) | |
tree | 8d2526d3aeed3c842c94a2a197847ef7862cfab4 /lib | |
parent | 0ce5623134de4356e74160f8d3e717aae414b1e7 (diff) | |
download | pleroma-2cf40237ff44cdb04b20546ca51efb671270dbc2.tar.gz |
MastodonAPI: Add pagination to private messages.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 83728c81e..a0b74311b 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -278,9 +278,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end end - def dm_timeline(%{assigns: %{user: user}} = conn, _params) do + def dm_timeline(%{assigns: %{user: user}} = conn, params) do query = - ActivityPub.fetch_activities_query([user.ap_id], %{"type" => "Create", visibility: "direct"}) + ActivityPub.fetch_activities_query( + [user.ap_id], + Map.merge(params, %{"type" => "Create", visibility: "direct"}) + ) activities = Repo.all(query) |