From 56fc00887283d39865fe577281e2acc8ed6afed8 Mon Sep 17 00:00:00 2001 From: WindowsSov8forUs Date: Fri, 12 Apr 2024 17:46:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?add:=20=E6=B7=BB=E5=8A=A0=20Interaction=20?= =?UTF-8?q?=E8=B5=84=E6=BA=90=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/interaction/interaction.go | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkg/interaction/interaction.go diff --git a/pkg/interaction/interaction.go b/pkg/interaction/interaction.go new file mode 100644 index 0000000..8536916 --- /dev/null +++ b/pkg/interaction/interaction.go @@ -0,0 +1,11 @@ +package interaction + +type Argv struct { + Name string `json:"name"` + Arguments []interface{} `json:"arguments"` + Options map[string]interface{} `json:"options"` +} + +type Button struct { + Id string `json:"id"` +} From 0cda200346d001db5c05d39cdd8e504d7677047b Mon Sep 17 00:00:00 2001 From: WindowsSov8forUs Date: Fri, 12 Apr 2024 18:02:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/guildmember/guildmember.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/guildmember/guildmember.go b/pkg/guildmember/guildmember.go index 20b1f73..306331a 100644 --- a/pkg/guildmember/guildmember.go +++ b/pkg/guildmember/guildmember.go @@ -3,10 +3,10 @@ package guildmember import "github.com/satori-protocol-go/satori-model-go/pkg/user" type GuildMember struct { - User *user.User `json:"user"` - Nick string `json:"nick"` - Avatar string `json:"avatar"` - JoinAt int64 `json:"join_at"` + User *user.User `json:"user"` + Nick string `json:"nick"` + Avatar string `json:"avatar"` + JoinedAt int64 `json:"joined_at"` } type GuildMemberList struct { From 8ee26a7f225db09917f4e38104e3140299844c46 Mon Sep 17 00:00:00 2001 From: WindowsSov8forUs Date: Fri, 12 Apr 2024 18:18:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/guildmember/guildmember.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/guildmember/guildmember.go b/pkg/guildmember/guildmember.go index 20b1f73..306331a 100644 --- a/pkg/guildmember/guildmember.go +++ b/pkg/guildmember/guildmember.go @@ -3,10 +3,10 @@ package guildmember import "github.com/satori-protocol-go/satori-model-go/pkg/user" type GuildMember struct { - User *user.User `json:"user"` - Nick string `json:"nick"` - Avatar string `json:"avatar"` - JoinAt int64 `json:"join_at"` + User *user.User `json:"user"` + Nick string `json:"nick"` + Avatar string `json:"avatar"` + JoinedAt int64 `json:"joined_at"` } type GuildMemberList struct { From 6322ed69328e5a97bbb4272556c5fff163fd20f0 Mon Sep 17 00:00:00 2001 From: WindowsSov8forUs Date: Mon, 15 Apr 2024 13:55:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update:=20=E6=B7=BB=E5=8A=A0=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .vscode/launch.json | 18 ------------------ pkg/message/parser_test_data.go | 7 +++++++ 3 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 .gitignore delete mode 100644 .vscode/launch.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f391642 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.vscode/ \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 30eeb52..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - // 使用 IntelliSense 了解相关属性。 - // 悬停以查看现有属性的描述。 - // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "TestMessageParser", - "type": "go", - "request": "launch", - "mode": "test", - "program": "${workspaceFolder}/pkg/message", - "env": {}, - "args": [], - "showLog": true - } - ] -} diff --git a/pkg/message/parser_test_data.go b/pkg/message/parser_test_data.go index 3ba8b42..3574d13 100644 --- a/pkg/message/parser_test_data.go +++ b/pkg/message/parser_test_data.go @@ -9,6 +9,7 @@ func _getRawMessage() map[string][]string { raw_message["meta"] = _getMetaRawMessage() raw_message["interact"] = _getInteractRawMessage() raw_message["extend"] = _getExtendRawMessage() + raw_message["escape"] = _getEscapeRawMessage() return raw_message } @@ -71,3 +72,9 @@ func _getExtendRawMessage() []string { `test`, } } + +func _getEscapeRawMessage() []string { + return []string{ + `<film&audio>"inner"`, + } +}