diff options
| author | eal <eal@waifu.club> | 2018-05-30 12:31:59 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-05-30 12:31:59 +0000 |
| commit | 196d36a7d5e94ea2b494c5910a263da20c985e66 (patch) | |
| tree | 4259ecfcffc5c6e8c42adbe67eb3b9366bde095e | |
| parent | 8bd7ace4203a06257eda19829a14e17e381724d9 (diff) | |
| parent | 7cb2e2971e8d348e9c808455e2e4c262e09da806 (diff) | |
| download | pleroma-196d36a7d5e94ea2b494c5910a263da20c985e66.tar.gz | |
Merge branch 'fix/dm-timeline-activities' into 'develop'
MastoAPI: fix dm_timeline getting non-create activities.
See merge request pleroma/pleroma!182
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index e89186ae3..64a8a66f7 100644 --- 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 |