jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 00:04:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix websocket refactor mess

Browse source
This commit is contained in:
seavor 2026-04-16 15:37:59 -05:00
parent fea21b5057
commit 53639a8448
19 changed files with 179 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webclient/src/components/KnownHosts/KnownHosts.tsx
View file

@ -13,7 +13,7 @@ import AddIcon from '@mui/icons-material/Add';
import EditRoundedIcon from '@mui/icons-material/Edit';
import ErrorOutlinedIcon from '@mui/icons-material/ErrorOutlined';
import { request } from '@app/api';
import { useWebClient } from '@app/hooks';
import { KnownHostDialog } from '@app/dialogs';
import { useReduxEffect } from '@app/hooks';
import { HostDTO } from '@app/services';
@ -64,6 +64,7 @@ const KnownHosts = (props) => {
const { touched, error, warning } = meta;
const { t } = useTranslation();
const webClient = useWebClient();
const [hostsState, setHostsState] = useState({
hosts: [],
@ -197,7 +198,7 @@ const KnownHosts = (props) => {
setTestingConnection(TestConnection.TESTING);
const options = { ...App.getHostPort(hostsState.selectedHost) };
request.authentication.testConnection(options);
webClient.request.authentication.testConnection(options);
}
return (

11
webclient/src/components/UserDisplay/UserDisplay.tsx
View file

@ -6,7 +6,7 @@ import Menu from '@mui/material/Menu';
import MenuItem from '@mui/material/MenuItem';
import { Images } from '@app/images';
import { request } from '@app/api';
import { useWebClient } from '@app/hooks';
import { ServerSelectors } from '@app/store';
import { App, Data } from '@app/types';
import { useAppSelector } from '@app/store';
@ -18,6 +18,7 @@ const UserDisplay = ({ user }: UserDisplayProps) => {
const buddyList = useAppSelector(state => ServerSelectors.getBuddyList(state));
const ignoreList = useAppSelector(state => ServerSelectors.getIgnoreList(state));
const [position, setPosition] = useState<{ x: number; y: number } | null>(null);
const webClient = useWebClient();
const { name, country } = user;
@ -32,19 +33,19 @@ const UserDisplay = ({ user }: UserDisplayProps) => {
const isIgnored = Boolean(ignoreList[user.name]);
const onAddBuddy = () => {
request.session.addToBuddyList(user.name);
webClient.request.session.addToBuddyList(user.name);
handleClose();
};
const onRemoveBuddy = () => {
request.session.removeFromBuddyList(user.name);
webClient.request.session.removeFromBuddyList(user.name);
handleClose();
};
const onAddIgnore = () => {
request.session.addToIgnoreList(user.name);
webClient.request.session.addToIgnoreList(user.name);
handleClose();
};
const onRemoveIgnore = () => {
request.session.removeFromIgnoreList(user.name);
webClient.request.session.removeFromIgnoreList(user.name);
handleClose();
};