Merge pull request #6 from WindowsSov8forUs/master

feat: 添加 select 方法，调整列表格式
satori-protocol-go · Jun 18, 2024 · 63a4f1a · 63a4f1a
2 parents f5b421e + d99df3b
commit 63a4f1a
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 13 deletions.
diff --git a/pkg/channel/channel.go b/pkg/channel/channel.go
@@ -19,6 +19,6 @@ type Channel struct {
 
 // Channel 分页列表
 type ChannelList struct {
-	Data []Channel `json:"data"`           // 数据
-	Next string    `json:"next,omitempty"` // 下一页的令牌
+	Data []*Channel `json:"data"`           // 数据
+	Next string     `json:"next,omitempty"` // 下一页的令牌
 }
diff --git a/pkg/guild/guild.go b/pkg/guild/guild.go
@@ -9,6 +9,6 @@ type Guild struct {
 
 // Guild 分页列表
 type GuildList struct {
-	Data []Guild `json:"data"`           // 数据
-	Next string  `json:"next,omitempty"` // 下一页的令牌
+	Data []*Guild `json:"data"`           // 数据
+	Next string   `json:"next,omitempty"` // 下一页的令牌
 }
diff --git a/pkg/guildmember/guildmember.go b/pkg/guildmember/guildmember.go
@@ -12,6 +12,6 @@ type GuildMember struct {
 
 // GuildMember 分页列表
 type GuildMemberList struct {
-	Data []GuildMember `json:"data"`           // 数据
-	Next string        `json:"next,omitempty"` // 下一页的令牌
+	Data []*GuildMember `json:"data"`           // 数据
+	Next string         `json:"next,omitempty"` // 下一页的令牌
 }
diff --git a/pkg/guildrole/guildrole.go b/pkg/guildrole/guildrole.go
@@ -8,6 +8,6 @@ type GuildRole struct {
 
 // GuildRole 分页列表
 type GuildRoleList struct {
-	Data []GuildRole `json:"data"`           // 数据
-	Next string      `json:"next,omitempty"` // 下一页的令牌
+	Data []*GuildRole `json:"data"`           // 数据
+	Next string       `json:"next,omitempty"` // 下一页的令牌
 }
diff --git a/pkg/message/message.go b/pkg/message/message.go
@@ -21,9 +21,9 @@ type Message struct {
 
 // Message 双向分页列表
 type MessageBidiList struct {
-	Data []Message `json:"data"`           // 数据
-	Prev string    `json:"prev,omitempty"` // 上一页的令牌
-	Next string    `json:"next,omitempty"` // 下一页的令牌
+	Data []*Message `json:"data"`           // 数据
+	Prev string     `json:"prev,omitempty"` // 上一页的令牌
+	Next string     `json:"next,omitempty"` // 下一页的令牌
 }
 
 func (m *Message) Decode(elements []MessageElement) error {
@@ -41,3 +41,31 @@ func (m *Message) Encode() ([]MessageElement, error) {
 	}
 	return Parse(m.Content)
 }
+
+// Select 选取特定的消息元素
+func Select(element MessageElement, tag string) []MessageElement {
+	var selected []MessageElement
+
+	if element.Tag() == tag {
+		selected = append(selected, element)
+	}
+
+	selected = selectFromSlide(element.GetChildren(), tag, selected)
+
+	return selected
+}
+
+// selectFromSlide 从列表中选取特定的消息元素
+func selectFromSlide(elements []MessageElement, tag string, selected []MessageElement) []MessageElement {
+	for _, element := range elements {
+		if element.Tag() == tag {
+			selected = append(selected, element)
+		}
+	}
+
+	for _, element := range elements {
+		selected = append(selected, selectFromSlide(element.GetChildren(), tag, selected)...)
+	}
+
+	return selected
+}
diff --git a/pkg/message/message_element.go b/pkg/message/message_element.go
@@ -8,6 +8,7 @@ type MessageElement interface {
 	Tag() string
 	Stringify() string
 	Alias() []string
+	GetChildren() []MessageElement
 }
 
 type noAliasMessageElement struct {

diff --git a/pkg/message/message_element_basic.go b/pkg/message/message_element_basic.go
@@ -31,6 +31,10 @@ func (e *MessageElementText) Parse(n *html.Node) (MessageElement, error) {
 	return nil, nil
 }
 
+func (e *MessageElementText) GetChildren() []MessageElement {
+	return nil
+}
+
 type MessageElementAt struct {
 	*noAliasMessageElement
 	*ChildrenMessageElement

diff --git a/pkg/message/message_element_typography.go b/pkg/message/message_element_typography.go
@@ -20,6 +20,10 @@ func (e *MessageElmentBr) Parse(n *html.Node) (MessageElement, error) {
 	return &MessageElmentBr{}, nil
 }
 
+func (e *MessageElmentBr) GetChildren() []MessageElement {
+	return nil
+}
+
 type MessageElmentP struct {
 	*noAliasMessageElement
 	*ChildrenMessageElement

diff --git a/pkg/user/user.go b/pkg/user/user.go
@@ -11,6 +11,6 @@ type User struct {
 
 // User 分页列表
 type UserList struct {
-	Data []User `json:"data"`           // 数据
-	Next string `json:"next,omitempty"` // 下一页的令牌
+	Data []*User `json:"data"`           // 数据
+	Next string  `json:"next,omitempty"` // 下一页的令牌
 }