From cad63281845abcb5d0a1abf9100aa6d1e620c8af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicole=20Miko=C5=82ajczyk?= Date: Thu, 15 May 2025 17:25:32 +0200 Subject: [PATCH] pl-fe: fix some shoutbox connection nonsense MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicole Mikołajczyk --- packages/pl-fe/src/actions/shoutbox.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/pl-fe/src/actions/shoutbox.ts b/packages/pl-fe/src/actions/shoutbox.ts index a672ea11f..c93e78a48 100644 --- a/packages/pl-fe/src/actions/shoutbox.ts +++ b/packages/pl-fe/src/actions/shoutbox.ts @@ -1,6 +1,7 @@ -import { verifyCredentials } from './auth'; +import { getClient } from 'pl-fe/api'; + import { importEntities } from './importer'; -import { getMeToken, getMeUrl } from './me'; +import { getMeUrl } from './me'; import type { PlApiClient, ShoutMessage } from 'pl-api'; import type { AppDispatch, RootState } from 'pl-fe/store'; @@ -37,14 +38,15 @@ const createShoutboxMessage = (message: string) => (dispatch: AppDispatch, getSt const connectShoutbox = () => (dispatch: AppDispatch, getState: () => RootState) => { const state = getState(); - const token = getMeToken(state); const accountUrl = getMeUrl(state); if (!accountUrl) return; - return dispatch(verifyCredentials(token, accountUrl)).then((account) => { + const client = getClient(state); + + return client.settings.verifyCredentials().then((account) => { if (account.__meta.pleroma?.chat_token) { - const socket = state.auth.client.shoutbox.connect(account.__meta.pleroma?.chat_token, { + const socket = client.shoutbox.connect(account.__meta.pleroma?.chat_token, { onMessage: (message) => dispatch(importShoutboxMessage(message)), onMessages: (messages) => dispatch(importShoutboxMessages(messages)), });