From ed69f3ea3a79834ed48aeb353858ba448b1a2eef Mon Sep 17 00:00:00 2001
From: eatmoreapple <15055461510@163.com>
Date: Fri, 17 Dec 2021 13:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8E=B7=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=8F=91=E9=80=81=E8=80=85=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 message.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/message.go b/message.go
index 2ab09a9..342808d 100644
--- a/message.go
+++ b/message.go
@@ -87,6 +87,9 @@ func (m *Message) SenderInGroup() (*User, error) {
 	if err := group.Detail(); err != nil {
 		return nil, err
 	}
+	if group.IsFriend() {
+		return group, nil
+	}
 	users := group.MemberList.SearchByUserName(1, m.senderInGroupUserName)
 	if users == nil {
 		return nil, ErrNoSuchUserFoundError
@@ -388,7 +391,7 @@ func (m *Message) init(bot *Bot) {
 	m.Raw = raw
 	// 如果是群消息
 	if m.IsSendByGroup() {
-		if m.IsText() {
+		if !m.IsSystem() {
 			// 将Username和正文分开
 			data := strings.Split(m.Content, ":<br/>")
 			m.Content = strings.Join(data[1:], "")
@@ -683,7 +686,7 @@ func (a AppMessageData) IsFile() bool {
 // IsComeFromGroup 判断消息是否来自群组
 // 可能是自己或者别的群员发送
 func (m *Message) IsComeFromGroup() bool {
-	return m.IsSendByGroup() || strings.HasPrefix(m.ToUserName, "@@")
+	return m.IsSendByGroup() || (strings.HasPrefix(m.ToUserName, "@@") && m.IsSendBySelf())
 }
 
 func (m *Message) String() string {