pleroma

commit: 196d36a7d5e94ea2b494c5910a263da20c985e66
parent 8bd7ace4203a06257eda19829a14e17e381724d9
Author: eal <eal@waifu.club>
Date:   Wed, 30 May 2018 12:31:59 +0000

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

MastoAPI: fix dm_timeline getting non-create activities.

See merge request pleroma/pleroma!182
Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -241,7 +241,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController 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