Public lobbies fix

OhMyGuus · May 11, 2021 · 69e9c1a · 69e9c1a
1 parent cf4c688
commit 69e9c1a
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "bettercrewlink",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"license": "GPL-3.0-or-later",
 	"description": "Free, open, Among Us proximity voice chat",
 	"repository": {

diff --git a/src/common/PublicLobby.ts b/src/common/PublicLobby.ts
@@ -1,3 +1,4 @@
+import { GameState } from './AmongUsState';
 export interface AmongusMod {
 	id: string;
 	label: string;
@@ -48,6 +49,8 @@ export interface PublicLobby {
 	mods: string;
 	isPublic: boolean;
 	server: string;
+	gameState: GameState;
+	stateTime: number;
 }
 
 export interface PublicLobbyMap {

diff --git a/src/renderer/LobbyBrowser/LobbyBrowser.tsx b/src/renderer/LobbyBrowser/LobbyBrowser.tsx
@@ -17,6 +17,7 @@ import i18next from 'i18next';
 import { Dialog, DialogActions, DialogContent, DialogContentText, DialogTitle } from '@material-ui/core';
 import languages from '../language/languages';
 import { PublicLobbyMap, PublicLobby, modList } from '../../common/PublicLobby';
+import { GameState } from '../../common/AmongUsState';
 
 const store = new Store<ISettings>();
 const serverUrl = store.get('serverURL', 'https://bettercrewl.ink/');
@@ -59,15 +60,34 @@ const servers: {
 	'50.116.1.42': 'North America',
 	'172.105.251.170': 'Europe',
 	'139.162.111.196': 'Asia',
-	'192.241.154.115' : 'skeld.net'
+	'192.241.154.115': 'skeld.net',
 };
 
+function sortLobbies(a: PublicLobby, b: PublicLobby) {
+	if (a.gameState === GameState.LOBBY && b.gameState !== GameState.LOBBY) {
+		return -1;
+	} else if (b.gameState === GameState.LOBBY && a.gameState !== GameState.LOBBY) {
+		return 1;
+	} else {
+		if (b.current_players === b.max_players && a.current_players !== a.max_players) {
+			return -1;
+		}
+		if (a.current_players < b.current_players) {
+			return 1;
+		} else if (a.current_players > b.current_players) {
+			return -1;
+		}
+		return 0;
+	}
+}
+
 // @ts-ignore
 export default function lobbyBrowser({ t }) {
 	const classes = useStyles();
 	const [publiclobbies, setPublicLobbies] = useState<PublicLobbyMap>({});
 	const [socket, setSocket] = useState<SocketIOClient.Socket>();
 	const [code, setCode] = React.useState('');
+	const [, forceRender] = useState({});
 
 	useEffect(() => {
 		const s = io(serverUrl, {
@@ -102,9 +122,13 @@ export default function lobbyBrowser({ t }) {
 			console.log('ERROR: ', code);
 			setCode(`${code}  ${servers[server] ? `on region ${servers[server]}` : `\n Custom Server: ${server}`}`);
 		});
+		var secondPassed = setInterval(() => {
+			forceRender({});
+		}, 1000);
 		return () => {
 			socket?.emit('lobbybrowser', false);
 			socket?.close();
+			clearInterval(secondPassed);
 		};
 	}, []);
 
@@ -123,7 +147,7 @@ export default function lobbyBrowser({ t }) {
 					<DialogContent>
 						<DialogContentText id="alert-dialog-slide-description">
 							{code.split('\n').map((i, key) => {
-								return <p key={key}>{i}</p>;
+								return <span key={key}>{i}</span>;
 							})}
 						</DialogContentText>
 					</DialogContent>
@@ -143,43 +167,56 @@ export default function lobbyBrowser({ t }) {
 									<StyledTableCell align="left">{t('lobbybrowser.list.players')}</StyledTableCell>
 									<StyledTableCell align="left">{t('lobbybrowser.list.mods')}</StyledTableCell>
 									<StyledTableCell align="left">{t('lobbybrowser.list.language')}</StyledTableCell>
+									<StyledTableCell align="left">Status</StyledTableCell>
+									{/* {t('lobbybrowser.list.staut')} */}
 									<StyledTableCell align="left"></StyledTableCell>
 								</TableRow>
 							</TableHead>
 							<TableBody>
-								{Object.values(publiclobbies).map((row: PublicLobby) => (
-									<StyledTableRow key={row.id}>
-										<StyledTableCell component="th" scope="row">
-											{row.title}
-										</StyledTableCell>
-										<StyledTableCell align="left">{row.host}</StyledTableCell>
-										<StyledTableCell align="left">
-											{row.current_players}/{row.max_players}
-										</StyledTableCell>
-										<StyledTableCell align="left">{modList.find((o) => o.id === row.mods)?.label ?? 'None'}</StyledTableCell>
-										<StyledTableCell align="left">{(languages as any)[row.language]?.name ?? 'English'}</StyledTableCell>
-										<StyledTableCell align="right">
-											<Button
-												variant="contained"
-												color="secondary"
-												onClick={() => {
-													socket?.emit('join_lobby', row.id, (state: number, codeOrError: string, server: string) => {
-														if (state === 0) {
-															ipcRenderer.send(IpcHandlerMessages.JOIN_LOBBY, codeOrError, server);
-														} else {
-															setCode(`Error: ${codeOrError}`);
-														}
-													});
-												}}
-											>
-												Join
-											</Button>
-											{/* <Button variant="contained" color="secondary" style={{ marginLeft: '5px' }}>
+								{Object.values(publiclobbies)
+									.sort(sortLobbies)
+									.map((row: PublicLobby) => (
+										<StyledTableRow key={row.id}>
+											<StyledTableCell component="th" scope="row">
+												{row.title}
+											</StyledTableCell>
+											<StyledTableCell align="left">{row.host}</StyledTableCell>
+											<StyledTableCell align="left">
+												{row.current_players}/{row.max_players}
+											</StyledTableCell>
+											<StyledTableCell align="left">
+												{modList.find((o) => o.id === row.mods)?.label ?? 'None'}
+											</StyledTableCell>
+											<StyledTableCell align="left">
+												{(languages as any)[row.language]?.name ?? 'English'}
+											</StyledTableCell>
+											<StyledTableCell align="left">
+												{row.gameState === GameState.LOBBY ? 'Lobby' : 'In game'}{' '}
+												{row.stateTime && new Date(Date.now() - row.stateTime).toISOString().substr(14, 5)}
+											</StyledTableCell>
+											<StyledTableCell align="right">
+												<Button
+													disabled={row.gameState !== GameState.LOBBY || row.max_players === row.current_players}
+													variant="contained"
+													color="secondary"
+													onClick={() => {
+														socket?.emit('join_lobby', row.id, (state: number, codeOrError: string, server: string, publicLobby: PublicLobby) => {
+															if (state === 0) {
+																ipcRenderer.send(IpcHandlerMessages.JOIN_LOBBY, codeOrError, server);
+															} else {
+																setCode(`Error: ${codeOrError}`);
+															}
+														});
+													}}
+												>
+													Join
+												</Button>
+												{/* <Button variant="contained" color="secondary" style={{ marginLeft: '5px' }}>
 												report
 											</Button> */}
-										</StyledTableCell>
-									</StyledTableRow>
-								))}
+											</StyledTableCell>
+										</StyledTableRow>
+									))}
 							</TableBody>
 						</Table>
 					</TableContainer>

diff --git a/src/renderer/Voice.tsx b/src/renderer/Voice.tsx
@@ -650,8 +650,7 @@ const Voice: React.FC<VoiceProps> = function ({ t, error: initialError }: VoiceP
 			server: gameState.currentServer,
 			language: lobbySettings.publicLobby_language,
 			mods: gameState.mod !== 'NONE' ? gameState.mod : lobbySettings.publicLobby_mods,
-			isPublic: lobbySettings.publicLobby_on && gameState.gameState == GameState.LOBBY,
-			isPublic2:lobbySettings.publicLobby_on, // TEMP DEBUG 
+			isPublic: lobbySettings.publicLobby_on,
 			gameState: gameState.gameState,
 		});
 	};