diff --git a/frontend/src/ts/tribe/pages/tribe-page-lobby.ts b/frontend/src/ts/tribe/pages/tribe-page-lobby.ts index c95dd546d..05048ab29 100644 --- a/frontend/src/ts/tribe/pages/tribe-page-lobby.ts +++ b/frontend/src/ts/tribe/pages/tribe-page-lobby.ts @@ -328,7 +328,7 @@ $(".pageTribe .tribePage.lobby .visibilityAndName .roomName .textButton").on( () => { //TODO proper popup const name = prompt("Enter new room name") as string; - tribeSocket.out.room.updateName(name); + tribeSocket.out.user.setName(name); }, ); diff --git a/frontend/src/ts/tribe/tribe-socket/routes/room.ts b/frontend/src/ts/tribe/tribe-socket/routes/room.ts index ce6b68e70..07e7eda5e 100644 --- a/frontend/src/ts/tribe/tribe-socket/routes/room.ts +++ b/frontend/src/ts/tribe/tribe-socket/routes/room.ts @@ -10,7 +10,7 @@ type GetPublicRoomsResponse = { async function getPublicRooms( _page: number, - search: string + search: string, ): Promise { return new Promise((resolve) => { Socket.emit( @@ -21,7 +21,7 @@ async function getPublicRooms( }, (e: GetPublicRoomsResponse) => { resolve(e); - } + }, ); }); } @@ -33,7 +33,7 @@ type JoinRoomResponse = { async function join( roomId: string, - fromBrowser: boolean + fromBrowser: boolean, ): Promise { return new Promise((resolve) => { Socket.emit( @@ -41,7 +41,7 @@ async function join( { roomId, fromBrowser }, (res: JoinRoomResponse) => { resolve(res); - } + }, ); }); } @@ -101,7 +101,7 @@ function result(result: TribeTypes.Result): void { function create( mode: Mode, mode2: string | number | QuoteLength[], - type?: string + type?: string, ): void { Socket.emit("room_create", { mode, mode2, type }); } @@ -131,7 +131,7 @@ function joined(callback: (data: { room: TribeTypes.Room }) => void): void { } function playerJoined( - callback: (data: { user: TribeTypes.User }) => void + callback: (data: { user: TribeTypes.User }) => void, ): void { Socket.on("room_player_joined", callback); } @@ -145,7 +145,7 @@ function left(callback: () => void): void { } function visibilityChanged( - callback: (data: { isPrivate: boolean }) => void + callback: (data: { isPrivate: boolean }) => void, ): void { Socket.on("room_visibility_changed", callback); } @@ -159,7 +159,7 @@ function userIsReady(callback: (data: { userId: string }) => void): void { } function userAfkUpdate( - callback: (data: { userId: string; isAfk: boolean }) => void + callback: (data: { userId: string; isAfk: boolean }) => void, ): void { Socket.on("room_user_afk_update", callback); } @@ -169,7 +169,7 @@ function leaderChanged(callback: (data: { userId: string }) => void): void { } function chattingChanged( - callback: (data: { userId: string; isChatting: boolean }) => void + callback: (data: { userId: string; isChatting: boolean }) => void, ): void { Socket.on("room_chatting_changed", callback); } @@ -179,13 +179,13 @@ function chatMessage( message: string; from?: TribeTypes.User; isSystem: boolean; - }) => void + }) => void, ): void { Socket.on("room_chat_message", callback); } function configChanged( - callback: (data: { config: TribeTypes.RoomConfig }) => void + callback: (data: { config: TribeTypes.RoomConfig }) => void, ): void { Socket.on("room_config_changed", callback); } @@ -203,7 +203,7 @@ function countdown(callback: (data: { time: number }) => void): void { } function usersUpdate( - callback: (data: Record) => void + callback: (data: Record) => void, ): void { Socket.on("room_users_update", callback); } @@ -219,7 +219,7 @@ function progressUpdate( roomMaxWpm: number; roomMinRaw: number; roomMinWpm: number; - }) => void + }) => void, ): void { Socket.on("room_progress_update", callback); } @@ -229,13 +229,13 @@ function userResult( userId: string; result: TribeTypes.Result | undefined; everybodyCompleted: boolean; - }) => void + }) => void, ): void { Socket.on("room_user_result", callback); } function finishTimerCountdown( - callback: (data: { time: number }) => void + callback: (data: { time: number }) => void, ): void { Socket.on("room_finishTimer_countdown", callback); } @@ -269,7 +269,7 @@ function finalPositions( callback: (data: { positions: FinalPositions; miniCrowns: TribeTypes.MiniCrowns; - }) => void + }) => void, ): void { Socket.on("room_final_positions", callback); } diff --git a/frontend/src/ts/tribe/tribe-socket/routes/system.ts b/frontend/src/ts/tribe/tribe-socket/routes/system.ts index c2ff285a3..5fe77cfe9 100644 --- a/frontend/src/ts/tribe/tribe-socket/routes/system.ts +++ b/frontend/src/ts/tribe/tribe-socket/routes/system.ts @@ -5,6 +5,7 @@ /* eslint-disable @typescript-eslint/strict-boolean-expressions */ import Socket from "../socket"; import * as TribeTypes from "../../types"; +import { nativeLog } from "../../../utils/logger"; type VersionCheckResponse = { status: string; @@ -47,7 +48,7 @@ function connect(callback: () => void): void { if (matches) { const dat = JSON.parse(matches[0]); if (dat[1]) { - console.log( + nativeLog( "%cTI", "background:red;padding:0 5px;border-radius:10px", matches2[0] ?? "?", @@ -55,7 +56,7 @@ function connect(callback: () => void): void { dat[1], ); } else { - console.log( + nativeLog( "%cTI", "background:red;padding:0 5px;border-radius:10px", matches2[0] ?? "?", @@ -64,7 +65,7 @@ function connect(callback: () => void): void { } } } else { - console.log( + nativeLog( "%cTI", "background:red;padding:0 5px;border-radius:10px", type, @@ -81,7 +82,7 @@ function connect(callback: () => void): void { if (matches) { const dat = JSON.parse(matches[0]); if (dat[1]) { - console.log( + nativeLog( "%cTO", "background:blue;padding:0 5px;border-radius:10px", matches2[0] ?? "?", @@ -89,7 +90,7 @@ function connect(callback: () => void): void { dat[1], ); } else { - console.log( + nativeLog( "%cTO", "background:blue;padding:0 5px;border-radius:10px", matches2[0] ?? "?", @@ -98,7 +99,7 @@ function connect(callback: () => void): void { } } } else { - console.log( + nativeLog( "%cTO", "background:blue;padding:0 5px;border-radius:10px", type, diff --git a/frontend/src/ts/utils/logger.ts b/frontend/src/ts/utils/logger.ts index 478f51892..519762832 100644 --- a/frontend/src/ts/utils/logger.ts +++ b/frontend/src/ts/utils/logger.ts @@ -2,7 +2,7 @@ import { z } from "zod"; import { LocalStorageWithSchema } from "./local-storage-with-schema"; import { isDevEnvironment } from "./misc"; -const nativeLog = console.log; +export const nativeLog = console.log; const nativeWarn = console.warn; const nativeError = console.error;