refactor: 优化代码结构和功能&&重构插件功能模块

rikkabot/adapter/adapter.go

@@ -187,7 +187,7 @@ func (a *Adapter) covert(msg *wcf.Message) *message.Message {
 				infos, err := msg.RoomData.GetMembersByNickName(match[1])
 				if err != nil {
 					logging.WarnWithErr(err, "RoomData.GetMembersByNickName fail")
-				} else {
+				} else if infos[0] != nil || infos[0].Wxid != "" {
 					AtWxidList[i] = infos[0].Wxid
 				}
 

rikkabot/common/user.go

@@ -6,6 +6,8 @@ package common
 
 import (
 	"context"
+	"errors"
+	"github.com/Clov614/logging"
 	wcf "github.com/Clov614/wcf-rpc-sdk"
 )
 
@@ -16,8 +18,9 @@ type Self struct {
 var self *Self
 
 var (
-// ErrFriendNotFound  = errors.New("friend not found")
-// ErrGroupNotFound   = errors.New("group not found")
+	// ErrFriendNotFound  = errors.New("friend not found")
+	// ErrGroupNotFound   = errors.New("group not found")
+	ErrNotFound = errors.New("not found")
 )
 
 func GetSelf() *Self {
@@ -32,6 +35,66 @@ func (s *Self) GetNickName() string {
 	return s.cli.GetSelfName()
 }
 
+func (s *Self) GetMemberByNickName(roomName string) {
+
+}
+
+func (s *Self) GetFriendIdByNickname(nickname string) (string, error) {
+	friendList, err := s.cli.GetAllFriend()
+	if err != nil {
+		logging.ErrorWithErr(err, "GetFriendList")
+		return "", ErrNotFound
+	}
+	for _, friend := range []*wcf.Friend(*friendList) {
+		if friend.Name == nickname {
+			return friend.Wxid, nil
+		}
+	}
+	return "", ErrNotFound
+}
+
+func (s *Self) GetFriendNicknameById(wxid string) (string, error) {
+	friendList, err := s.cli.GetAllFriend()
+	if err != nil {
+		logging.ErrorWithErr(err, "GetFriendList")
+		return "", ErrNotFound
+	}
+	for _, friend := range []*wcf.Friend(*friendList) {
+		if friend.Wxid == wxid {
+			return friend.Name, nil
+		}
+	}
+	return "", ErrNotFound
+}
+
+func (s *Self) GetGroupIdByNickname(nickname string) (string, error) {
+	roomList, err := s.cli.GetAllChatRoom()
+	if err != nil {
+		logging.ErrorWithErr(err, "GetFriendList")
+		return "", ErrNotFound
+	}
+	for _, room := range []*wcf.ChatRoom(*roomList) {
+		if room.Name == nickname {
+			return room.RoomID, nil
+		}
+	}
+	return "", ErrNotFound
+}
+
+func (s *Self) GetGroupNicknameById(roomId string) (string, error) {
+	roomList, err := s.cli.GetAllChatRoom()
+	if err != nil {
+		logging.ErrorWithErr(err, "GetFriendList")
+		return "", ErrNotFound
+	}
+	for _, room := range []*wcf.ChatRoom(*roomList) {
+		if room.RoomID == roomId {
+			return room.Name, nil
+		}
+	}
+	return "", ErrNotFound
+}
+
 func (s *Self) SendText(receiver string, content string, ats ...string) error {
 	return s.cli.SendText(receiver, content, ats...)
 }