From 5fbb2f0b2074638b12d9d29547be958fdcc5fcf1 Mon Sep 17 00:00:00 2001
From: Xwdit <xwditfr@gmail.com>
Date: Sat, 25 Jun 2022 11:54:29 +0200
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E6=B6=88=E6=81=AF=E7=9A=84=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=B8=8E=E7=9B=B8=E5=85=B3API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mirai/api/MessageAPI/Types/FaceMessage.gd |  2 +-
 .../api/MessageAPI/Types/MarketFaceMessage.gd | 29 +++++++++++++++++++
 libs/adapters/mirai/mirai_adapter.gd          |  2 ++
 project.godot                                 |  6 ++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 libs/adapters/mirai/api/MessageAPI/Types/MarketFaceMessage.gd

diff --git a/libs/adapters/mirai/api/MessageAPI/Types/FaceMessage.gd b/libs/adapters/mirai/api/MessageAPI/Types/FaceMessage.gd
index b6e9680d..db1c5d7f 100644
--- a/libs/adapters/mirai/api/MessageAPI/Types/FaceMessage.gd
+++ b/libs/adapters/mirai/api/MessageAPI/Types/FaceMessage.gd
@@ -36,7 +36,7 @@ func set_face_id(face_id:int):
 
 	
 func get_face_name()->String:
-	return data_dic.display
+	return data_dic.name
 	
 	
 func set_face_name(face_name:String):
diff --git a/libs/adapters/mirai/api/MessageAPI/Types/MarketFaceMessage.gd b/libs/adapters/mirai/api/MessageAPI/Types/MarketFaceMessage.gd
new file mode 100644
index 00000000..de46a00e
--- /dev/null
+++ b/libs/adapters/mirai/api/MessageAPI/Types/MarketFaceMessage.gd
@@ -0,0 +1,29 @@
+extends Message
+
+
+class_name MarketFaceMessage
+
+
+var data_dic:Dictionary = {
+	"type": "MarketFace",
+	"id": -1,
+	"name": ""
+}
+
+
+static func init_meta(dic:Dictionary)->MarketFaceMessage:
+	var ins:MarketFaceMessage = MarketFaceMessage.new()
+	ins.data_dic = dic
+	return ins
+
+
+func get_face_id()->int:
+	return data_dic.id
+
+
+func get_face_name()->String:
+	return data_dic.name
+	
+
+func get_as_text()->String:
+	return "[商城表情:"+get_face_name()+"]"
diff --git a/libs/adapters/mirai/mirai_adapter.gd b/libs/adapters/mirai/mirai_adapter.gd
index 6550ac12..e58fc149 100644
--- a/libs/adapters/mirai/mirai_adapter.gd
+++ b/libs/adapters/mirai/mirai_adapter.gd
@@ -89,6 +89,8 @@ func parse_message_dic(dic:Dictionary)->Message:
 			return AtAllMessage.init_meta(dic)
 		"Face":
 			return FaceMessage.init_meta(dic)
+		"MarketFace":
+			return MarketFaceMessage.init_meta(dic)
 		"Plain":
 			return TextMessage.init_meta(dic)
 		"Image":
diff --git a/project.godot b/project.godot
index 2fb24e2c..61b9f29a 100644
--- a/project.godot
+++ b/project.godot
@@ -299,6 +299,11 @@ _global_script_classes=[{
 "language": &"GDScript",
 "path": "res://libs/adapters/mirai/api/MessageAPI/Types/JsonMessage.gd"
 }, {
+"base": "Message",
+"class": &"MarketFaceMessage",
+"language": &"GDScript",
+"path": "res://libs/adapters/mirai/api/MessageAPI/Types/MarketFaceMessage.gd"
+}, {
 "base": "MemberAPI",
 "class": &"Member",
 "language": &"GDScript",
@@ -573,6 +578,7 @@ _global_script_class_icons={
 "HttpRequestResult": "",
 "ImageMessage": "",
 "JsonMessage": "",
+"MarketFaceMessage": "",
 "Member": "",
 "MemberAPI": "",
 "MemberHonorChangeEvent": "",