projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'add-blocked-by-to-relationship' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api.ex
b/lib/pleroma/web/mastodon_api/mastodon_api.ex
index 3a3ec7c2a05077054afa2e53fc719a554b9d3840..46944dcbc1381390eda5fbb48d45f401236f4b1b 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api.ex
@@
-1,3
+1,7
@@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
import Ecto.Query
import Ecto.Changeset
defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
import Ecto.Query
import Ecto.Changeset
@@
-49,7
+53,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
options = cast_params(params)
user
options = cast_params(params)
user
- |> Notification.for_user_query()
+ |> Notification.for_user_query(
options
)
|> restrict(:exclude_types, options)
|> Pagination.fetch_paginated(params)
end
|> restrict(:exclude_types, options)
|> Pagination.fetch_paginated(params)
end
@@
-63,7
+67,8
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPI do
defp cast_params(params) do
param_types = %{
exclude_types: {:array, :string},
defp cast_params(params) do
param_types = %{
exclude_types: {:array, :string},
- reblogs: :boolean
+ reblogs: :boolean,
+ with_muted: :boolean
}
changeset = cast({%{}, param_types}, params, Map.keys(param_types))
}
changeset = cast({%{}, param_types}, params, Map.keys(param_types))