1
0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-06 03:53:50 +08:00

fix(all): resolve issues reported by golangci-lint

This commit is contained in:
wdvxdr 2021-11-13 15:57:00 +08:00
parent 7751aa942e
commit 96e0411c97
No known key found for this signature in database
GPG Key ID: 703F8C071DE7A1B6
5 changed files with 26 additions and 18 deletions

View File

@ -135,15 +135,17 @@ func (bot *CQBot) CQGetGuildMembers(guildID uint64) global.MSG {
if guild == nil { if guild == nil {
return Failed(100, "GUILD_NOT_FOUND") return Failed(100, "GUILD_NOT_FOUND")
} }
var members, bots, admins []global.MSG members := make([]global.MSG, len(guild.Members))
for _, m := range guild.Members { bots := make([]global.MSG, len(guild.Bots))
members = append(members, convertGuildMemberInfo(m)) admins := make([]global.MSG, len(guild.Admins))
for i, m := range guild.Members {
members[i] = convertGuildMemberInfo(m)
} }
for _, m := range guild.Bots { for i, m := range guild.Bots {
bots = append(bots, convertGuildMemberInfo(m)) bots[i] = convertGuildMemberInfo(m)
} }
for _, m := range guild.Admins { for i, m := range guild.Admins {
admins = append(admins, convertGuildMemberInfo(m)) admins[i] = convertGuildMemberInfo(m)
} }
return OK(global.MSG{ return OK(global.MSG{
"members": members, "members": members,

View File

@ -182,7 +182,7 @@ func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement
} }
// UploadLocalImageAsGuildChannel 上传本地图片至频道 // UploadLocalImageAsGuildChannel 上传本地图片至频道
func (bot *CQBot) UploadLocalImageAsGuildChannel(guildId, channelId uint64, img *LocalImageElement) (*message.GuildImageElement, error) { func (bot *CQBot) UploadLocalImageAsGuildChannel(guildID, channelID uint64, img *LocalImageElement) (*message.GuildImageElement, error) {
if img.File != "" { if img.File != "" {
f, err := os.Open(img.File) f, err := os.Open(img.File)
if err != nil { if err != nil {
@ -194,7 +194,7 @@ func (bot *CQBot) UploadLocalImageAsGuildChannel(guildId, channelId uint64, img
if lawful, mime := base.IsLawfulImage(img.Stream); !lawful { if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
return nil, errors.New("image type error: " + mime) return nil, errors.New("image type error: " + mime)
} }
return bot.Client.GuildService.UploadGuildImage(guildId, channelId, img.Stream) return bot.Client.GuildService.UploadGuildImage(guildID, channelID, img.Stream)
} }
// SendGroupMessage 发送群消息 // SendGroupMessage 发送群消息

View File

@ -1,11 +1,13 @@
package coolq package coolq
import ( import (
"strconv"
"github.com/Mrs4s/MiraiGo/client" "github.com/Mrs4s/MiraiGo/client"
"github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/message"
"github.com/Mrs4s/go-cqhttp/global"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"strconv"
"github.com/Mrs4s/go-cqhttp/global"
) )
func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG { func convertGroupMemberInfo(groupID int64, m *client.GroupMemberInfo) global.MSG {

View File

@ -80,15 +80,18 @@ type MessageSource struct {
// MessageSourceType 消息来源类型 // MessageSourceType 消息来源类型
type MessageSourceType int32 type MessageSourceType int32
// MessageSourceType 常量
const ( const (
maxImageSize = 1024 * 1024 * 30 // 30MB
maxVideoSize = 1024 * 1024 * 100 // 100MB
MessageSourcePrivate MessageSourceType = 0 MessageSourcePrivate MessageSourceType = 0
MessageSourceGroup MessageSourceType = 1 MessageSourceGroup MessageSourceType = 1
MessageSourceGuildChannel MessageSourceType = 2 MessageSourceGuildChannel MessageSourceType = 2
) )
const (
maxImageSize = 1024 * 1024 * 30 // 30MB
maxVideoSize = 1024 * 1024 * 100 // 100MB
)
// Type implements the message.IMessageElement. // Type implements the message.IMessageElement.
func (e *LocalImageElement) Type() message.ElementType { func (e *LocalImageElement) Type() message.ElementType {
return message.Image return message.Image
@ -1414,6 +1417,7 @@ func (bot *CQBot) readImageCache(b []byte, sourceType MessageSourceType) (messag
if sourceType == MessageSourceGuildChannel { if sourceType == MessageSourceGuildChannel {
if len(bot.Client.GuildService.Guilds) == 0 { if len(bot.Client.GuildService.Guilds) == 0 {
err = errors.New("cannot query guild image: not any joined guild") err = errors.New("cannot query guild image: not any joined guild")
goto ok
} }
guild := bot.Client.GuildService.Guilds[0] guild := bot.Client.GuildService.Guilds[0]
rsp, err = bot.Client.GuildService.QueryImage(guild.GuildId, guild.Channels[0].ChannelId, hash, uint64(size)) rsp, err = bot.Client.GuildService.QueryImage(guild.GuildId, guild.Channels[0].ChannelId, hash, uint64(size))

View File

@ -187,17 +187,17 @@ func (bot *CQBot) guildMessageReactionsUpdatedEvent(c *client.QQClient, e *clien
return return
} }
str := fmt.Sprintf("频道 %v(%v) 消息 %v 表情贴片已更新: ", guild.GuildName, guild.GuildId, e.MessageId) str := fmt.Sprintf("频道 %v(%v) 消息 %v 表情贴片已更新: ", guild.GuildName, guild.GuildId, e.MessageId)
var currentReactions []global.MSG currentReactions := make([]global.MSG, len(e.CurrentReactions))
for _, r := range e.CurrentReactions { for i, r := range e.CurrentReactions {
str += fmt.Sprintf("%v*%v ", r.Face.Name, r.Count) str += fmt.Sprintf("%v*%v ", r.Face.Name, r.Count)
currentReactions = append(currentReactions, global.MSG{ currentReactions[i] = global.MSG{
"emoji_id": r.EmojiId, "emoji_id": r.EmojiId,
"emoji_index": r.Face.Index, "emoji_index": r.Face.Index,
"emoji_type": r.EmojiType, "emoji_type": r.EmojiType,
"emoji_name": r.Face.Name, "emoji_name": r.Face.Name,
"count": r.Count, "count": r.Count,
"clicked": r.Clicked, "clicked": r.Clicked,
}) }
} }
if len(e.CurrentReactions) == 0 { if len(e.CurrentReactions) == 0 {
str += "无任何表情" str += "无任何表情"