This commit is contained in:
cdle
2021-10-23 18:26:52 +08:00
parent b34d2f6dd9
commit a9aa65e41b
5 changed files with 20 additions and 1 deletions
+8 -1
View File
@@ -22,6 +22,7 @@ type Sender interface {
GetAllMatch() [][]string GetAllMatch() [][]string
Get(...int) string Get(...int) string
GetContent() string GetContent() string
SetContent(string)
IsAdmin() bool IsAdmin() bool
IsMedia() bool IsMedia() bool
Reply(...interface{}) (int, error) Reply(...interface{}) (int, error)
@@ -49,6 +50,7 @@ type Faker struct {
Message string Message string
Type string Type string
UserID interface{} UserID interface{}
ChatID interface{}
BaseSender BaseSender
} }
@@ -61,7 +63,7 @@ func (sender *Faker) GetUserID() interface{} {
} }
func (sender *Faker) GetChatID() interface{} { func (sender *Faker) GetChatID() interface{} {
return 0 return sender.ChatID
} }
func (sender *Faker) GetImType() string { func (sender *Faker) GetImType() string {
@@ -135,6 +137,7 @@ type BaseSender struct {
matches [][]string matches [][]string
goon bool goon bool
child Sender child Sender
Content string
} }
func (sender *BaseSender) SetMatch(ss []string) { func (sender *BaseSender) SetMatch(ss []string) {
@@ -144,6 +147,10 @@ func (sender *BaseSender) SetAllMatch(ss [][]string) {
sender.matches = ss sender.matches = ss
} }
func (sender *BaseSender) SetContent(content string) {
sender.Content = content
}
func (sender *BaseSender) GetMatch() []string { func (sender *BaseSender) GetMatch() []string {
return sender.matches[0] return sender.matches[0]
} }
+3
View File
@@ -21,6 +21,9 @@ type Sender struct {
} }
func (sender *Sender) GetContent() string { func (sender *Sender) GetContent() string {
if sender.Content != "" {
return sender.Content
}
text := "" text := ""
switch sender.Message.(type) { switch sender.Message.(type) {
case *message.PrivateMessage: case *message.PrivateMessage:
+3
View File
@@ -172,6 +172,9 @@ func init() {
} }
func (sender *Sender) GetContent() string { func (sender *Sender) GetContent() string {
if sender.Content != "" {
return sender.Content
}
return sender.Message.Text return sender.Message.Text
} }
+3
View File
@@ -208,6 +208,9 @@ type JsonMsg struct {
} }
func (sender *Sender) GetContent() string { func (sender *Sender) GetContent() string {
if sender.Content != "" {
return sender.Content
}
return sender.value.Msg return sender.value.Msg
} }
func (sender *Sender) GetUserID() interface{} { func (sender *Sender) GetUserID() interface{} {
+3
View File
@@ -114,6 +114,9 @@ type Sender struct {
} }
func (sender *Sender) GetContent() string { func (sender *Sender) GetContent() string {
if sender.Content != "" {
return sender.Content
}
return sender.Message return sender.Message
} }