mirror of
https://github.com/Mrs4s/go-cqhttp.git
synced 2025-05-05 03:23:49 +08:00
fix: golangci-lint gosimple
This commit is contained in:
parent
77445fe96e
commit
9f99b1571d
@ -1032,7 +1032,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, icon
|
|||||||
xml := ""
|
xml := ""
|
||||||
var suf message.IMessageElement
|
var suf message.IMessageElement
|
||||||
if i, ok := elem.(*LocalImageElement); ok {
|
if i, ok := elem.(*LocalImageElement); ok {
|
||||||
if group == false {
|
if !group {
|
||||||
gm, err := bot.UploadLocalImageAsPrivate(1, i)
|
gm, err := bot.UploadLocalImageAsPrivate(1, i)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
|
log.Warnf("警告: 好友消息 %v 消息图片上传失败: %v", 1, err)
|
||||||
|
@ -23,7 +23,7 @@ func InitCodec() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func EncoderSilk(data []byte) ([]byte, error) {
|
func EncoderSilk(data []byte) ([]byte, error) {
|
||||||
if useSilkCodec == false {
|
if !useSilkCodec {
|
||||||
return nil, errors.New("no silk encoder")
|
return nil, errors.New("no silk encoder")
|
||||||
}
|
}
|
||||||
h := md5.New()
|
h := md5.New()
|
||||||
|
@ -79,7 +79,7 @@ func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error)
|
|||||||
if err = cmd.Run(); err != nil {
|
if err = cmd.Run(); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if useCache == false {
|
if !useCache {
|
||||||
defer os.Remove(silkPath)
|
defer os.Remove(silkPath)
|
||||||
}
|
}
|
||||||
return ioutil.ReadFile(silkPath)
|
return ioutil.ReadFile(silkPath)
|
||||||
|
@ -104,7 +104,7 @@ func (andOperator *AndOperator) Eval(payload MSG) bool {
|
|||||||
res = res && operand.filter.Eval(val)
|
res = res && operand.filter.Eval(val)
|
||||||
}
|
}
|
||||||
|
|
||||||
if res == false {
|
if !res {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -131,7 +131,7 @@ func (op *OrOperator) Eval(payload MSG) bool {
|
|||||||
res := false
|
res := false
|
||||||
for _, operand := range op.operands {
|
for _, operand := range op.operands {
|
||||||
res = res || operand.Eval(payload)
|
res = res || operand.Eval(payload)
|
||||||
if res == true {
|
if res {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -86,11 +86,11 @@ func DownloadFile(url, path string, limit int64, headers map[string]string) erro
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if headers != nil {
|
|
||||||
for k, v := range headers {
|
for k, v := range headers {
|
||||||
req.Header.Set(k, v)
|
req.Header.Set(k, v)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := headers["User-Agent"]; ok {
|
if _, ok := headers["User-Agent"]; ok {
|
||||||
req.Header["User-Agent"] = []string{UserAgent}
|
req.Header["User-Agent"] = []string{UserAgent}
|
||||||
}
|
}
|
||||||
@ -138,10 +138,10 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if headers != nil {
|
|
||||||
for k, v := range headers {
|
for k, v := range headers {
|
||||||
req.Header.Set(k, v)
|
req.Header.Set(k, v)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if _, ok := headers["User-Agent"]; ok {
|
if _, ok := headers["User-Agent"]; ok {
|
||||||
req.Header["User-Agent"] = []string{UserAgent}
|
req.Header["User-Agent"] = []string{UserAgent}
|
||||||
@ -202,11 +202,11 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int,
|
|||||||
_, _ = file.Seek(block.BeginOffset, io.SeekStart)
|
_, _ = file.Seek(block.BeginOffset, io.SeekStart)
|
||||||
writer := bufio.NewWriter(file)
|
writer := bufio.NewWriter(file)
|
||||||
defer writer.Flush()
|
defer writer.Flush()
|
||||||
if headers != nil {
|
|
||||||
for k, v := range headers {
|
for k, v := range headers {
|
||||||
req.Header.Set(k, v)
|
req.Header.Set(k, v)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, ok := headers["User-Agent"]; ok {
|
if _, ok := headers["User-Agent"]; ok {
|
||||||
req.Header["User-Agent"] = []string{UserAgent}
|
req.Header["User-Agent"] = []string{UserAgent}
|
||||||
}
|
}
|
||||||
|
@ -472,7 +472,6 @@ func AdminDoRestart(s *webServer, c *gin.Context) {
|
|||||||
s.Cli = nil
|
s.Cli = nil
|
||||||
s.DoReLogin()
|
s.DoReLogin()
|
||||||
c.JSON(200, coolq.OK(coolq.MSG{}))
|
c.JSON(200, coolq.OK(coolq.MSG{}))
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 进程重启
|
// 进程重启
|
||||||
@ -485,7 +484,6 @@ func AdminProcessRestart(s *webServer, c *gin.Context) {
|
|||||||
func AdminDoRestartDocker(s *webServer, c *gin.Context) {
|
func AdminDoRestartDocker(s *webServer, c *gin.Context) {
|
||||||
Console <- os.Kill
|
Console <- os.Kill
|
||||||
c.JSON(200, coolq.OK(coolq.MSG{}))
|
c.JSON(200, coolq.OK(coolq.MSG{}))
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// web输入 html 页面
|
// web输入 html 页面
|
||||||
|
@ -576,9 +576,7 @@ func (s *httpServer) ShutDown() {
|
|||||||
if err := s.Http.Shutdown(ctx); err != nil {
|
if err := s.Http.Shutdown(ctx); err != nil {
|
||||||
log.Fatal("http Server Shutdown:", err)
|
log.Fatal("http Server Shutdown:", err)
|
||||||
}
|
}
|
||||||
select {
|
<-ctx.Done()
|
||||||
case <-ctx.Done():
|
log.Println("timeout of 5 seconds.")
|
||||||
log.Println("timeout of 5 seconds.")
|
|
||||||
}
|
|
||||||
log.Println("http Server exiting")
|
log.Println("http Server exiting")
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user