diff --git a/.gitignore b/.gitignore index d7b071c..ced3e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,5 @@ data dwz replies qinglongs -sets.conf \ No newline at end of file +sets.conf +yawx \ No newline at end of file diff --git a/core/im.go b/core/im.go index 1aa19d4..61723f5 100644 --- a/core/im.go +++ b/core/im.go @@ -5,8 +5,8 @@ import ( ) type Sender interface { - GetUserID() int - GetChatID() int + GetUserID() interface{} + GetChatID() interface{} GetImType() string GetMessageID() int GetUsername() string @@ -45,18 +45,18 @@ type Faker struct { Message string matches [][]string Type string - UserID int + UserID interface{} } func (sender *Faker) GetContent() string { return sender.Message } -func (sender *Faker) GetUserID() int { +func (sender *Faker) GetUserID() interface{} { return sender.UserID } -func (sender *Faker) GetChatID() int { +func (sender *Faker) GetChatID() interface{} { return 0 } diff --git a/im/qq/sender.go b/im/qq/sender.go index 18f3fed..4622702 100644 --- a/im/qq/sender.go +++ b/im/qq/sender.go @@ -38,7 +38,7 @@ func (sender *Sender) GetContent() string { return text } -func (sender *Sender) GetUserID() int { +func (sender *Sender) GetUserID() interface{} { id := 0 switch sender.Message.(type) { case *message.PrivateMessage: @@ -51,7 +51,7 @@ func (sender *Sender) GetUserID() int { return id } -func (sender *Sender) GetChatID() int { +func (sender *Sender) GetChatID() interface{} { id := 0 switch sender.Message.(type) { case *message.GroupMessage: diff --git a/im/tg/tg.go b/im/tg/tg.go index 326f1a1..054171a 100644 --- a/im/tg/tg.go +++ b/im/tg/tg.go @@ -146,11 +146,11 @@ func (sender *Sender) GetContent() string { return sender.Message.Text } -func (sender *Sender) GetUserID() int { +func (sender *Sender) GetUserID() interface{} { return sender.Message.Sender.ID } -func (sender *Sender) GetChatID() int { +func (sender *Sender) GetChatID() interface{} { return int(sender.Message.Chat.ID) } diff --git a/im/wxmp/init.go b/im/wxmp/init.go index c361ab2..fd98615 100644 --- a/im/wxmp/init.go +++ b/im/wxmp/init.go @@ -117,11 +117,11 @@ func (sender *Sender) GetContent() string { return sender.Message } -func (sender *Sender) GetUserID() int { +func (sender *Sender) GetUserID() interface{} { return sender.uid } -func (sender *Sender) GetChatID() int { +func (sender *Sender) GetChatID() interface{} { return 0 }