From 81fd3fc8a91eabf94c3efe9d4afca6a3056f9040 Mon Sep 17 00:00:00 2001
From: "C.Ponapalt" <ponapalt@shillest.net>
Date: Fri, 26 Apr 2024 08:44:31 +0900
Subject: [PATCH] =?UTF-8?q?strdecode,strencode=E3=81=AE=E6=89=8B=E7=9B=B4?=
 =?UTF-8?q?=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yaya_saori/builtins.aym | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/yaya_saori/builtins.aym b/yaya_saori/builtins.aym
index 5f8e410..73d761d 100644
--- a/yaya_saori/builtins.aym
+++ b/yaya_saori/builtins.aym
@@ -1331,32 +1331,14 @@ getseccount
 
 getstrurldecode
 {
-	if ARRAYSIZE(REQ.ARGS) < 1 {
-		LOGGING("getseccount: 引数が不足しています")
-		-1
-		return
-	}
-	if REQ.ARGS[1]=="" {
-		RES.RESULT = GETSTRURLDECODE(REQ.ARGS[0])
-	}
-	else {
-		RES.RESULT = GETSTRURLDECODE(REQ.ARGS[0],REQ.ARGS[1])
-	}
+	strdecode()
+	return
 }
 
 getstrurlencode
 {
-	if ARRAYSIZE(REQ.ARGS) < 1 {
-		LOGGING("getstrurlencode: 引数が不足しています")
-		-1
-		return
-	}
-	if REQ.ARGS[1]=="" {
-		RES.RESULT = GETSTRURLENCODE(REQ.ARGS[0])
-	}
-	else {
-		RES.RESULT = GETSTRURLENCODE(REQ.ARGS[0],REQ.ARGS[1])
-	}
+	strencode()
+	return
 }
 
 han2zen
@@ -1665,10 +1647,10 @@ strdecode
 		RES.RESULT = STRDECODE(REQ.ARGS[0])
 	}
 	elseif REQ.ARGS[2]=="" {
-		RES.RESULT = STRENCODE(REQ.ARGS[0],REQ.ARGS[1])
+		RES.RESULT = STRDECODE(REQ.ARGS[0],TOAUTO(REQ.ARGS[1]))
 	}
 	else {
-		RES.RESULT = STRDECODE(REQ.ARGS[0],REQ.ARGS[1],REQ.ARGS[2])
+		RES.RESULT = STRDECODE(REQ.ARGS[0],TOAUTO(REQ.ARGS[1]),REQ.ARGS[2])
 	}
 }
 
@@ -1683,10 +1665,10 @@ strencode
 		RES.RESULT = STRENCODE(REQ.ARGS[0])
 	}
 	elseif REQ.ARGS[2]=="" {
-		RES.RESULT = STRENCODE(REQ.ARGS[0],REQ.ARGS[1])
+		RES.RESULT = STRENCODE(REQ.ARGS[0],TOAUTO(REQ.ARGS[1]))
 	}
 	else {
-		RES.RESULT = STRENCODE(REQ.ARGS[0],REQ.ARGS[1],REQ.ARGS[2])
+		RES.RESULT = STRENCODE(REQ.ARGS[0],TOAUTO(REQ.ARGS[1]),REQ.ARGS[2])
 	}
 }