This commit is contained in:
cdle
2021-10-06 14:58:32 +08:00
parent aac41a7a1a
commit bc0b4fe6bd
5 changed files with 4 additions and 34 deletions
-5
View File
@@ -19,7 +19,6 @@ type Sender interface {
GetAllMatch() [][]string GetAllMatch() [][]string
Get(...int) string Get(...int) string
GetContent() string GetContent() string
GetUserName() string
IsAdmin() bool IsAdmin() bool
IsMedia() bool IsMedia() bool
Reply(...interface{}) (int, error) Reply(...interface{}) (int, error)
@@ -156,10 +155,6 @@ func (sender *Faker) Finish() {
} }
func (sender *Faker) GetUserName() string {
return ""
}
func (sender *Faker) Continue() { func (sender *Faker) Continue() {
} }
+3 -3
View File
@@ -146,8 +146,8 @@ func init() {
v, _ := otto.ToValue(s.Get(int(i - 1))) v, _ := otto.ToValue(s.Get(int(i - 1)))
return v return v
} }
GetUserName := func() otto.Value { GetUsername := func() otto.Value {
v, _ := otto.ToValue(s.GetUserName()) v, _ := otto.ToValue(s.GetUsername())
return v return v
} }
Continue := func() { Continue := func() {
@@ -155,7 +155,7 @@ func init() {
} }
vm := otto.New() vm := otto.New()
vm.Set("Continue", Continue) vm.Set("Continue", Continue)
vm.Set("GetUserName", GetUserName) vm.Set("GetUsername", GetUsername)
vm.Set("set", set) vm.Set("set", set)
vm.Set("param", param) vm.Set("param", param)
vm.Set("get", get) vm.Set("get", get)
+1 -14
View File
@@ -75,19 +75,6 @@ func (sender *Sender) GetMessageID() int {
return id return id
} }
func (sender *Sender) GetUsername() string {
name := ""
switch sender.Message.(type) {
case *message.PrivateMessage:
name = sender.Message.(*message.PrivateMessage).Sender.Nickname
case *message.TempMessage:
name = sender.Message.(*message.TempMessage).Sender.Nickname
case *message.GroupMessage:
name = sender.Message.(*message.GroupMessage).Sender.Nickname
}
return name
}
func (sender *Sender) IsReply() bool { func (sender *Sender) IsReply() bool {
return false return false
} }
@@ -280,7 +267,7 @@ func (sender *Sender) Finish() {
} }
func (sender *Sender) GetUserName() string { func (sender *Sender) GetUsername() string {
switch sender.Message.(type) { switch sender.Message.(type) {
case *message.PrivateMessage: case *message.PrivateMessage:
-8
View File
@@ -258,14 +258,6 @@ func (sender *Sender) Finish() {
} }
func (sender *Sender) GetUserName() string {
name := sender.Message.Sender.Username
if name == "" {
name = fmt.Sprint(sender.Message.Sender.ID)
}
return name
}
func (sender *Sender) Continue() { func (sender *Sender) Continue() {
sender.goon = true sender.goon = true
} }
-4
View File
@@ -206,10 +206,6 @@ func (sender *Sender) Finish() {
sender.Wait <- sender.Responses sender.Wait <- sender.Responses
} }
func (sender *Sender) GetUserName() string {
return ""
}
func (sender *Sender) Continue() { func (sender *Sender) Continue() {
sender.goon = true sender.goon = true
} }