From bc0b4fe6bd46d6f41a1f50014082abae46ae40e8 Mon Sep 17 00:00:00 2001
From: cdle <798731886@qq.com>
Date: Wed, 6 Oct 2021 14:58:32 +0800
Subject: [PATCH] update

---
 core/im.go      |  5 -----
 core/otto.go    |  6 +++---
 im/qq/sender.go | 15 +--------------
 im/tg/tg.go     |  8 --------
 im/wxmp/init.go |  4 ----
 5 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/core/im.go b/core/im.go
index 31551f5..48e3329 100644
--- a/core/im.go
+++ b/core/im.go
@@ -19,7 +19,6 @@ type Sender interface {
 	GetAllMatch() [][]string
 	Get(...int) string
 	GetContent() string
-	GetUserName() string
 	IsAdmin() bool
 	IsMedia() bool
 	Reply(...interface{}) (int, error)
@@ -156,10 +155,6 @@ func (sender *Faker) Finish() {
 
 }
 
-func (sender *Faker) GetUserName() string {
-	return ""
-}
-
 func (sender *Faker) Continue() {
 
 }
diff --git a/core/otto.go b/core/otto.go
index 4307168..3e5249e 100644
--- a/core/otto.go
+++ b/core/otto.go
@@ -146,8 +146,8 @@ func init() {
 				v, _ := otto.ToValue(s.Get(int(i - 1)))
 				return v
 			}
-			GetUserName := func() otto.Value {
-				v, _ := otto.ToValue(s.GetUserName())
+			GetUsername := func() otto.Value {
+				v, _ := otto.ToValue(s.GetUsername())
 				return v
 			}
 			Continue := func() {
@@ -155,7 +155,7 @@ func init() {
 			}
 			vm := otto.New()
 			vm.Set("Continue", Continue)
-			vm.Set("GetUserName", GetUserName)
+			vm.Set("GetUsername", GetUsername)
 			vm.Set("set", set)
 			vm.Set("param", param)
 			vm.Set("get", get)
diff --git a/im/qq/sender.go b/im/qq/sender.go
index 18e27bb..894ba3a 100644
--- a/im/qq/sender.go
+++ b/im/qq/sender.go
@@ -75,19 +75,6 @@ func (sender *Sender) GetMessageID() int {
 	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 {
 	return false
 }
@@ -280,7 +267,7 @@ func (sender *Sender) Finish() {
 
 }
 
-func (sender *Sender) GetUserName() string {
+func (sender *Sender) GetUsername() string {
 
 	switch sender.Message.(type) {
 	case *message.PrivateMessage:
diff --git a/im/tg/tg.go b/im/tg/tg.go
index feb5dd3..e68aa60 100644
--- a/im/tg/tg.go
+++ b/im/tg/tg.go
@@ -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() {
 	sender.goon = true
 }
diff --git a/im/wxmp/init.go b/im/wxmp/init.go
index f00c3f2..c361ab2 100644
--- a/im/wxmp/init.go
+++ b/im/wxmp/init.go
@@ -206,10 +206,6 @@ func (sender *Sender) Finish() {
 	sender.Wait <- sender.Responses
 }
 
-func (sender *Sender) GetUserName() string {
-	return ""
-}
-
 func (sender *Sender) Continue() {
 	sender.goon = true
 }