logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 8e9c939e42b7d649d58ce91465086751031b13c8
parent: 20a22362b8b72adc03ce529d50a8d87029358155
Author: lain <lain@soykaf.club>
Date:   Mon, 18 May 2020 16:27:54 +0000

Merge branch 'direct-timeline-with-muted-param-fix' into 'develop'

Fixed missing support for `with_muted` param in direct timeline

See merge request pleroma/pleroma!2548

Diffstat:

Mlib/pleroma/web/api_spec/operations/timeline_operation.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/api_spec/operations/timeline_operation.ex b/lib/pleroma/web/api_spec/operations/timeline_operation.ex @@ -43,7 +43,7 @@ defmodule Pleroma.Web.ApiSpec.TimelineOperation do description: "View statuses with a “direct” privacy, from your account or in your notifications", deprecated: true, - parameters: pagination_params(), + parameters: [with_muted_param() | pagination_params()], security: [%{"oAuth" => ["read:statuses"]}], operationId: "TimelineController.direct", responses: %{