alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

MastoAPI: fix dm_timeline getting non-create activities.

See merge request pleroma/pleroma!182
This commit is contained in:
eal 2018-05-30 12:31:59 +00:00
parent 8bd7ace420 7cb2e2971e
commit 196d36a7d5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -241,7 +241,9 @@ def user_statuses(%{assigns: %{user: reading_user}} = conn, params) 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], %{visibility: "direct"}) query =
ActivityPub.fetch_activities_query([user.ap_id], %{"type" => "Create", visibility: "direct"})
activities = Repo.all(query) activities = Repo.all(query)
conn conn