hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use pleroma: instead of pleroma. for ws events

Browse source
This commit is contained in:
tusooa 2023-04-01 01:29:11 -04:00
commit a348c2e4dd
No known key found for this signature in database
GPG key ID: 42AEC43D48433C51
4 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/mastodon_api/websocket_handler.ex
View file

@ -215,7 +215,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
end
defp handle_client_event(
%{"type" => "pleroma.authenticate", "token" => access_token} = _params,
%{"type" => "pleroma:authenticate", "token" => access_token} = _params,
state
) do
with {:auth, nil, nil} <- {:auth, state.user, state.oauth_token},
@ -223,7 +223,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
{[
{:text,
StreamerView.render("pleroma_respond.json", %{
type: "pleroma.authenticate",
type: "pleroma:authenticate",
result: "success"
})}
], %{state | user: user, oauth_token: oauth_token}}
@ -232,7 +232,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
{[
{:text,
StreamerView.render("pleroma_respond.json", %{
type: "pleroma.authenticate",
type: "pleroma:authenticate",
result: "error",
error: :already_authenticated
})}
@ -242,7 +242,7 @@ defmodule Pleroma.Web.MastodonAPI.WebsocketHandler do
{[
{:text,
StreamerView.render("pleroma_respond.json", %{
type: "pleroma.authenticate",
type: "pleroma:authenticate",
result: "error",
error: :unauthorized
})}

2
lib/pleroma/web/views/streamer_view.ex
View file

@ -148,7 +148,7 @@ defmodule Pleroma.Web.StreamerView do
def render("pleroma_respond.json", %{type: type, result: result} = params) do
%{
event: "pleroma.respond",
event: "pleroma:respond",
payload:
%{
result: result,