X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fcomponents%2Fpages%2FTournament.js;h=6e32227ab2d04d330b8025dc16744fdbbee5d606;hb=2b3d5b3d98705cda41a7218d7133234b227e87b6;hp=5a9c8b05c207ce74db4c159559bdef5b5511b106;hpb=a907ef7c6676fef11f42933b2d79bdd496b20122;p=alttp.git

diff --git a/resources/js/components/pages/Tournament.js b/resources/js/components/pages/Tournament.js
index 5a9c8b0..6e32227 100644
--- a/resources/js/components/pages/Tournament.js
+++ b/resources/js/components/pages/Tournament.js
@@ -7,7 +7,7 @@ import ErrorMessage from '../common/ErrorMessage';
 import Loading from '../common/Loading';
 import NotFound from '../pages/NotFound';
 import Detail from '../tournament/Detail';
-import { patchResult, patchRound, sortParticipants } from '../../helpers/Tournament';
+import { patchResult, patchRound, patchUser, sortParticipants } from '../../helpers/Tournament';
 
 const Tournament = () => {
 	const params = useParams();
@@ -34,9 +34,8 @@ const Tournament = () => {
 	}, [id]);
 
 	useEffect(() => {
-		window.Echo.private(`Tournament.${id}`)
+		window.Echo.channel(`Tournament.${id}`)
 			.listen('ResultReported', e => {
-				console.log(e);
 				if (e.result) {
 					setTournament(tournament => patchResult(tournament, e.result));
 				}
@@ -45,7 +44,7 @@ const Tournament = () => {
 				if (e.round) {
 					setTournament(tournament => ({
 						...tournament,
-						rounds: [...tournament.rounds, e.round],
+						rounds: [e.round, ...tournament.rounds],
 					}));
 				}
 			})
@@ -53,12 +52,31 @@ const Tournament = () => {
 				if (e.round) {
 					setTournament(tournament => patchRound(tournament, e.round));
 				}
+			})
+			.listen('TournamentChanged', e => {
+				if (e.tournament) {
+					setTournament(tournament => ({ ...tournament, ...e.tournament }));
+				}
 			});
 		return () => {
 			window.Echo.leave(`Tournament.${id}`);
 		};
 	}, [id]);
 
+	useEffect(() => {
+		const cb = (e) => {
+			if (e.user) {
+				setTournament(tournament => patchUser(tournament, e.user));
+			}
+		};
+		window.Echo.channel('App.Control')
+			.listen('UserChanged', cb);
+		return () => {
+			window.Echo.channel('App.Control')
+				.stopListening('UserChanged', cb);
+		};
+	}, []);
+
 	if (loading) {
 		return <Loading />;
 	}