From b916a4cb073129601597b46e1c965a9ea2d0c058 Mon Sep 17 00:00:00 2001
From: Miteruzo <matuda.miteruzo@gmail.com>
Date: Thu, 20 Jul 2023 00:32:30 +0900
Subject: [PATCH] =?UTF-8?q?Split=20=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=EF=BC=9B=E3=82=82=E3=81=97=E3=81=8B=E3=81=97=E3=81=A6=E9=9D=9E?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C=3F=3F=3F=3F=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/setting.dat      | Bin 0 -> 36 bytes
 modules/chat.mod.hsp    |  16 ++++------------
 modules/http.mod.hsp    |  13 ++++++++-----
 modules/setting.mod.hsp |  27 +++++++++++++++++----------
 modules/user.mod.hsp    |  14 +++++---------
 5 files changed, 34 insertions(+), 36 deletions(-)
 create mode 100644 assets/setting.dat

diff --git a/assets/setting.dat b/assets/setting.dat
new file mode 100644
index 0000000000000000000000000000000000000000..5516e8f98aadc0ee2eed55e93388d53f5d9b7df3
GIT binary patch
literal 36
KcmZQzAPfKiBme;b

literal 0
HcmV?d00001

diff --git a/modules/chat.mod.hsp b/modules/chat.mod.hsp
index 62d9878..d78039d 100644
--- a/modules/chat.mod.hsp
+++ b/modules/chat.mod.hsp
@@ -1,3 +1,6 @@
+#include "./modules/http.mod.hsp"
+
+
 #ifndef __CHAT__
 #define __CHAT__
 
@@ -6,21 +9,10 @@ Chat
 
 #define URL	(CONFIG_SERVER_URL + "/chat.php")
 
-#defcfunc local \
-New \
-		int	p_id
-	id.insNum = p_id
-
-	insNum++
-
-	Return insNum - 1
-
 #deffunc local \
 Send \
-		int	p_insId,\
 		str	p_message
-	HTTPLoad@ URL + StrF ("?id=%d&text=%s", id.p_insId, p_message)
-	HTTPInfo _, HTTPINFO_MODE
+	Fetch@Http URL + StrF ("?id=%d&text=%s", id.p_insId, p_message)
 
 	Return
 
diff --git a/modules/http.mod.hsp b/modules/http.mod.hsp
index a4dfe88..977d771 100644
--- a/modules/http.mod.hsp
+++ b/modules/http.mod.hsp
@@ -10,7 +10,6 @@ Http
 #deffunc local \
 Fetch \
 		str	p_url,\
-		local	l_res,\
 		local	l_size
 	HTTPLoad p_url
 
@@ -35,14 +34,18 @@ Fetch \
 			HTTPInfo data, HTTPINFO_DATA
 
 			status = STATUS_SUCCESS
+		}
+		Else {
+			HTTPInfo errMsg, HTTPINFO_ERROR
 
-			Return
+			status = STATUS_ERROR
 		}
 	}
+	Else {
+		HTTPInfo errMsg, HTTPINFO_ERROR
 
-	HTTPInfo errMsg, HTTPINFO_ERROR
-
-	status = STATUS_ERROR
+		status = STATUS_ERROR
+	}
 
 	Return
 
diff --git a/modules/setting.mod.hsp b/modules/setting.mod.hsp
index a07bde2..ae4e81b 100644
--- a/modules/setting.mod.hsp
+++ b/modules/setting.mod.hsp
@@ -20,9 +20,9 @@ Setting
 
 #deffunc local \
 Load
-	userId = 0
-	SDim userPasscode, USER_PASSCODE_SIZE
-	SDim userInheritanceCode, USER_INHERITANCE_CODE_SIZE
+	id@User = 0
+	SDim pass@User, USER_PASSCODE_SIZE
+	SDim inheritanceCode@User, USER_INHERITANCE_CODE_SIZE
 
 	Exist FILE_NAME
 	If strSize < 0 {
@@ -31,17 +31,24 @@ Load
 		Return
 	}
 
-	BLoad FILE_NAME, userId, USER_ID_SIZE, USER_ID_OFFSET
-	BLoad FILE_NAME, userPasscode, USER_PASSCODE_SIZE, USER_PASSCODE_OFFSET
-	BLoad FILE_NAME, userInheritanceCode, USER_INHERITANCE_CODE_SIZE, USER_INHERITANCE_CODE_OFFSET
+	BLoad FILE_NAME, id@User, USER_ID_SIZE, USER_ID_OFFSET
+	BLoad FILE_NAME, pass@User, USER_PASSCODE_SIZE, USER_PASSCODE_OFFSET
+	BLoad FILE_NAME, inheritanceCode@User, USER_INHERITANCE_CODE_SIZE, USER_INHERITANCE_CODE_OFFSET
 
 	Return
 
 #deffunc local \
-Save
-	BSave FILE_NAME, userId, USER_ID_SIZE, USER_ID_OFFSET
-	BSave FILE_NAME, userPasscode, USER_PASSCODE_SIZE, USER_PASSCODE_OFFSET
-	BSave FILE_NAME, userInheritanceCode, USER_INHERITANCE_CODE_SIZE, USER_INHERITANCE_CODE_OFFSET
+Save \
+		local	l_dummy
+	Exist FILE_NAME
+	If strSize < 0 {
+		l_dummy = ""
+		BSave FILE_NAME, l_dummy, 0
+	}
+
+	BSave FILE_NAME, id@User, USER_ID_SIZE, USER_ID_OFFSET
+	BSave FILE_NAME, pass@User, USER_PASSCODE_SIZE, USER_PASSCODE_OFFSET
+	BSave FILE_NAME, inheritanceCode@User, USER_INHERITANCE_CODE_SIZE, USER_INHERITANCE_CODE_OFFSET
 
 	Load
 
diff --git a/modules/user.mod.hsp b/modules/user.mod.hsp
index 4fba1a6..7644608 100644
--- a/modules/user.mod.hsp
+++ b/modules/user.mod.hsp
@@ -13,16 +13,15 @@ User
 
 #deffunc local \
 Create \
-		str	p_name,\
-		local	l_data
+		str	p_name
 	Fetch@Http CREATE_URL + "?name=" + p_name
 
 	If status@Http = STATUS_SUCCESS@Http {
-		Split data@Http, ",", l_data
+		Split data@Http, ",", create_data
 
-		id = Int (l_data.0)
-		pass = l_data.1
-		inheritanceCode = l_data.2
+		id = Int (create_data.0)
+		pass = create_data.1
+		inheritanceCode = create_data.2
 	}
 	Else {
 		id = 0
@@ -40,9 +39,6 @@ Auth \
 		local	l_data
 	Load@Setting
 
-	id = userId@Setting
-	pass = userPasscode@Setting
-
 	If id <= 0 {
 		Return
 	}