From 26020a55399578211b3b556606585d5838d6a63f Mon Sep 17 00:00:00 2001
From: Tissevert <tissevert+devel@marvid.fr>
Date: Mon, 13 Jan 2020 18:05:11 +0100
Subject: [PATCH] =?UTF-8?q?Keep=20sorting=20things=20between=20view,=20mod?=
 =?UTF-8?q?els,=20full=20game=20states=20and=20games=20list=20entries=20?=
 =?UTF-8?q?=E2=80=94=20should=20yield=20to=20simplifying=20Table=20module?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/GUI/Screen/Hall.js         | 17 +++++++++++------
 js/GUI/Screen/Hall/Games.js   | 11 ++++++-----
 js/GUI/Screen/Hall/Players.js | 11 ++++++++---
 js/Games.js                   | 16 +++++++++-------
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/js/GUI/Screen/Hall.js b/js/GUI/Screen/Hall.js
index 9b66e73..598e3cc 100644
--- a/js/GUI/Screen/Hall.js
+++ b/js/GUI/Screen/Hall.js
@@ -1,10 +1,12 @@
 import * as Dom from UnitJS.Dom;
+import Games;
 import I18n;
 import * as Players from GUI.Screen.Hall.Players;
-import * as Games from GUI.Screen.Hall.Games;
+import * as GamesGUI from GUI.Screen.Hall.Games;
 import Messaging;
 import opponent from Room;
 import StatusHandler;
+import Time;
 
 return {
 	init: init
@@ -27,19 +29,22 @@ function init() {
 	});
 	Messaging.addEventListener(["Relay", "Invitation"], function(o) {
 		StatusHandler.set("🎴");
-		Games.entries.insert(o.from, {vs: opponent(o.from), yourTurn: true});
-		Games.refresh();
+		Games.entries.insert(
+			o.from,
+			Time.timestamp({vs: opponent(o.from), yourTurn: true})
+		);
+		GamesGUI.refresh();
 	});
 	Messaging.addEventListener(["Relay", "Answer"], function(o) {
 		Games.entries.remove(o.from);
-		Games.refresh();
+		GamesGUI.refresh();
 	});
 	Messaging.addEventListener(["Game"], function(o) {
-		Games.refresh();
+		GamesGUI.refresh();
 	});
 }
 
 function refresh() {
 	Players.refresh();
-	Games.refresh();
+	GamesGUI.refresh();
 }
diff --git a/js/GUI/Screen/Hall/Games.js b/js/GUI/Screen/Hall/Games.js
index 1aeebec..e8eb5bf 100644
--- a/js/GUI/Screen/Hall/Games.js
+++ b/js/GUI/Screen/Hall/Games.js
@@ -7,13 +7,13 @@ import dialog from GUI.Screen;
 import * as Dom from UnitJS.Dom;
 
 var list = ListSelector.make('games', showGame);
-initMessageHandlers();
+//initMessageHandlers();
 
 return {
-	entries: entries,
 	refresh: refresh
 };
 
+/*
 function entry(key, config) {
 	return {
 		key: key,
@@ -26,9 +26,10 @@ function entry(key, config) {
 function initMessageHandlers() {
 	Messaging.addEventListener(["Game"], function(o) {
 		var sessionKey = Session.getKey();
-		entries.insert(o.state.gameID, Games.entry(o.state));
+		Games.entries.insert(o.state.gameID, Games.entry(o.state));
 	});
 }
+*/
 
 function showGame(game) {
 	var liContent;
@@ -65,7 +66,7 @@ function pendingGame(game) {
 function answer(key, accept) {
 	return function() {
 		Messaging.send({tag: "Answer", accept: accept, to: key});
-		entries.remove(key);
+		Games.entries.remove(key);
 		refresh();
 	}
 }
@@ -84,7 +85,7 @@ function answerDialog(key) {
 }
 
 function refresh() {
-	var sortedGames = entries.getAll();
+	var sortedGames = Games.entries.getAll();
 	list.refresh(sortedGames);
 	if(sortedGames.length < 1) {
 		list.message.textContent = I18n.get('noGames');
diff --git a/js/GUI/Screen/Hall/Players.js b/js/GUI/Screen/Hall/Players.js
index 668bd57..10f1df6 100644
--- a/js/GUI/Screen/Hall/Players.js
+++ b/js/GUI/Screen/Hall/Players.js
@@ -1,9 +1,11 @@
+import Games;
 import * as ConnectedForm from GUI.ConnectedForm;
 import * as ListSelector from GUI.ListSelector;
-import * as Games from GUI.Screen.Hall.Games;
+import * as GamesGUI from GUI.Screen.Hall.Games;
 import I18n;
 import Messaging;
 import {opponent, players} from Room;
+import Time;
 import * as Dom from UnitJS.Dom;
 
 var form = ConnectedForm.get('room');
@@ -21,8 +23,11 @@ function initDOM() {
 	form.root.addEventListener('submit', function(e) {
 		e.preventDefault();
 		Messaging.send({tag: "Invitation", to: them});
-		Games.entries.insert(them, {vs: opponent(them), yourTurn: false});
-		Games.refresh();
+		Games.entries.insert(
+			them,
+			Time.timestamp({vs: opponent(them), yourTurn: false})
+		);
+		GamesGUI.refresh();
 	});
 	form.root.them.addEventListener("input", function() {refresh();});
 }
diff --git a/js/Games.js b/js/Games.js
index dd20d43..793740b 100644
--- a/js/Games.js
+++ b/js/Games.js
@@ -3,34 +3,36 @@ import opponent from Room;
 import Save;
 import Session;
 import Table;
+import Time;
 
 var entries = Table.make(makeEntry, 'date');
 initMessageHandlers();
 
 return {
-	entry: entry,
-	timestamp: timestamp
+	entries: entries
 };
 
 function entry(state) {
 	var sessionKey = Session.getKey();
-	return timestamp({
+	return Time.timestamp({
 		vs: opponent(state.public.nextPlayer[sessionKey]),
 		yourTurn: state.public.playing == sessionKey
 	});
 }
 
-function timestamp(config) {
+function makeEntry(key, config) {
 	return {
+		key: key,
 		vs: config.vs,
 		yourTurn: config.yourTurn,
-		date: Date.now()
+		date: config.date
 	};
 }
 
 function initMessageHandlers() {
 	Messaging.addEventListener(["Game"], function(o) {
-		Save.set("games.state." + o.state.gameID, o.state);
-		Save.set("games.entry." + o.state.gameID, entry(o.state));
+		var gameID = o.state.public.gameState.gameID;
+		Save.set("games.state." + gameID, o.state);
+		Save.set("games.entry." + gameID, entry(o.state));
 	});
 }