projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disallow password resets for deactivated accounts.
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api_controller.ex
diff --git
a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 31adc28174bf1c7af9855c82f2907290d4f681c0..c2de26b0ba9da42e15cb95c3575beff5ceccc63a 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@
-6,6
+6,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
alias Pleroma.Notification
use Pleroma.Web, :controller
alias Pleroma.Notification
+ alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
alias Pleroma.Plugs.OAuthScopesPlug
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
@@
-13,11
+14,17
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
require Logger
require Logger
- plug(OAuthScopesPlug, %{scopes: ["write:notifications"]} when action == :notifications_read)
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["write:notifications"]} when action == :mark_notifications_as_read
+ )
- plug(:skip_plug, OAuthScopesPlug when action in [:oauth_tokens, :revoke_token])
+ plug(
+ :skip_plug,
+ [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] when action == :confirm_email
+ )
- plug(
Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
)
+ plug(
:skip_plug, OAuthScopesPlug when action in [:oauth_tokens, :revoke_token]
)
action_fallback(:errors)
action_fallback(:errors)
@@
-46,13
+53,13
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
json_reply(conn, 201, "")
end
json_reply(conn, 201, "")
end
- def errors(conn, {:param_cast, _}) do
+ def
p
errors(conn, {:param_cast, _}) do
conn
|> put_status(400)
|> json("Invalid parameters")
end
conn
|> put_status(400)
|> json("Invalid parameters")
end
- def errors(conn, _) do
+ def
p
errors(conn, _) do
conn
|> put_status(500)
|> json("Something went wrong")
conn
|> put_status(500)
|> json("Something went wrong")
@@
-64,7
+71,10
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
|> send_resp(status, json)
end
|> send_resp(status, json)
end
- def notifications_read(%{assigns: %{user: user}} = conn, %{"latest_id" => latest_id} = params) do
+ def mark_notifications_as_read(
+ %{assigns: %{user: user}} = conn,
+ %{"latest_id" => latest_id} = params
+ ) do
Notification.set_read_up_to(user, latest_id)
notifications = Notification.for_user(user, params)
Notification.set_read_up_to(user, latest_id)
notifications = Notification.for_user(user, params)
@@
-75,7
+85,7
@@
defmodule Pleroma.Web.TwitterAPI.Controller do
|> render("index.json", %{notifications: notifications, for: user})
end
|> render("index.json", %{notifications: notifications, for: user})
end
- def
notification
s_read(%{assigns: %{user: _user}} = conn, _) do
+ def
mark_notifications_a
s_read(%{assigns: %{user: _user}} = conn, _) do
bad_request_reply(conn, "You need to specify latest_id")
end
bad_request_reply(conn, "You need to specify latest_id")
end