shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 19:17:38 +08:00
Code Issues Projects Releases Wiki Activity

typo: consistent error style & grammar shark (#320)

Browse Source
This commit is contained in:
arily 2023-08-01 10:39:00 +09:00 committed by GitHub
parent 65a3c56340
commit 1d0fdf6983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/c2c_processor.go
View File

@ -225,7 +225,7 @@ func troopAddMemberBroadcastDecoder(c *QQClient, pMsg *msg.Message, _ network.Re
if group != nil && group.FindMember(pMsg.Head.AuthUin.Unwrap()) == nil { if group != nil && group.FindMember(pMsg.Head.AuthUin.Unwrap()) == nil {
mem, err := c.GetMemberInfo(group.Code, pMsg.Head.AuthUin.Unwrap()) mem, err := c.GetMemberInfo(group.Code, pMsg.Head.AuthUin.Unwrap())
if err != nil { if err != nil {
c.debug("error to fetch new member info: %v", err) c.debug("failed to fetch new member info: %v", err)
return return
} }
group.Update(func(info *GroupInfo) { group.Update(func(info *GroupInfo) {

4
client/client.go
View File

@ -379,7 +379,7 @@ func (c *QQClient) RequestSMS() bool {
func (c *QQClient) init(tokenLogin bool) error { func (c *QQClient) init(tokenLogin bool) error {
if len(c.sig.G) == 0 { 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) c.highwaySession.Uin = strconv.FormatInt(c.Uin, 10)
if err := c.registerClient(); err != nil { if err := c.registerClient(); err != nil {
@ -567,7 +567,7 @@ func (c *QQClient) getGroupMembers(group *GroupInfo, interner *intern.StringInte
return nil, err return nil, err
} }
if data == nil { 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) rsp := data.(*groupMemberListResponse)
nextUin = rsp.NextUin nextUin = rsp.NextUin

6
client/group_msg.go
View File

@ -267,7 +267,7 @@ func decodeMsgSendResponse(c *QQClient, pkt *network.Packet) (any, error) {
case 46: case 46:
c.error("sendPacket msg error: 需要使用安全设备验证") c.error("sendPacket msg error: 需要使用安全设备验证")
case 55: 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: default:
c.error("sendPacket msg error: %v %v", rsp.Result.Unwrap(), rsp.ErrMsg.Unwrap()) 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()) c.debug("sync group %v.", m.Head.GroupInfo.GroupCode.Unwrap())
info, err := c.GetGroupInfo(m.Head.GroupInfo.GroupCode.Unwrap()) info, err := c.GetGroupInfo(m.Head.GroupInfo.GroupCode.Unwrap())
if err != nil { 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 return nil
} }
group = info group = info
@ -351,7 +351,7 @@ func (c *QQClient) parseGroupMessage(m *msg.Message) *message.GroupMessage {
if len(group.Members) == 0 { if len(group.Members) == 0 {
mem, err := c.GetGroupMembers(group) mem, err := c.GetGroupMembers(group)
if err != nil { 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 return nil
} }
group.Members = mem group.Members = mem

6
client/guild_eventflow.go
View File

@ -151,7 +151,7 @@ func (c *QQClient) processGuildEventBody(m *channel.ChannelMsgContent, eventBody
if oldInfo == nil { if oldInfo == nil {
info, err := c.GuildService.FetchChannelInfo(m.Head.RoutingHead.GuildId.Unwrap(), eventBody.ChangeChanInfo.ChanId.Unwrap()) info, err := c.GuildService.FetchChannelInfo(m.Head.RoutingHead.GuildId.Unwrap(), eventBody.ChangeChanInfo.ChanId.Unwrap())
if err != nil { 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 return
} }
guild.Channels = append(guild.Channels, info) 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()) newInfo, err := c.GuildService.FetchChannelInfo(m.Head.RoutingHead.GuildId.Unwrap(), eventBody.ChangeChanInfo.ChanId.Unwrap())
if err != nil { 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 return
} }
for i := range guild.Channels { 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()) profile, err := c.GuildService.FetchGuildMemberProfileInfo(guild.GuildId, eventBody.JoinGuild.MemberTinyid.Unwrap())
if err != nil { 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 return
} }
info := &GuildMemberInfo{ info := &GuildMemberInfo{