From e0e6c30752af4d74ca8eff9058a0edaf788712bd Mon Sep 17 00:00:00 2001
From: Jonathan <jonathan.matthew@metzger.cc>
Date: Thu, 21 Mar 2024 17:48:24 -0500
Subject: [PATCH] Session tokens control player options for create / login

---
 app.lua             |  55 +++++++++++++++++++++++++++++++-------------
 database.sqlite3    | Bin 28672 -> 40960 bytes
 lua_scripts/map.lua |   6 ++---
 views/game.etlua    |   2 +-
 views/index.etlua   |   2 +-
 5 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/app.lua b/app.lua
index f9dff04..eed884b 100644
--- a/app.lua
+++ b/app.lua
@@ -1,4 +1,5 @@
 local lapis = require("lapis")
+local util = require("lapis.util")
 local app = lapis.Application()
 local say = require('lua_scripts/main')
 local mapFunc = require('lua_scripts/map')
@@ -15,9 +16,9 @@ app.layout = require "views.layout"
 
 app:post("/clickme", function(self)
 	self.text = "Map is already initialized. Beginning game."
-	self.isPopulated = mapFunc:mapExists(map)
+	self.isPopulated = mapFunc:mapExists(map, self.session.gameref)
 	if not self.isPopulated then
-		mapFunc:populate(map)
+		mapFunc:populate(map, self.session.gameref)
 		self.text = "Populated map."
 	end
 	return { self.text, layout = false }
@@ -25,7 +26,7 @@ end)
 
 app:get("/", function(self)
 	self.text = say.hello()
-	self.isPopulated = mapFunc:mapExists(map)
+	self.isPopulated = mapFunc:mapExists(map, self.session.gameref)
 	return { render = "index",
 
 	}
@@ -33,13 +34,14 @@ end)
 
 app:get("/game", function(self)
 	self.text = say.hello()
-	self.isPopulated = mapFunc:mapExists(map)
+	self.isPopulated = mapFunc:mapExists(map, self.session.gameref)
 	return { render = "game",
 
 	}
 end)
 
 app:post("/character-create", function(self)
+	self.params.playername = util.trim(self.params.playername)
 	if self.params.playername == "" then
 		self.text = "Player name must not be nil. Try again."
 		return {
@@ -48,9 +50,12 @@ app:post("/character-create", function(self)
 	end
 	local player_exists = games:find({player_id = self.params.playername})
 	if player_exists then
-		self.text = "Player name already exists. Try again."
+		self.text = "Welcome back, " .. self.params.playername .. "."
+		local game = games:find({player_id = self.params.playername})
+		self.session.gameref = game.id
+		self.link = "<a href='/game'>     Play Now</a>"
 		return {
-			self.text, layout = false
+			self.text, self.link, layout = false
 		}
 	end
 	if not player_exists then
@@ -67,18 +72,20 @@ app:post("/character-create", function(self)
 end)
 
 app:match("/map/render", function(self)
-	self.tiles = {}
-	for h = 1, 10 do
-		self.tiles[h] = {}
-		for i = 1, 10 do
-			-- The map database has floor_stone and wall_floor instead of simple ASCII characters
-			-- So we run mapFunc:mapDecrypt to convert it back to the desired characters for visual display
-			local tile = map:find({ x = h, y = i })
-			self.tiles[h][i] = mapFunc:mapDecrypt(tile.occupied_by_type)
+	if mapFunc:mapExists(map, self.session.gameref) then
+		self.tiles = {}
+		for h = 1, 10 do
+			self.tiles[h] = {}
+			for i = 1, 10 do
+				-- The map database has floor_stone and wall_floor instead of simple ASCII characters
+				-- So we run mapFunc:mapDecrypt to convert it back to the desired characters for visual display
+				local tile = map:find({ x = h, y = i })
+				self.tiles[h][i] = mapFunc:mapDecrypt(tile.occupied_by_type)
+			end
 		end
+		return { render = "map", layout = false }
 	end
-	return { render = "map", layout = false }
-end)
+	end)
 
 return app
 
@@ -112,6 +119,22 @@ return app
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
diff --git a/database.sqlite3 b/database.sqlite3
index a1896368c241c466ca7e2c444e89b9af0cc5472e..4413c81295e8b29868b103b46ffd97b20a118f64 100644
GIT binary patch
literal 40960
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

delta 38
ucmZoTz|`=7ae@>Z11kdq1N%e;J0=F!jR_0*HyN-fEM_rK*vw+^M;-vd#tIbx

diff --git a/lua_scripts/map.lua b/lua_scripts/map.lua
index 9da9245..43b3fe5 100644
--- a/lua_scripts/map.lua
+++ b/lua_scripts/map.lua
@@ -52,9 +52,9 @@ local map = {
             end
         end
     end,
-    mapExists = function(self, map)
-        local f = map:select("limit 1")
-        if not f[1] then
+    mapExists = function(self, map, game)
+        local f = map:find({game_ref = game})
+        if not f then
             return false
         else
             return true
diff --git a/views/game.etlua b/views/game.etlua
index 6def7a1..d12a8b5 100644
--- a/views/game.etlua
+++ b/views/game.etlua
@@ -7,7 +7,7 @@
 <% end %>
 <article class="container-fluid">
     <p style="text-align: center;">Game</p>
-    <main style="width: 50%;" class="container" id="map" hx-get="/map/render" hx-trigger="every 1s,load">
+    <main style="width: 50%;" class="container" id="map" hx-get="/map/render" hx-trigger="every 10s,load">
     </main>
     <div>
         <% render("views.player_ui") %>
diff --git a/views/index.etlua b/views/index.etlua
index 59709e6..88adbe8 100644
--- a/views/index.etlua
+++ b/views/index.etlua
@@ -9,7 +9,7 @@
 
 <article style="text-align: center;">
     <h3>Log In / Create Game</h3>
-    <p>Player will be created if player name does not already exist.</p>
+    <p>Player will be created if player name does not already exist. Names may not contain whitespace.</p>
     <form>
     <div class="grid">
         <input type="text" name="playername">