From: lain Date: Sat, 26 May 2018 14:00:59 +0000 (+0200) Subject: Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4b3ec5351466f8615b32e62cc4e6215f8a80b105;p=akkoma Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api --- 4b3ec5351466f8615b32e62cc4e6215f8a80b105 diff --cc lib/pleroma/web/router.ex index 87fd664f6,726275158..924254895 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@@ -103,11 -104,8 +104,10 @@@ defmodule Pleroma.Web.Router d get("/domain_blocks", MastodonAPIController, :empty_array) get("/follow_requests", MastodonAPIController, :empty_array) get("/mutes", MastodonAPIController, :empty_array) - get("/lists", MastodonAPIController, :empty_array) get("/timelines/home", MastodonAPIController, :home_timeline) + + get("/timelines/direct", MastodonAPIController, :dm_timeline) get("/favourites", MastodonAPIController, :favourites)