projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
[akkoma]
/
lib
/
pleroma
/
web
/
api_spec
/
operations
/
timeline_operation.ex
diff --git
a/lib/pleroma/web/api_spec/operations/timeline_operation.ex
b/lib/pleroma/web/api_spec/operations/timeline_operation.ex
index 1b89035d47c05d64e46f2dd924c252d0144dc0e9..e1ebdab389c781b643d4ce05ab0c0d907393340a 100644
(file)
--- a/
lib/pleroma/web/api_spec/operations/timeline_operation.ex
+++ b/
lib/pleroma/web/api_spec/operations/timeline_operation.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
@@
-27,8
+27,7
@@
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
local_param(),
with_muted_param(),
exclude_visibilities_param(),
local_param(),
with_muted_param(),
exclude_visibilities_param(),
- reply_visibility_param(),
- with_relationships_param() | pagination_params()
+ reply_visibility_param() | pagination_params()
],
operationId: "TimelineController.home",
responses: %{
],
operationId: "TimelineController.home",
responses: %{
@@
-44,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,
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: %{
security: [%{"oAuth" => ["read:statuses"]}],
operationId: "TimelineController.direct",
responses: %{
@@
-60,11
+59,11
@@
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
security: [%{"oAuth" => ["read:statuses"]}],
parameters: [
local_param(),
security: [%{"oAuth" => ["read:statuses"]}],
parameters: [
local_param(),
+ instance_param(),
only_media_param(),
with_muted_param(),
exclude_visibilities_param(),
only_media_param(),
with_muted_param(),
exclude_visibilities_param(),
- reply_visibility_param(),
- with_relationships_param() | pagination_params()
+ reply_visibility_param() | pagination_params()
],
operationId: "TimelineController.public",
responses: %{
],
operationId: "TimelineController.public",
responses: %{
@@
-109,8
+108,7
@@
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
local_param(),
only_media_param(),
with_muted_param(),
local_param(),
only_media_param(),
with_muted_param(),
- exclude_visibilities_param(),
- with_relationships_param() | pagination_params()
+ exclude_visibilities_param() | pagination_params()
],
operationId: "TimelineController.hashtag",
responses: %{
],
operationId: "TimelineController.hashtag",
responses: %{
@@
-134,8
+132,7
@@
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
required: true
),
with_muted_param(),
required: true
),
with_muted_param(),
- exclude_visibilities_param(),
- with_relationships_param() | pagination_params()
+ exclude_visibilities_param() | pagination_params()
],
operationId: "TimelineController.list",
responses: %{
],
operationId: "TimelineController.list",
responses: %{
@@
-153,10
+150,6
@@
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
}
end
}
end
- defp with_relationships_param do
- Operation.parameter(:with_relationships, :query, BooleanLike, "Include relationships")
- end
-
defp local_param do
Operation.parameter(
:local,
defp local_param do
Operation.parameter(
:local,
@@
-166,8
+159,17
@@
defmodule Pleroma.Web.ApiSpec.TimelineOperation do
)
end
)
end
+ defp instance_param do
+ Operation.parameter(
+ :instance,
+ :query,
+ %Schema{type: :string},
+ "Show only statuses from the given domain"
+ )
+ end
+
defp with_muted_param do
defp with_muted_param do
- Operation.parameter(:with_muted, :query, BooleanLike, "Includeactivities by muted users")
+ Operation.parameter(:with_muted, :query, BooleanLike, "Include
activities by muted users")
end
defp exclude_visibilities_param do
end
defp exclude_visibilities_param do