projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#1794] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
controllers
/
notification_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
b/lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
index a14c86893b3d7aa815a52a4dc6385a05fe1b4ff0..bcd12c73f74678e36897152c6d982691520a30af 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/controllers/notification_controller.ex
@@
-5,7
+5,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationController do
use Pleroma.Web, :controller
defmodule Pleroma.Web.MastodonAPI.NotificationController do
use Pleroma.Web, :controller
- import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2
, skip_relationships?: 1
]
+ import Pleroma.Web.ControllerHelper, only: [add_link_headers: 2]
alias Pleroma.Notification
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.Notification
alias Pleroma.Plugs.OAuthScopesPlug
@@
-13,7
+13,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationController do
@oauth_read_actions [:show, :index]
@oauth_read_actions [:show, :index]
- plug(
OpenApiSpex.Plug.CastAndValidate, render_error: Pleroma.Web.ApiSpec.RenderError
)
+ plug(
Pleroma.Web.ApiSpec.CastAndValidate
)
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
@@
-50,8
+50,7
@@
defmodule Pleroma.Web.MastodonAPI.NotificationController do
|> add_link_headers(notifications)
|> render("index.json",
notifications: notifications,
|> add_link_headers(notifications)
|> render("index.json",
notifications: notifications,
- for: user,
- skip_relationships: skip_relationships?(params)
+ for: user
)
end
)
end