Merge branch 'fix/dm-timeline-activities' into 'develop'

MastoAPI: fix dm_timeline getting non-create activities. See merge request pleroma/pleroma!182
2018-05-30 12:31:59 +00:00 · 2018-05-30 12:31:59 +00:00 · 196d36a7d5
parent 8bd7ace420 7cb2e2971e
commit 196d36a7d5
1 changed files with 3 additions and 1 deletions
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@ -241,7 +241,9 @@ def user_statuses(%{assigns: %{user: reading_user}} = conn, params) do
  end

  def dm_timeline(%{assigns: %{user: user}} = conn, params) do
-    query = ActivityPub.fetch_activities_query([user.ap_id], %{visibility: "direct"})
+    query =
+      ActivityPub.fetch_activities_query([user.ap_id], %{"type" => "Create", visibility: "direct"})
+
    activities = Repo.all(query)

    conn