From 1d0fdf69833d7f81feda9aca1cb7a0a8125a1e63 Mon Sep 17 00:00:00 2001 From: arily Date: Tue, 1 Aug 2023 10:39:00 +0900 Subject: [PATCH] typo: consistent error style & grammar shark (#320) --- client/c2c_processor.go | 2 +- client/client.go | 4 ++-- client/group_msg.go | 6 +++--- client/guild_eventflow.go | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/c2c_processor.go b/client/c2c_processor.go index 621c92a1..0f82ddfc 100644 --- a/client/c2c_processor.go +++ b/client/c2c_processor.go @@ -225,7 +225,7 @@ func troopAddMemberBroadcastDecoder(c *QQClient, pMsg *msg.Message, _ network.Re if group != nil && group.FindMember(pMsg.Head.AuthUin.Unwrap()) == nil { mem, err := c.GetMemberInfo(group.Code, pMsg.Head.AuthUin.Unwrap()) if err != nil { - c.debug("error to fetch new member info: %v", err) + c.debug("failed to fetch new member info: %v", err) return } group.Update(func(info *GroupInfo) { diff --git a/client/client.go b/client/client.go index f6cd85ca..5ab30515 100644 --- a/client/client.go +++ b/client/client.go @@ -379,7 +379,7 @@ func (c *QQClient) RequestSMS() bool { func (c *QQClient) init(tokenLogin bool) error { if len(c.sig.G) == 0 { - c.warning("device lock is disable. http api may fail.") + c.warning("device lock is disabled. HTTP API may fail.") } c.highwaySession.Uin = strconv.FormatInt(c.Uin, 10) if err := c.registerClient(); err != nil { @@ -567,7 +567,7 @@ func (c *QQClient) getGroupMembers(group *GroupInfo, interner *intern.StringInte return nil, err } if data == nil { - return nil, errors.New("group member list unavailable: rsp is nil") + return nil, errors.New("group members list is unavailable: rsp is nil") } rsp := data.(*groupMemberListResponse) nextUin = rsp.NextUin diff --git a/client/group_msg.go b/client/group_msg.go index bed82ba0..b8630915 100644 --- a/client/group_msg.go +++ b/client/group_msg.go @@ -267,7 +267,7 @@ func decodeMsgSendResponse(c *QQClient, pkt *network.Packet) (any, error) { case 46: c.error("sendPacket msg error: 需要使用安全设备验证") case 55: - c.error("sendPacket msg error: %v Bot has blocked ta.'s content", rsp.Result.Unwrap()) + c.error("sendPacket msg error: %v Bot has been blocked ta.'s content", rsp.Result.Unwrap()) default: c.error("sendPacket msg error: %v %v", rsp.Result.Unwrap(), rsp.ErrMsg.Unwrap()) } @@ -342,7 +342,7 @@ func (c *QQClient) parseGroupMessage(m *msg.Message) *message.GroupMessage { c.debug("sync group %v.", m.Head.GroupInfo.GroupCode.Unwrap()) info, err := c.GetGroupInfo(m.Head.GroupInfo.GroupCode.Unwrap()) if err != nil { - c.error("error to sync group %v : %+v", m.Head.GroupInfo.GroupCode.Unwrap(), err) + c.error("failed to sync group %v : %+v", m.Head.GroupInfo.GroupCode.Unwrap(), err) return nil } group = info @@ -351,7 +351,7 @@ func (c *QQClient) parseGroupMessage(m *msg.Message) *message.GroupMessage { if len(group.Members) == 0 { mem, err := c.GetGroupMembers(group) if err != nil { - c.error("error to sync group %v member : %+v", m.Head.GroupInfo.GroupCode, err) + c.error("failed to sync group %v members : %+v", m.Head.GroupInfo.GroupCode, err) return nil } group.Members = mem diff --git a/client/guild_eventflow.go b/client/guild_eventflow.go index ac9bef8c..ce646b8f 100644 --- a/client/guild_eventflow.go +++ b/client/guild_eventflow.go @@ -151,7 +151,7 @@ func (c *QQClient) processGuildEventBody(m *channel.ChannelMsgContent, eventBody if oldInfo == nil { info, err := c.GuildService.FetchChannelInfo(m.Head.RoutingHead.GuildId.Unwrap(), eventBody.ChangeChanInfo.ChanId.Unwrap()) if err != nil { - c.error("error to decode channel info updated event: fetch channel info failed: %v", err) + c.error("failed to decode channel info updated event: fetch channel info failed: %v", err) return } guild.Channels = append(guild.Channels, info) @@ -162,7 +162,7 @@ func (c *QQClient) processGuildEventBody(m *channel.ChannelMsgContent, eventBody } newInfo, err := c.GuildService.FetchChannelInfo(m.Head.RoutingHead.GuildId.Unwrap(), eventBody.ChangeChanInfo.ChanId.Unwrap()) if err != nil { - c.error("error to decode channel info updated event: fetch channel info failed: %v", err) + c.error("failed to decode channel info updated event: fetch channel info failed: %v", err) return } for i := range guild.Channels { @@ -187,7 +187,7 @@ func (c *QQClient) processGuildEventBody(m *channel.ChannelMsgContent, eventBody */ profile, err := c.GuildService.FetchGuildMemberProfileInfo(guild.GuildId, eventBody.JoinGuild.MemberTinyid.Unwrap()) if err != nil { - c.error("error to decode member join guild event: get member profile error: %v", err) + c.error("failed to decode member join guild event: get member profile error: %v", err) return } info := &GuildMemberInfo{