From 30d8bdf25a5e1e33e14e5fd577f9de37d69ca2a4 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Wed, 24 Jul 2024 14:59:57 +0800 Subject: [PATCH 01/53] fix(sticker): small bug --- base/sticker.go | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/base/sticker.go b/base/sticker.go index 6806725..48d284e 100644 --- a/base/sticker.go +++ b/base/sticker.go @@ -44,26 +44,28 @@ func defaultOpts() stickerOpts { func defaultOptsWithConfig(m map[string]string) stickerOpts { o := defaultOpts() - o = o.merge(m) + o = o.merge(m, false) return o } -func (o stickerOpts) merge(m map[string]string) stickerOpts { - sets := make(map[string]struct{}, len(m)) - for k := range m { - ok, kk, _ := normalizeParams(k, "") - if ok { - sets[kk] = struct{}{} +func (o stickerOpts) merge(m map[string]string, final bool) stickerOpts { + if final { + sets := make(map[string]struct{}, len(m)) + for k := range m { + ok, kk, _ := normalizeParams(k, "") + if ok { + sets[kk] = struct{}{} + } } - } - if _, ok := sets["format"]; ok { - if _, ok = sets["videoformat"]; !ok { - o.vf = "" - } + if _, ok := sets["format"]; ok { + if _, ok = sets["videoformat"]; !ok { + o.vf = "" + } - if _, ok = sets["stickerformat"]; !ok { - o.sf = "" + if _, ok = sets["stickerformat"]; !ok { + o.sf = "" + } } } @@ -72,9 +74,6 @@ func (o stickerOpts) merge(m map[string]string) stickerOpts { switch k { case "format", "f": o.format = v - // clear videoformat and stickerformat - o.vf = v - o.sf = v case "pack", "p": if slices.Contains([]string{"", "true", "1"}, strings.ToLower(v)) { o.pack = true @@ -141,7 +140,7 @@ func GetSticker(ctx tb.Context) error { } return err } - opt = opt.merge(o) + opt = opt.merge(o, true) } // nolint: nestif // will fix in future From 98657a36ee57cd3c58fb84df0845174a7ea8cb63 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Wed, 24 Jul 2024 15:07:45 +0800 Subject: [PATCH 02/53] fix(sticker): small bug --- base/sticker.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/base/sticker.go b/base/sticker.go index 48d284e..48869ff 100644 --- a/base/sticker.go +++ b/base/sticker.go @@ -167,7 +167,8 @@ func GetSticker(ctx tb.Context) error { // send video is sticker is video if sticker.Video { - switch opt.VideoFormat() { + f := opt.VideoFormat() + switch f { case "", "webm": sendFile := &tb.Document{ File: tb.FromReader(reader), @@ -230,7 +231,7 @@ func GetSticker(ctx tb.Context) error { return errors.Join(err, err1) } case <-time.After(time.Second * 30): - log.Error("wait ffmpeg exec result timeout", zap.String("filename", filename), zap.String("convert_format", opt.format)) + log.Error("wait ffmpeg exec result timeout", zap.String("filename", filename), zap.String("convert_format", f)) return ctx.Reply("convert to mp4 failed") } sendFile := &tb.Document{ @@ -241,7 +242,7 @@ func GetSticker(ctx tb.Context) error { } return ctx.Reply(sendFile) default: - return ctx.Reply(fmt.Sprintf("not implement `%s` format for video sticker yet", opt.format)) + return ctx.Reply(fmt.Sprintf("not implement `%s` format for video sticker yet", f)) } } From 31405611677cadcdc104da0b3dd467cdb192def2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 09:11:02 +0000 Subject: [PATCH 03/53] build(deps): bump github.com/sashabaranov/go-openai Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.26.3 to 1.27.0. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.26.3...v1.27.0) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ba80189..d4ffd84 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.45.1 github.com/redis/go-redis/v9 v9.6.0 - github.com/sashabaranov/go-openai v1.26.3 + github.com/sashabaranov/go-openai v1.27.0 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 3b0bcbc..3d8819c 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.46.0 h1:w8G+oaCPgz1PoCJztqymCFaKwXt+5cCXn51uPxExFfQ= github.com/samber/lo v1.46.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.26.3 h1:Tjnh4rcvsSU68f66r05mys+Zou4vo4qyvkne6AIRJPI= -github.com/sashabaranov/go-openai v1.26.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.27.0 h1:L3hO6650YUbKrbGUC6yCjsUluhKZ9h1/jcgbTItI8Mo= +github.com/sashabaranov/go-openai v1.27.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 2e29f1ae53676771ad235335835aaf86524aacca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 19:11:12 +0000 Subject: [PATCH 04/53] build(deps): bump github.com/sashabaranov/go-openai Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.27.0 to 1.27.1. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.27.0...v1.27.1) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d4ffd84..2a9fc55 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.45.1 github.com/redis/go-redis/v9 v9.6.0 - github.com/sashabaranov/go-openai v1.27.0 + github.com/sashabaranov/go-openai v1.27.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 3d8819c..c965b68 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.46.0 h1:w8G+oaCPgz1PoCJztqymCFaKwXt+5cCXn51uPxExFfQ= github.com/samber/lo v1.46.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.27.0 h1:L3hO6650YUbKrbGUC6yCjsUluhKZ9h1/jcgbTItI8Mo= -github.com/sashabaranov/go-openai v1.27.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.27.1 h1:7Nx6db5NXbcoutNmAUQulEQZEpHG/SkzfexP2X5RWMk= +github.com/sashabaranov/go-openai v1.27.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From db900ca4d201854d4c64880dd9a03f09f37e0a08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:45:08 +0000 Subject: [PATCH 05/53] build(deps): bump github.com/meilisearch/meilisearch-go Bumps [github.com/meilisearch/meilisearch-go](https://github.com/meilisearch/meilisearch-go) from 0.27.0 to 0.27.1. - [Release notes](https://github.com/meilisearch/meilisearch-go/releases) - [Commits](https://github.com/meilisearch/meilisearch-go/compare/v0.27.0...v0.27.1) --- updated-dependencies: - dependency-name: github.com/meilisearch/meilisearch-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d4ffd84..4e5a1eb 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 - github.com/meilisearch/meilisearch-go v0.27.0 + github.com/meilisearch/meilisearch-go v0.27.1 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.45.1 diff --git a/go.sum b/go.sum index 3d8819c..d1500ae 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/meilisearch/meilisearch-go v0.27.0 h1:lDFq8WzbsZCtt3/byr7GFqfOygWF5iy9TtDgzJo0Ds8= -github.com/meilisearch/meilisearch-go v0.27.0/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= +github.com/meilisearch/meilisearch-go v0.27.1 h1:9FZfZ9Gy9GQHAfuIpKzubDASH1TJ8HGWVwiju3KKevI= +github.com/meilisearch/meilisearch-go v0.27.1/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= From 4509de3130c7d16dbb130d2652a041dd8e5453db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Aug 2024 19:03:34 +0000 Subject: [PATCH 06/53] build(deps): bump github.com/quic-go/quic-go from 0.45.1 to 0.45.2 Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.45.1 to 0.45.2. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](https://github.com/quic-go/quic-go/compare/v0.45.1...v0.45.2) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4e5a1eb..7b97c50 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/meilisearch/meilisearch-go v0.27.1 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/common v0.55.0 - github.com/quic-go/quic-go v0.45.1 + github.com/quic-go/quic-go v0.45.2 github.com/redis/go-redis/v9 v9.6.0 github.com/sashabaranov/go-openai v1.27.0 github.com/spf13/viper v1.19.0 diff --git a/go.sum b/go.sum index d1500ae..d7d4cd2 100644 --- a/go.sum +++ b/go.sum @@ -416,8 +416,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/quic-go v0.45.1 h1:tPfeYCk+uZHjmDRwHHQmvHRYL2t44ROTujLeFVBmjCA= -github.com/quic-go/quic-go v0.45.1/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= +github.com/quic-go/quic-go v0.45.2 h1:DfqBmqjb4ExSdxRIb/+qXhPC+7k6+DUNZha4oeiC9fY= +github.com/quic-go/quic-go v0.45.2/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= From 53bd6978d5bd169e45461101153e57ebd990accd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:19:25 +0000 Subject: [PATCH 07/53] build(deps): bump gopkg.in/telebot.v3 from 3.3.6 to 3.3.8 Bumps gopkg.in/telebot.v3 from 3.3.6 to 3.3.8. --- updated-dependencies: - dependency-name: gopkg.in/telebot.v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 15ba520..be1eb28 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( golang.org/x/net v0.27.0 golang.org/x/text v0.16.0 golang.org/x/time v0.5.0 - gopkg.in/telebot.v3 v3.3.6 + gopkg.in/telebot.v3 v3.3.8 ) require ( diff --git a/go.sum b/go.sum index ad1c3c7..f98f37a 100644 --- a/go.sum +++ b/go.sum @@ -999,8 +999,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/telebot.v3 v3.3.6 h1:C/0hnEmQ7SU1MAyZSyyvRv2xLrkKrHQJfzPhYZ4zb5A= -gopkg.in/telebot.v3 v3.3.6/go.mod h1:1mlbqcLTVSfK9dx7fdp+Nb5HZsy4LLPtpZTKmwhwtzM= +gopkg.in/telebot.v3 v3.3.8 h1:uVDGjak9l824FN9YARWUHMsiNZnlohAVwUycw21k6t8= +gopkg.in/telebot.v3 v3.3.8/go.mod h1:1mlbqcLTVSfK9dx7fdp+Nb5HZsy4LLPtpZTKmwhwtzM= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 32cf5f65dbbbece454a103be2bdc38d81de48e2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:19:28 +0000 Subject: [PATCH 08/53] build(deps): bump golang.org/x/text from 0.16.0 to 0.17.0 Bumps [golang.org/x/text](https://github.com/golang/text) from 0.16.0 to 0.17.0. - [Release notes](https://github.com/golang/text/releases) - [Commits](https://github.com/golang/text/compare/v0.16.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 15ba520..4a23c34 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/image v0.18.0 golang.org/x/net v0.27.0 - golang.org/x/text v0.16.0 + golang.org/x/text v0.17.0 golang.org/x/time v0.5.0 gopkg.in/telebot.v3 v3.3.6 ) diff --git a/go.sum b/go.sum index ad1c3c7..3f38228 100644 --- a/go.sum +++ b/go.sum @@ -654,8 +654,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -748,8 +748,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From a877159c5ab47784873a0ec919fb10bf7ee37cb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 19:27:02 +0000 Subject: [PATCH 09/53] build(deps): bump github.com/quic-go/quic-go from 0.45.2 to 0.46.0 Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.45.2 to 0.46.0. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](https://github.com/quic-go/quic-go/compare/v0.45.2...v0.46.0) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 15ba520..f734ac9 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/meilisearch/meilisearch-go v0.27.1 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/common v0.55.0 - github.com/quic-go/quic-go v0.45.2 + github.com/quic-go/quic-go v0.46.0 github.com/redis/go-redis/v9 v9.6.0 github.com/sashabaranov/go-openai v1.27.1 github.com/spf13/viper v1.19.0 diff --git a/go.sum b/go.sum index ad1c3c7..6c048c5 100644 --- a/go.sum +++ b/go.sum @@ -416,8 +416,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/quic-go v0.45.2 h1:DfqBmqjb4ExSdxRIb/+qXhPC+7k6+DUNZha4oeiC9fY= -github.com/quic-go/quic-go v0.45.2/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= +github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y= +github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= From 3a2d3bffb5e54572ca7d5d703e0913cefe113b97 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:32:37 +0000 Subject: [PATCH 10/53] build(deps): bump github.com/sashabaranov/go-openai Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.27.1 to 1.28.1. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.27.1...v1.28.1) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 15ba520..592e5c4 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.45.2 github.com/redis/go-redis/v9 v9.6.0 - github.com/sashabaranov/go-openai v1.27.1 + github.com/sashabaranov/go-openai v1.28.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index ad1c3c7..4b840fe 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.46.0 h1:w8G+oaCPgz1PoCJztqymCFaKwXt+5cCXn51uPxExFfQ= github.com/samber/lo v1.46.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.27.1 h1:7Nx6db5NXbcoutNmAUQulEQZEpHG/SkzfexP2X5RWMk= -github.com/sashabaranov/go-openai v1.27.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.28.1 h1:aREx6faUTeOZNMDTNGAY8B9vNmmN7qoGvDV0Ke2J1Mc= +github.com/sashabaranov/go-openai v1.28.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 122618054928e689bd88d61d5bde6685e54a75c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:44:31 +0000 Subject: [PATCH 11/53] build(deps): bump github.com/redis/go-redis/v9 from 9.6.0 to 9.6.1 Bumps [github.com/redis/go-redis/v9](https://github.com/redis/go-redis) from 9.6.0 to 9.6.1. - [Release notes](https://github.com/redis/go-redis/releases) - [Changelog](https://github.com/redis/go-redis/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/go-redis/compare/v9.6.0...v9.6.1) --- updated-dependencies: - dependency-name: github.com/redis/go-redis/v9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9f4ff22..252696d 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/prometheus/client_golang v1.19.1 github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.46.0 - github.com/redis/go-redis/v9 v9.6.0 + github.com/redis/go-redis/v9 v9.6.1 github.com/sashabaranov/go-openai v1.28.1 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 5c9f1aa..beb86b8 100644 --- a/go.sum +++ b/go.sum @@ -418,8 +418,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y= github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= -github.com/redis/go-redis/v9 v9.6.0 h1:NLck+Rab3AOTHw21CGRpvQpgTrAU4sgdCswqGtlhGRA= -github.com/redis/go-redis/v9 v9.6.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M= +github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= +github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= From 0d73e743f6fa06b9454c014ff2c2125601a0e810 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:44:32 +0000 Subject: [PATCH 12/53] build(deps): bump github.com/meilisearch/meilisearch-go Bumps [github.com/meilisearch/meilisearch-go](https://github.com/meilisearch/meilisearch-go) from 0.27.1 to 0.27.2. - [Release notes](https://github.com/meilisearch/meilisearch-go/releases) - [Commits](https://github.com/meilisearch/meilisearch-go/compare/v0.27.1...v0.27.2) --- updated-dependencies: - dependency-name: github.com/meilisearch/meilisearch-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9f4ff22..a496aa4 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 - github.com/meilisearch/meilisearch-go v0.27.1 + github.com/meilisearch/meilisearch-go v0.27.2 github.com/prometheus/client_golang v1.19.1 github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.46.0 diff --git a/go.sum b/go.sum index 5c9f1aa..023aa96 100644 --- a/go.sum +++ b/go.sum @@ -344,8 +344,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/meilisearch/meilisearch-go v0.27.1 h1:9FZfZ9Gy9GQHAfuIpKzubDASH1TJ8HGWVwiju3KKevI= -github.com/meilisearch/meilisearch-go v0.27.1/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= +github.com/meilisearch/meilisearch-go v0.27.2 h1:3G21dJ5i208shnLPDsIEZ0L0Geg/5oeXABFV7nlK94k= +github.com/meilisearch/meilisearch-go v0.27.2/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= From f2b612cd751e19bbb4ee03891b813744b46e12aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:44:52 +0000 Subject: [PATCH 13/53] build(deps): bump golang.org/x/net from 0.27.0 to 0.28.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.27.0 to 0.28.0. - [Commits](https://github.com/golang/net/compare/v0.27.0...v0.28.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 1c170d9..3c82275 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 golang.org/x/image v0.18.0 - golang.org/x/net v0.27.0 + golang.org/x/net v0.28.0 golang.org/x/text v0.17.0 golang.org/x/time v0.5.0 gopkg.in/telebot.v3 v3.3.8 @@ -63,10 +63,10 @@ require ( github.com/valyala/fasthttp v1.50.0 // indirect go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.25.0 // indirect + golang.org/x/crypto v0.26.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/sys v0.22.0 // indirect + golang.org/x/sys v0.23.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 6f3c894..94e9544 100644 --- a/go.sum +++ b/go.sum @@ -527,8 +527,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= -golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= +golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -618,8 +618,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -735,8 +735,8 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From b05186bb6c985ebbafc8cc28affb29f9efbb68b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:56:09 +0000 Subject: [PATCH 14/53] build(deps): bump golang.org/x/image from 0.18.0 to 0.19.0 Bumps [golang.org/x/image](https://github.com/golang/image) from 0.18.0 to 0.19.0. - [Commits](https://github.com/golang/image/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: golang.org/x/image dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9849397..43437b9 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 - golang.org/x/image v0.18.0 + golang.org/x/image v0.19.0 golang.org/x/net v0.28.0 golang.org/x/text v0.17.0 golang.org/x/time v0.5.0 diff --git a/go.sum b/go.sum index 4ff709e..3dc6a17 100644 --- a/go.sum +++ b/go.sum @@ -544,8 +544,8 @@ golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= -golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= +golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ= +golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= From 22d0df9b0c2d835555e65f70fdff4bc8f4734544 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:56:10 +0000 Subject: [PATCH 15/53] build(deps): bump golang.org/x/time from 0.5.0 to 0.6.0 Bumps [golang.org/x/time](https://github.com/golang/time) from 0.5.0 to 0.6.0. - [Commits](https://github.com/golang/time/compare/v0.5.0...v0.6.0) --- updated-dependencies: - dependency-name: golang.org/x/time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9849397..b615e7c 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( golang.org/x/image v0.18.0 golang.org/x/net v0.28.0 golang.org/x/text v0.17.0 - golang.org/x/time v0.5.0 + golang.org/x/time v0.6.0 gopkg.in/telebot.v3 v3.3.8 ) diff --git a/go.sum b/go.sum index 4ff709e..084c866 100644 --- a/go.sum +++ b/go.sum @@ -753,8 +753,8 @@ golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From d1174d1a217a4d3593b8da9c1b29e71ea742660d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:57:20 +0800 Subject: [PATCH 16/53] build(deps): bump github.com/prometheus/client_golang (#445) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.1 to 1.20.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.1/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.19.1...v1.20.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 6 +++--- go.sum | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index b0b2065..600b5aa 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 github.com/meilisearch/meilisearch-go v0.27.2 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.1 github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.46.0 github.com/redis/go-redis/v9 v9.6.1 @@ -26,7 +26,7 @@ require ( github.com/andybalholm/brotli v1.0.6 // indirect github.com/aws/aws-sdk-go v1.38.20 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect @@ -37,7 +37,7 @@ require ( github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.2 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/go.sum b/go.sum index 57fde96..8db9c9e 100644 --- a/go.sum +++ b/go.sum @@ -89,8 +89,8 @@ github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -310,8 +310,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -325,6 +325,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -393,8 +395,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8= +github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From 5846352e817304e005b3d810740be34ff440368d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 16:58:03 +0800 Subject: [PATCH 17/53] build(deps): bump github.com/sashabaranov/go-openai (#444) Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.28.1 to 1.28.2. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.28.1...v1.28.2) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 600b5aa..a4171fa 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.46.0 github.com/redis/go-redis/v9 v9.6.1 - github.com/sashabaranov/go-openai v1.28.1 + github.com/sashabaranov/go-openai v1.28.2 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 8db9c9e..2c060fd 100644 --- a/go.sum +++ b/go.sum @@ -435,8 +435,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.46.0 h1:w8G+oaCPgz1PoCJztqymCFaKwXt+5cCXn51uPxExFfQ= github.com/samber/lo v1.46.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.28.1 h1:aREx6faUTeOZNMDTNGAY8B9vNmmN7qoGvDV0Ke2J1Mc= -github.com/sashabaranov/go-openai v1.28.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0= +github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From d919c059ec8e205ceb1b276e465d18164d085539 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 08:59:08 +0000 Subject: [PATCH 18/53] build(deps): bump github.com/meilisearch/meilisearch-go Bumps [github.com/meilisearch/meilisearch-go](https://github.com/meilisearch/meilisearch-go) from 0.27.2 to 0.28.0. - [Release notes](https://github.com/meilisearch/meilisearch-go/releases) - [Commits](https://github.com/meilisearch/meilisearch-go/compare/v0.27.2...v0.28.0) --- updated-dependencies: - dependency-name: github.com/meilisearch/meilisearch-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 5 +---- go.sum | 16 ++-------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index a4171fa..c6f59cc 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 - github.com/meilisearch/meilisearch-go v0.27.2 + github.com/meilisearch/meilisearch-go v0.28.0 github.com/prometheus/client_golang v1.20.1 github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.46.0 @@ -23,7 +23,6 @@ require ( require ( github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d // indirect - github.com/andybalholm/brotli v1.0.6 // indirect github.com/aws/aws-sdk-go v1.38.20 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect @@ -59,8 +58,6 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/u2takey/go-utils v0.3.1 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasthttp v1.50.0 // indirect go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.26.0 // indirect diff --git a/go.sum b/go.sum index 2c060fd..3469e2a 100644 --- a/go.sum +++ b/go.sum @@ -66,9 +66,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= -github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI= -github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -308,8 +305,6 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.6/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -346,8 +341,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/meilisearch/meilisearch-go v0.27.2 h1:3G21dJ5i208shnLPDsIEZ0L0Geg/5oeXABFV7nlK94k= -github.com/meilisearch/meilisearch-go v0.27.2/go.mod h1:SxuSqDcPBIykjWz1PX+KzsYzArNLSCadQodWs8extS0= +github.com/meilisearch/meilisearch-go v0.28.0 h1:f3XJ66ZM+R8bANAOLqsjvoq/HhQNpVJPYoNt6QgNzME= +github.com/meilisearch/meilisearch-go v0.28.0/go.mod h1:Szcc9CaDiKIfjdgdt49jlmDKpEzjD+x+b6Y6heMdlQ0= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= @@ -483,12 +478,6 @@ github.com/u2takey/ffmpeg-go v0.5.0 h1:r7d86XuL7uLWJ5mzSeQ03uvjfIhiJYvsRAJFCW4uk github.com/u2takey/ffmpeg-go v0.5.0/go.mod h1:ruZWkvC1FEiUNjmROowOAps3ZcWxEiOpFoHCvk97kGc= github.com/u2takey/go-utils v0.3.1 h1:TaQTgmEZZeDHQFYfd+AdUT1cT4QJgJn/XVPELhHw4ys= github.com/u2takey/go-utils v0.3.1/go.mod h1:6e+v5vEZ/6gu12w/DC2ixZdZtCrNokVxD0JUklcqdCs= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.37.1-0.20220607072126-8a320890c08d/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I= -github.com/valyala/fasthttp v1.50.0 h1:H7fweIlBm0rXLs2q0XbalvJ6r0CUPFWK3/bB4N13e9M= -github.com/valyala/fasthttp v1.50.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA= -github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -527,7 +516,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= From 971495da84ead0f0012d4ecab25fa9163aabcc4c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 08:58:57 +0000 Subject: [PATCH 19/53] build(deps): bump github.com/samber/lo from 1.46.0 to 1.47.0 Bumps [github.com/samber/lo](https://github.com/samber/lo) from 1.46.0 to 1.47.0. - [Release notes](https://github.com/samber/lo/releases) - [Changelog](https://github.com/samber/lo/blob/master/CHANGELOG.md) - [Commits](https://github.com/samber/lo/compare/v1.46.0...v1.47.0) --- updated-dependencies: - dependency-name: github.com/samber/lo dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a4171fa..dce0d01 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/quic-go/qpack v0.4.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect - github.com/samber/lo v1.46.0 + github.com/samber/lo v1.47.0 github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect diff --git a/go.sum b/go.sum index 2c060fd..8e8f693 100644 --- a/go.sum +++ b/go.sum @@ -433,8 +433,8 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/samber/lo v1.46.0 h1:w8G+oaCPgz1PoCJztqymCFaKwXt+5cCXn51uPxExFfQ= -github.com/samber/lo v1.46.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= +github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= +github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0= github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= From 39f020378c8ed3091022c97be82608d63087accc Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 23 Aug 2024 09:20:15 +0000 Subject: [PATCH 20/53] fix(meili): fix meilisearch library breaking change --- meili/meili_search.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meili/meili_search.go b/meili/meili_search.go index 43b0f8e..f734a81 100644 --- a/meili/meili_search.go +++ b/meili/meili_search.go @@ -33,7 +33,7 @@ var ( searchChan = make(chan searchQuery, 100) // resultChan is used to pass the search results back. resultChan = make(chan searchResult, 100) - client *meilisearch.Client + client meilisearch.ServiceManager clientMux sync.Mutex // once init meili at bot start. once sync.Once @@ -46,14 +46,11 @@ func InitMeili() { }) } -func getClient() *meilisearch.Client { +func getClient() meilisearch.ServiceManager { clientMux.Lock() defer clientMux.Unlock() if client == nil { - client = meilisearch.NewClient(meilisearch.ClientConfig{ - Host: config.BotConfig.MeiliConfig.HostAddr, - APIKey: config.BotConfig.MeiliConfig.ApiKey, - }) + client = meilisearch.New(config.BotConfig.MeiliConfig.HostAddr, meilisearch.WithAPIKey(config.BotConfig.MeiliConfig.ApiKey)) } return client } From 2a6eb868b79008f0d74f1404345ca6d1ce41b92a Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Tue, 27 Aug 2024 14:27:55 +0800 Subject: [PATCH 21/53] update ffmpeg container --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c55e6fe..bef8b54 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN make deploy FROM --platform=$BUILDPLATFORM alpine RUN apk add --no-cache tzdata -COPY --from=hugefiver/ffmpeg:7.0.1 /ffmpeg /usr/local/bin/ffmpeg +COPY --from=hugefiver/ffmpeg:7.0.1-2 /ffmpeg /usr/local/bin/ffmpeg # COPY --from=hugefiver/ffmpeg:7.0.1 /ffprobe /usr/local/bin/ffprobe WORKDIR /app From 4142158e0c207017bbd429cf6eebd23b0370a0ee Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Wed, 11 Sep 2024 14:31:59 +0800 Subject: [PATCH 22/53] impr(sticker): move something complex to seprarte functions --- base/sticker.go | 285 ++++++++++++++++++++++++++---------------------- 1 file changed, 153 insertions(+), 132 deletions(-) diff --git a/base/sticker.go b/base/sticker.go index 48869ff..023719b 100644 --- a/base/sticker.go +++ b/base/sticker.go @@ -134,8 +134,8 @@ func GetSticker(ctx tb.Context) error { o, err := parseOpts(msg.Text) if err != nil { log.Error("parse command error", zap.String("text", msg.Text), zap.Error(err)) - err := ctx.Reply("failed to parse command args") - if err != nil { + err1 := ctx.Reply("failed to parse command args") + if err1 != nil { return err } return err @@ -145,167 +145,188 @@ func GetSticker(ctx tb.Context) error { // nolint: nestif // will fix in future if !opt.pack { - file := &sticker.File filename := sticker.SetName emoji := sticker.Emoji if sticker.CustomEmoji != "" { emoji += " " + sticker.CustomEmoji } - reader, err := ctx.Bot().File(file) - if err != nil { - err1 := ctx.Reply("failed to get sticker file") - return errors.Join(err, err1) + // send video is sticker is video + if sticker.Video { + return sendVideoSticker(ctx, sticker, filename, emoji, opt) } - defer func(reader io.ReadCloser) { - err = reader.Close() - if err != nil { - log.Error("failed to close reader", zap.Error(err)) - } - }(reader) + return sendImageSticker(ctx, sticker, filename, emoji, opt) + } + // nolint: goerr113 + return errors.New("not implement") +} - // send video is sticker is video - if sticker.Video { - f := opt.VideoFormat() - switch f { - case "", "webm": - sendFile := &tb.Document{ - File: tb.FromReader(reader), - FileName: filename + ".webm", - Caption: emoji, - DisableTypeDetection: true, - } - return ctx.Reply(sendFile) - case "gif": - ff := ffconv.FFConv{LogCmd: true} - r, errCh := ff.Convert2GifFromReader(reader, "webm") - tempFile, err0 := os.CreateTemp("", "*.gif") - if err0 != nil { - log.Error("failed to create temp file", zap.Error(err)) - err1 := ctx.Reply("convert to gif failed") - return errors.Join(err0, err1) - } - defer func() { - _ = tempFile.Close() - _ = os.Remove(tempFile.Name()) - }() - - _, err0 = io.Copy(tempFile, r) - if err0 != nil { - log.Error("failed to copy", zap.Error(err)) - err1 := ctx.Reply("convert to gif failed") - return errors.Join(err0, err1) - } - - select { - case err = <-errCh: - if err != nil { - log.Error("failed to convert", zap.Error(err)) - err1 := ctx.Reply("convert to gif failed") - return errors.Join(err, err1) - } - case <-time.After(time.Second * 5): - log.Error("wait ffmpeg exec result timeout") - return ctx.Reply("convert to gif failed") - } - - sendFile := &tb.Document{ - File: tb.FromDisk(tempFile.Name()), - FileName: filename + ".gif", - Caption: emoji, - DisableTypeDetection: true, - } - return ctx.Reply(sendFile) - case "mp4": - ff := ffconv.FFConv{LogCmd: true} - r, errCh := ff.ConvertPipe2File(reader, "webm", filename+".mp4") - defer func() { - _ = r.Close() - }() - select { - case err = <-errCh: - if err != nil { - log.Error("failed to convert", zap.Error(err)) - err1 := ctx.Reply("convert to mp4 failed") - return errors.Join(err, err1) - } - case <-time.After(time.Second * 30): - log.Error("wait ffmpeg exec result timeout", zap.String("filename", filename), zap.String("convert_format", f)) - return ctx.Reply("convert to mp4 failed") - } - sendFile := &tb.Document{ - File: tb.FromReader(r), - FileName: filename + ".mp4", - Caption: emoji, - DisableTypeDetection: true, - } - return ctx.Reply(sendFile) - default: - return ctx.Reply(fmt.Sprintf("not implement `%s` format for video sticker yet", f)) - } +func sendImageSticker(ctx tb.Context, sticker *tb.Sticker, filename string, emoji string, opt stickerOpts) error { + f := opt.StickerFormat() + + reader, err := ctx.Bot().File(&sticker.File) + if err != nil { + err1 := ctx.Reply("failed to get sticker file") + return errors.Join(err, err1) + } + + defer func(reader io.ReadCloser) { + err = reader.Close() + if err != nil { + log.Error("failed to close reader", zap.Error(err)) } + }(reader) - // send origin file with `format=[webp]` - switch opt.StickerFormat() { - case "", "webp": - sendFile := &tb.Document{ - File: tb.FromReader(reader), - FileName: filename + ".webp", - Thumbnail: sticker.Thumbnail, - Caption: emoji, - DisableTypeDetection: true, - } - return ctx.Reply(sendFile) + // send origin file with `format=[webp]` + switch f { + case "webp", "": + sendFile := &tb.Document{ + File: tb.FromReader(reader), + FileName: filename + ".webp", + Thumbnail: sticker.Thumbnail, + Caption: emoji, + DisableTypeDetection: true, } + return ctx.Reply(sendFile) + } + + // convert image format to params targeted + img, _, err := image.Decode(reader) + if err != nil { + err1 := ctx.Reply("failed to convert image format") + return errors.Join(err, err1) + } - // convert image format to params targeted - img, _, err := image.Decode(reader) + bs := bytes.NewBuffer(nil) + switch f { + case "jpg", "jpeg": + filename += ".jpg" + err := jpeg.Encode(bs, img, &jpeg.Options{Quality: 100}) if err != nil { err1 := ctx.Reply("failed to convert image format") return errors.Join(err, err1) } + case "png": + filename += ".png" + err := png.Encode(bs, img) + if err != nil { + err1 := ctx.Reply("failed to convert image format") + return errors.Join(err, err1) + } + case "gif": + filename += ".gif" + err := gif.Encode(bs, img, &gif.Options{NumColors: 255}) + if err != nil { + err1 := ctx.Reply("failed to convert image format") + return errors.Join(err, err1) + } + default: + return ctx.Reply("unknown image format") + } + + sendFile := &tb.Document{ + File: tb.FromReader(bs), + FileName: filename, + Caption: emoji, + DisableTypeDetection: true, + } + + return ctx.Reply(sendFile) +} + +func sendVideoSticker(ctx tb.Context, sticker *tb.Sticker, filename string, emoji string, opt stickerOpts) error { + f := opt.VideoFormat() + + reader, err := ctx.Bot().File(&sticker.File) + if err != nil { + err1 := ctx.Reply("failed to get sticker file") + return errors.Join(err, err1) + } + + defer func(reader io.ReadCloser) { + err = reader.Close() + if err != nil { + log.Error("failed to close reader", zap.Error(err)) + } + }(reader) - bs := bytes.NewBuffer(nil) - switch opt.StickerFormat() { - case "jpg", "jpeg": - filename += ".jpg" - err := jpeg.Encode(bs, img, &jpeg.Options{Quality: 100}) - if err != nil { - err1 := ctx.Reply("failed to convert image format") - return errors.Join(err, err1) - } - case "png": - filename += ".png" - err := png.Encode(bs, img) + switch f { + case "webm": + sendFile := &tb.Document{ + File: tb.FromReader(reader), + FileName: filename + ".webm", + Caption: emoji, + DisableTypeDetection: true, + } + return ctx.Reply(sendFile) + case "gif": + ff := ffconv.FFConv{LogCmd: true} + r, errCh := ff.Convert2GifFromReader(reader, "webm") + tempFile, err0 := os.CreateTemp("", "*.gif") + if err0 != nil { + log.Error("failed to create temp file", zap.Error(err0)) + err1 := ctx.Reply("convert to gif failed") + return errors.Join(err0, err1) + } + defer func() { + _ = tempFile.Close() + _ = os.Remove(tempFile.Name()) + }() + + _, err0 = io.Copy(tempFile, r) + if err0 != nil { + log.Error("failed to copy", zap.Error(err0)) + err1 := ctx.Reply("convert to gif failed") + return errors.Join(err0, err1) + } + + select { + case err := <-errCh: if err != nil { - err1 := ctx.Reply("failed to convert image format") + log.Error("failed to convert", zap.Error(err)) + err1 := ctx.Reply("convert to gif failed") return errors.Join(err, err1) } - case "gif": - filename += ".gif" - err := gif.Encode(bs, img, &gif.Options{NumColors: 255}) + case <-time.After(time.Second * 5): + log.Error("wait ffmpeg exec result timeout") + return ctx.Reply("convert to gif failed") + } + + sendFile := &tb.Document{ + File: tb.FromDisk(tempFile.Name()), + FileName: filename + ".gif", + Caption: emoji, + DisableTypeDetection: true, + } + return ctx.Reply(sendFile) + case "mp4": + ff := ffconv.FFConv{LogCmd: true} + r, errCh := ff.ConvertPipe2File(reader, "webm", filename+".mp4") + defer func() { + _ = r.Close() + }() + select { + case err := <-errCh: if err != nil { - err1 := ctx.Reply("failed to convert image format") + log.Error("failed to convert", zap.Error(err)) + err1 := ctx.Reply("convert to mp4 failed") return errors.Join(err, err1) } - default: - return ctx.Reply("unknown image format") + case <-time.After(time.Second * 30): + log.Error("wait ffmpeg exec result timeout", zap.String("filename", filename), zap.String("convert_format", f)) + return ctx.Reply("convert to mp4 failed") } - sendFile := &tb.Document{ - File: tb.FromReader(bs), - FileName: filename, + File: tb.FromReader(r), + FileName: filename + ".mp4", Caption: emoji, DisableTypeDetection: true, } - return ctx.Reply(sendFile) + default: + return ctx.Reply(fmt.Sprintf("not implement `%s` format for video sticker yet", f)) } - - // nolint: goerr113 - return errors.New("not implement") - } func parseOpts(text string) (map[string]string, error) { From 4b5881083ce85d317918bbb74bd0f5974fcf38e6 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Wed, 11 Sep 2024 14:40:41 +0800 Subject: [PATCH 23/53] misc: upgrade go version && fix lint issues --- .github/workflows/go-build.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/test.yml | 2 +- .golangci.yaml | 20 +++++++++++--------- Dockerfile | 2 +- base/genshin_voice.go | 10 +++++----- base/notification.go | 6 ++++-- go.mod | 2 +- meili/bot_handle.go | 4 ++-- meili/meili_search.go | 4 ++-- sd/sd.go | 1 - util/urlx/extract.go | 2 +- 12 files changed, 31 insertions(+), 28 deletions(-) diff --git a/.github/workflows/go-build.yml b/.github/workflows/go-build.yml index 651810a..5141f3f 100644 --- a/.github/workflows/go-build.yml +++ b/.github/workflows/go-build.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: ^1.21 + go-version: ^1.23 - name: Get source uses: actions/checkout@v3 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 38ea04f..d8c861b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,12 +14,12 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: ^1.21 + go-version: ^1.23 - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.59 + version: v1.60 args: --issues-exit-code=1 only-new-issues: false skip-pkg-cache: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7af53f1..cf094d1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: ^1.21 + go-version: ^1.23 - name: Get source uses: actions/checkout@v3 diff --git a/.golangci.yaml b/.golangci.yaml index d02feb6..a5d95b2 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -3,7 +3,7 @@ # options for analysis running run: - go: "1.21" + go: "1.23" # default concurrency is an available CPU number concurrency: 16 @@ -134,10 +134,10 @@ linters-settings: - truncateCmp # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty - disabled-checks: - - regexpMust - - hugeParam - - rangeValCopy + # disabled-checks: + # - regexpMust + # - hugeParam + # - rangeValCopy # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks. # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags". @@ -335,7 +335,7 @@ linters-settings: predeclared: # comma-separated list of predeclared identifiers to not report on - ignore: "" + ignore: "min,max" # include method names and field names (i.e., qualified names) in checks q: false @@ -348,8 +348,6 @@ linters-settings: ignore-generated-header: true severity: warning confidence: 0.8 - error-code: 0 - warning-code: 0 rules: - name: atomic # - name: bare-return @@ -507,6 +505,9 @@ linters-settings: # - $gostd # - "github.com/stretchr/testify" + copyloopvar: + check-alias: false + linters: enable: - bidichk @@ -516,7 +517,8 @@ linters: - errname - errorlint - exhaustive - - exportloopref + - copyloopvar + # - exportloopref # - forbidigo # - gocognit - goconst diff --git a/Dockerfile b/Dockerfile index bef8b54..042f652 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build -FROM --platform=$BUILDPLATFORM golang:1.21-alpine AS buildenv +FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS buildenv ARG TARGETARCH RUN apk add make git tzdata diff --git a/base/genshin_voice.go b/base/genshin_voice.go index 7d4d122..61cb50d 100644 --- a/base/genshin_voice.go +++ b/base/genshin_voice.go @@ -126,7 +126,7 @@ func GetVoiceV2(ctx Context) error { return err } - err = SendVoice(m.Chat, data) + err = SendVoice(m.Chat, &data) return err } @@ -179,7 +179,7 @@ func GetVoiceV3(ctx Context) error { return err } - err = SendVoiceV3(m.Chat, data) + err = SendVoiceV3(m.Chat, &data) return err } @@ -235,7 +235,7 @@ func GetVoiceV3Pro(ctx Context) error { return err } - err = SendVoiceV3(m.Chat, data) + err = SendVoiceV3(m.Chat, &data) return err } @@ -313,7 +313,7 @@ func SendErrVoice(chat *Chat, errStr string) error { } // SendVoice 发音频消息 -func SendVoice(chat *Chat, v genShinVoiceV2) error { +func SendVoice(chat *Chat, v *genShinVoiceV2) error { audioCaption := fmt.Sprintf("%s \n\n #%s %s", v.Text, v.NpcNameLocal, v.Topic) voice := Voice{File: FromURL(v.AudioURL), Caption: audioCaption} _, err := voice.Send(config.BotConfig.Bot, chat, nil) @@ -321,7 +321,7 @@ func SendVoice(chat *Chat, v genShinVoiceV2) error { } // SendVoiceV3 发音频消息 - 适用于v3版api（合成语音） -func SendVoiceV3(chat *Chat, v genShinVoiceV3) error { +func SendVoiceV3(chat *Chat, v *genShinVoiceV3) error { audioCaption := fmt.Sprintf("%s \n\n #%s", v.Text, v.Character) voice := Voice{File: FromURL(v.VoiceUrl), Caption: audioCaption} _, err := voice.Send(config.BotConfig.Bot, chat, nil) diff --git a/base/notification.go b/base/notification.go index 27e6b1e..970ac67 100644 --- a/base/notification.go +++ b/base/notification.go @@ -11,8 +11,10 @@ import ( // WelcomeNewMember is handle for welcome new member. // when someone new join group, bot will send welcome message. func WelcomeNewMember(ctx Context) error { - for _, member := range ctx.Message().UsersJoined { - text := config.BotConfig.MessageConfig.WelcomeMessage + util.GetName(&member) + usersJoined := ctx.Message().UsersJoined + for idx := range usersJoined { + member := &usersJoined[idx] + text := config.BotConfig.MessageConfig.WelcomeMessage + util.GetName(member) prom.NewMember(ctx.Chat().Title) if err := ctx.Send(text); err != nil { return err diff --git a/go.mod b/go.mod index 946dbfe..59d522b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module csust-got -go 1.21 +go 1.23 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 diff --git a/meili/bot_handle.go b/meili/bot_handle.go index 8a527c2..8db451d 100644 --- a/meili/bot_handle.go +++ b/meili/bot_handle.go @@ -91,12 +91,12 @@ func executeSearch(ctx Context) string { return "Not a member of the specified group" } } - query := searchQuery{} + query := &searchQuery{} if command.Argc() > 0 { searchRequest := meilisearch.SearchRequest{ Limit: 10, } - query = searchQuery{ + query = &searchQuery{ Query: command.ArgAllInOneFrom(searchKeywordIdx), IndexName: config.BotConfig.MeiliConfig.IndexPrefix + strconv.FormatInt(chatId, 10), SearchRequest: searchRequest, diff --git a/meili/meili_search.go b/meili/meili_search.go index f734a81..72af942 100644 --- a/meili/meili_search.go +++ b/meili/meili_search.go @@ -30,7 +30,7 @@ var ( // dataChan pushes data to meili search. dataChan = make(chan meiliData, 100) // searchChan is used to pass search queries. - searchChan = make(chan searchQuery, 100) + searchChan = make(chan *searchQuery, 100) // resultChan is used to pass the search results back. resultChan = make(chan searchResult, 100) client meilisearch.ServiceManager @@ -118,7 +118,7 @@ func AddData2Meili(data map[string]interface{}, chatID int64) { } // SearchMeili performs a search query and returns results or error. -func SearchMeili(query searchQuery) (interface{}, error) { +func SearchMeili(query *searchQuery) (interface{}, error) { searchChan <- query result := <-resultChan return result.Result, result.Error diff --git a/sd/sd.go b/sd/sd.go index 1b4deea..4855d8a 100644 --- a/sd/sd.go +++ b/sd/sd.go @@ -150,7 +150,6 @@ func Process() { continue } - ctx := ctx server := ctx.UserConfig.GetServer() lock.Lock() diff --git a/util/urlx/extract.go b/util/urlx/extract.go index 93b38b6..0bc9ca0 100644 --- a/util/urlx/extract.go +++ b/util/urlx/extract.go @@ -111,7 +111,7 @@ func UrlToExtraUrl(u *url.URL) *ExtraUrl { } // StringByFields return a URL from Extracted Fields -func (u ExtraUrl) StringByFields() string { +func (u *ExtraUrl) StringByFields() string { buf := bytes.NewBufferString("") // scheme: `https://` From 6be59063b95c8d3c1b638e88e7af4bc66f832c06 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 19:33:02 +0000 Subject: [PATCH 24/53] build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.1 to 1.20.4. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.1...v1.20.4) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 59d522b..4e8147e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 github.com/meilisearch/meilisearch-go v0.28.0 - github.com/prometheus/client_golang v1.20.1 + github.com/prometheus/client_golang v1.20.4 github.com/prometheus/common v0.55.0 github.com/quic-go/quic-go v0.46.0 github.com/redis/go-redis/v9 v9.6.1 diff --git a/go.sum b/go.sum index 57b3275..334b128 100644 --- a/go.sum +++ b/go.sum @@ -390,8 +390,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.20.1 h1:IMJXHOD6eARkQpxo8KkhgEVFlBNm+nkrFUyGlIu7Na8= -github.com/prometheus/client_golang v1.20.1/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From 20e4f81862fcaa6a306a401f852a74e004a483ed Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 18 Oct 2024 15:55:01 +0800 Subject: [PATCH 25/53] impl hoocoder --- base/encode.go | 135 +++++++------------------------------------- base/encode_test.go | 39 +++---------- base/sticker.go | 90 ++++++++++++++++++++++++++++- main.go | 3 +- 4 files changed, 117 insertions(+), 150 deletions(-) diff --git a/base/encode.go b/base/encode.go index 6c8f91f..fc3ece9 100644 --- a/base/encode.go +++ b/base/encode.go @@ -1,136 +1,43 @@ package base import ( - "regexp" - "strings" - "csust-got/entities" + "regexp" . "gopkg.in/telebot.v3" ) var ( - // change 'y' to 'i' if end with this. - yEndTable = [...]string{"ty", "ly", "fy", "py", "dy", "by"} - - // hugeXer regex - hugeRegex = regexp.MustCompile(`^(huge)+.+(er)+$`) + hooPrePatt = regexp.MustCompile(`(?i)^h[o0]*`) + hooSufPatt = regexp.MustCompile(`(?i)[o0]*$`) ) -// HugeEncoder encode 'xxx' to 'hugexxxer'. -func HugeEncoder(ctx Context) error { - arg, ok := parseHugeArgs(ctx) - if !ok { - return ctx.Reply(arg, ModeMarkdownV2) - } - - // encode - arg = hooEncode(arg) - - return ctx.Reply(arg, ModeMarkdownV2) -} - -// HugeDecoder decode 'hugehugehugexxxererer' to 'hugexxxer'. -func HugeDecoder(ctx Context) error { - arg, ok := parseHugeArgs(ctx) - if !ok { - return ctx.Reply(arg, ModeMarkdownV2) - } - - // decode - arg = hooDecode(arg) - - return ctx.Reply(arg, ModeMarkdownV2) -} - -func parseHugeArgs(ctx Context) (arg string, ok bool) { - if ctx.Message().ReplyTo != nil { - arg = ctx.Message().ReplyTo.Text - } - - command := entities.FromMessage(ctx.Message()) - - if command.Argc() > 0 { - arg = command.ArgAllInOneFrom(0) - } - - arg = strings.TrimSpace(arg) - - // no args - if arg == "" { - return "HUGEFIVER", false +// HooEncoder encode 'XXX' to 'hooXXXoo'. +func HooEncoder(ctx Context) error { + _, s, err := entities.CommandTakeArgs(ctx.Message(), 0) + if err != nil { + return ctx.Reply("h0oOo") } - // tldr - if len(arg) > 128 { - return "hugeTLDRer", false - } - - return arg, true + s = hooEncode(s) + return ctx.Reply(s) } -func hooEncode(arg string) string { - if arg == "" { - return "HUGEFIVER" - } - // add 'huge' to prefix - if !strings.HasPrefix(arg, "huge") { - if arg[0] != 'e' { - arg = "e" + arg - } - arg = "hug" + arg - } - // add 'er' to suffix - if !strings.HasSuffix(arg, "er") { - arg = encodeParseEnd(arg) - // only add 'r' if $arg end with 'e' - if arg[len(arg)-1] != 'e' { - arg += "e" - } - arg += "r" - } - // if we get 'huger' after encode, we him. - if arg == "huger" { - arg = "hugeF**Ker" - } - - return arg -} +func hooEncode(s string) string { + matches1 := hooPrePatt.FindStringIndex(s) + matches2 := hooSufPatt.FindStringIndex(s) -// encodeParseEnd change 'y' to 'i' if end with $yEndTable -func encodeParseEnd(arg string) string { - for _, v := range yEndTable { - if strings.HasSuffix(arg, v) { - arg = arg[0:len(arg)-1] + "i" - break - } + i1, i2 := 0, len(s) + if matches1 != nil { + i1 = matches1[1] } - return arg -} - -func hooDecode(arg string) string { - if !hugeRegex.MatchString(arg) { - return "hugeFAKEr" + if matches2 != nil { + i2 = matches2[0] } - // find first 'huge' and last 'er' - huge := strings.Index(arg, "huge") - er := strings.LastIndex(arg, "er") - - // find end of first consecutive 'huge' and start of last consecutive 'er' - var hugeEnd, erStart int - for hugeEnd = huge; hugeEnd+4 < len(arg); hugeEnd += 4 { - if arg[hugeEnd:hugeEnd+4] != "huge" { - break - } - } - for erStart = er; erStart-2 >= 0; erStart -= 2 { - if arg[erStart-2:erStart] != "er" { - break - } + if i1 >= i2-1 { + return "h0oOo" } - // decode - arg = arg[0:huge+4] + arg[hugeEnd:erStart] + arg[er:] - return arg + return "h0o" + s[i1:i2] + "Oo" } diff --git a/base/encode_test.go b/base/encode_test.go index 08a125d..55f759b 100644 --- a/base/encode_test.go +++ b/base/encode_test.go @@ -11,40 +11,17 @@ func Test_encode(t *testing.T) { args string want string }{ - {"hugefiver", "hugefiver"}, - {"hugeer", "hugeer"}, - {"huger", "hugeF**Ker"}, - {"", "HUGEFIVER"}, - {"even", "hugevener"}, - {"ray", "hugerayer"}, - {"wu", "hugewuer"}, - {"e", "hugeF**Ker"}, - {"en", "hugener"}, - {"py", "hugepier"}, + {"", "h0oOo"}, + {"0", "h0oOo"}, + {"Hoo", "h0oOo"}, + {"h0o0o00", "h0oOo"}, + {"FAKER", "h0oFAKEROo"}, + {"h0o0o0OFAKER", "h0oFAKEROo"}, + {"FAKERo0oO0", "h0oFAKEROo"}, + {"h0o0o0OFAKERo0oO0", "h0oFAKEROo"}, } for _, tt := range tests { got := hooEncode(tt.args) require.Equalf(t, tt.want, got, "encode(%s)", tt.args) } } - -func Test_decode(t *testing.T) { - tests := []struct { - args string - want string - }{ - {"hugefiver", "hugefiver"}, - {"hugeer", "hugeFAKEr"}, - {"huger", "hugeFAKEr"}, - {"", "hugeFAKEr"}, - {"even", "hugeFAKEr"}, - {"hugehugefiver", "hugefiver"}, - {"hugefiverer", "hugefiver"}, - {"hugehugefiverer", "hugefiver"}, - {"hugehugeer", "hugeer"}, - } - for _, tt := range tests { - got := hooDecode(tt.args) - require.Equalf(t, tt.want, got, "decode(%s)", tt.args) - } -} diff --git a/base/sticker.go b/base/sticker.go index 023719b..38ac215 100644 --- a/base/sticker.go +++ b/base/sticker.go @@ -11,6 +11,7 @@ import ( "image/png" "io" "os" + "path" "slices" "strings" "time" @@ -33,6 +34,9 @@ type stickerOpts struct { pack bool vf string sf string + + // pack format + pf string } func defaultOpts() stickerOpts { @@ -84,6 +88,8 @@ func (o stickerOpts) merge(m map[string]string, final bool) stickerOpts { o.vf = v case "sf", "stickerformat": o.sf = v + case "pf", "packformat": + o.pf = v } } @@ -143,7 +149,6 @@ func GetSticker(ctx tb.Context) error { opt = opt.merge(o, true) } - // nolint: nestif // will fix in future if !opt.pack { filename := sticker.SetName emoji := sticker.Emoji @@ -158,8 +163,7 @@ func GetSticker(ctx tb.Context) error { return sendImageSticker(ctx, sticker, filename, emoji, opt) } - // nolint: goerr113 - return errors.New("not implement") + return sendStickerPack(ctx, sticker, opt) } func sendImageSticker(ctx tb.Context, sticker *tb.Sticker, filename string, emoji string, opt stickerOpts) error { @@ -329,6 +333,86 @@ func sendVideoSticker(ctx tb.Context, sticker *tb.Sticker, filename string, emoj } } +func sendStickerPack(ctx tb.Context, sticker *tb.Sticker, opt stickerOpts) error { + stickerSet, err := ctx.Bot().StickerSet(sticker.SetName) + if err != nil { + ctx.Reply("failed to get sticker set") + return err + } + + var f string + if stickerSet.Animated { + f = opt.VideoFormat() + if f == "" { + f = "webm" + } + } else { + f = opt.StickerFormat() + if f == "" { + f = "webp" + } + } + + var ext string + switch f { + case "jpeg", "jpg": + ext = ".jpg" + default: + ext = "." + f + } + + pf := opt.pf + if pf == "" { + pf = "zip" + } + + tempDir, err := os.MkdirTemp("", "telebot") + if err != nil { + ctx.Reply("process failed") + return err + } + defer func() { + _ = os.RemoveAll(tempDir) + }() + + outputFiles := make([]string, 0, len(stickerSet.Stickers)) + for i, s := range stickerSet.Stickers { + emoji := s.Emoji + if emoji != "" { + emoji = "_" + emoji + } + filename := fmt.Sprintf("%s_%03d%s%s", stickerSet.Name, i+1, emoji, ext) + outputFiles = append(outputFiles, filename) + + if s.Animated && f == "webm" || !s.Animated && f == "webp" { + of, err := os.OpenFile(path.Join(tempDir, filename), os.O_CREATE|os.O_RDWR, 0o640) + if err != nil { + ctx.Reply("process failed") + return err + } + + err = func() error { + fileR, err := ctx.Bot().File(&s.File) + if err != nil { + return err + } + + _, err = io.Copy(of, fileR) + return err + }() + if err != nil { + ctx.Reply("process failed") + return err + } + + // TODO: pack archive + } + + // TODO: convert media format + } + return nil +} + func parseOpts(text string) (map[string]string, error) { cmd, _, err := entities.CommandFromText(text, -1) if err != nil { diff --git a/main.go b/main.go index d4a6c0a..4c59254 100644 --- a/main.go +++ b/main.go @@ -161,8 +161,7 @@ func registerBaseHandler(bot *Bot) { bot.Handle("/hitdawu", base.HitDawu) bot.Handle("/hito_netease", base.HitoNetease) - bot.Handle("/hugencoder", base.HugeEncoder) - bot.Handle("/hugedecoder", base.HugeDecoder) + bot.Handle("/hoocoder", base.HooEncoder) bot.Handle("/run_after", base.RunTask) From ffee1fc27f9d30a666ab9ab03b5030be101bdfc2 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 18 Oct 2024 16:10:09 +0800 Subject: [PATCH 26/53] impr: hoocoder more random --- base/encode.go | 17 ++++++++++++++++- base/encode_test.go | 5 ++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/base/encode.go b/base/encode.go index fc3ece9..5457add 100644 --- a/base/encode.go +++ b/base/encode.go @@ -1,7 +1,9 @@ package base import ( + "bytes" "csust-got/entities" + "math/rand/v2" "regexp" . "gopkg.in/telebot.v3" @@ -10,6 +12,7 @@ import ( var ( hooPrePatt = regexp.MustCompile(`(?i)^h[o0]*`) hooSufPatt = regexp.MustCompile(`(?i)[o0]*$`) + hooRunes = []rune("o0O") ) // HooEncoder encode 'XXX' to 'hooXXXoo'. @@ -39,5 +42,17 @@ func hooEncode(s string) string { return "h0oOo" } - return "h0o" + s[i1:i2] + "Oo" + bs := bytes.NewBufferString("h") + + for _ = range 2 { + bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) + } + + bs.WriteString(s[i1:i2]) + + for _ = range 2 { + bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) + } + + return bs.String() } diff --git a/base/encode_test.go b/base/encode_test.go index 55f759b..595023f 100644 --- a/base/encode_test.go +++ b/base/encode_test.go @@ -1,8 +1,10 @@ package base import ( + "strings" "testing" + "github.com/samber/lo" "github.com/stretchr/testify/require" ) @@ -20,8 +22,9 @@ func Test_encode(t *testing.T) { {"FAKERo0oO0", "h0oFAKEROo"}, {"h0o0o0OFAKERo0oO0", "h0oFAKEROo"}, } + replacer := strings.NewReplacer(lo.FlatMap[string, string]([]string{"0", "o", "O"}, func(item string, _ int) []string { return []string{item, "o"} })...) for _, tt := range tests { got := hooEncode(tt.args) - require.Equalf(t, tt.want, got, "encode(%s)", tt.args) + require.Equalf(t, replacer.Replace(tt.want), replacer.Replace(got), "encode(%s)", tt.args) } } From 5797ced36d65fd3fb9d3fb0f9a139bf839040893 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 18 Oct 2024 16:13:47 +0800 Subject: [PATCH 27/53] revert: sticker.go --- base/sticker.go | 90 ++----------------------------------------------- 1 file changed, 3 insertions(+), 87 deletions(-) diff --git a/base/sticker.go b/base/sticker.go index 38ac215..023719b 100644 --- a/base/sticker.go +++ b/base/sticker.go @@ -11,7 +11,6 @@ import ( "image/png" "io" "os" - "path" "slices" "strings" "time" @@ -34,9 +33,6 @@ type stickerOpts struct { pack bool vf string sf string - - // pack format - pf string } func defaultOpts() stickerOpts { @@ -88,8 +84,6 @@ func (o stickerOpts) merge(m map[string]string, final bool) stickerOpts { o.vf = v case "sf", "stickerformat": o.sf = v - case "pf", "packformat": - o.pf = v } } @@ -149,6 +143,7 @@ func GetSticker(ctx tb.Context) error { opt = opt.merge(o, true) } + // nolint: nestif // will fix in future if !opt.pack { filename := sticker.SetName emoji := sticker.Emoji @@ -163,7 +158,8 @@ func GetSticker(ctx tb.Context) error { return sendImageSticker(ctx, sticker, filename, emoji, opt) } - return sendStickerPack(ctx, sticker, opt) + // nolint: goerr113 + return errors.New("not implement") } func sendImageSticker(ctx tb.Context, sticker *tb.Sticker, filename string, emoji string, opt stickerOpts) error { @@ -333,86 +329,6 @@ func sendVideoSticker(ctx tb.Context, sticker *tb.Sticker, filename string, emoj } } -func sendStickerPack(ctx tb.Context, sticker *tb.Sticker, opt stickerOpts) error { - stickerSet, err := ctx.Bot().StickerSet(sticker.SetName) - if err != nil { - ctx.Reply("failed to get sticker set") - return err - } - - var f string - if stickerSet.Animated { - f = opt.VideoFormat() - if f == "" { - f = "webm" - } - } else { - f = opt.StickerFormat() - if f == "" { - f = "webp" - } - } - - var ext string - switch f { - case "jpeg", "jpg": - ext = ".jpg" - default: - ext = "." + f - } - - pf := opt.pf - if pf == "" { - pf = "zip" - } - - tempDir, err := os.MkdirTemp("", "telebot") - if err != nil { - ctx.Reply("process failed") - return err - } - defer func() { - _ = os.RemoveAll(tempDir) - }() - - outputFiles := make([]string, 0, len(stickerSet.Stickers)) - for i, s := range stickerSet.Stickers { - emoji := s.Emoji - if emoji != "" { - emoji = "_" + emoji - } - filename := fmt.Sprintf("%s_%03d%s%s", stickerSet.Name, i+1, emoji, ext) - outputFiles = append(outputFiles, filename) - - if s.Animated && f == "webm" || !s.Animated && f == "webp" { - of, err := os.OpenFile(path.Join(tempDir, filename), os.O_CREATE|os.O_RDWR, 0o640) - if err != nil { - ctx.Reply("process failed") - return err - } - - err = func() error { - fileR, err := ctx.Bot().File(&s.File) - if err != nil { - return err - } - - _, err = io.Copy(of, fileR) - return err - }() - if err != nil { - ctx.Reply("process failed") - return err - } - - // TODO: pack archive - } - - // TODO: convert media format - } - return nil -} - func parseOpts(text string) (map[string]string, error) { cmd, _, err := entities.CommandFromText(text, -1) if err != nil { From 2510da8e75faca2959093726f94ec06bf77e57d2 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 18 Oct 2024 16:19:13 +0800 Subject: [PATCH 28/53] impr: hoocoder more random --- base/encode.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/base/encode.go b/base/encode.go index 5457add..d765e2f 100644 --- a/base/encode.go +++ b/base/encode.go @@ -38,19 +38,22 @@ func hooEncode(s string) string { i2 = matches2[0] } + bs := bytes.NewBufferString("h") + if i1 >= i2-1 { - return "h0oOo" + for range 4 { + bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) + } + return bs.String() } - bs := bytes.NewBufferString("h") - - for _ = range 2 { + for range 2 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } bs.WriteString(s[i1:i2]) - for _ = range 2 { + for range 2 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } From cb5742f6f1e263459b4f5ba7fff4a8d6c9d776cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Oct 2024 19:11:17 +0000 Subject: [PATCH 29/53] build(deps): bump github.com/prometheus/common from 0.55.0 to 0.60.1 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.55.0 to 0.60.1. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](https://github.com/prometheus/common/compare/v0.55.0...v0.60.1) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 4e8147e..cc3284d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 github.com/meilisearch/meilisearch-go v0.28.0 github.com/prometheus/client_golang v1.20.4 - github.com/prometheus/common v0.55.0 + github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.46.0 github.com/redis/go-redis/v9 v9.6.1 github.com/sashabaranov/go-openai v1.28.2 @@ -15,8 +15,8 @@ require ( github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 golang.org/x/image v0.19.0 - golang.org/x/net v0.28.0 - golang.org/x/text v0.17.0 + golang.org/x/net v0.29.0 + golang.org/x/text v0.18.0 golang.org/x/time v0.6.0 gopkg.in/telebot.v3 v3.3.8 ) @@ -60,10 +60,10 @@ require ( github.com/u2takey/go-utils v0.3.1 // indirect go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.26.0 // indirect + golang.org/x/crypto v0.27.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/sys v0.23.0 // indirect + golang.org/x/sys v0.25.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 334b128..05216f1 100644 --- a/go.sum +++ b/go.sum @@ -402,8 +402,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc= +github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= @@ -517,8 +517,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= +golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -608,8 +608,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -630,8 +630,8 @@ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -725,8 +725,8 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -738,8 +738,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From a42150471445de87b8561b48e69e613b78fe1887 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 03:55:12 +0000 Subject: [PATCH 30/53] build(deps): bump golang.org/x/time from 0.6.0 to 0.7.0 Bumps [golang.org/x/time](https://github.com/golang/time) from 0.6.0 to 0.7.0. - [Commits](https://github.com/golang/time/compare/v0.6.0...v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cc3284d..398caca 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( golang.org/x/image v0.19.0 golang.org/x/net v0.29.0 golang.org/x/text v0.18.0 - golang.org/x/time v0.6.0 + golang.org/x/time v0.7.0 gopkg.in/telebot.v3 v3.3.8 ) diff --git a/go.sum b/go.sum index 05216f1..214296b 100644 --- a/go.sum +++ b/go.sum @@ -743,8 +743,8 @@ golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= -golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= +golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 5d4b1f537b9737785635c5983c3f766f27c19dae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 03:55:45 +0000 Subject: [PATCH 31/53] build(deps): bump github.com/redis/go-redis/v9 from 9.6.1 to 9.7.0 Bumps [github.com/redis/go-redis/v9](https://github.com/redis/go-redis) from 9.6.1 to 9.7.0. - [Release notes](https://github.com/redis/go-redis/releases) - [Changelog](https://github.com/redis/go-redis/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/go-redis/compare/v9.6.1...v9.7.0) --- updated-dependencies: - dependency-name: github.com/redis/go-redis/v9 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cc3284d..00ac264 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/prometheus/client_golang v1.20.4 github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.46.0 - github.com/redis/go-redis/v9 v9.6.1 + github.com/redis/go-redis/v9 v9.7.0 github.com/sashabaranov/go-openai v1.28.2 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 diff --git a/go.sum b/go.sum index 05216f1..f2e198e 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y= github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= -github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= -github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA= +github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= +github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= From 6c1b9471f47bd1cdf930238b4737606aec9733ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 04:13:22 +0000 Subject: [PATCH 32/53] build(deps): bump golang.org/x/image from 0.19.0 to 0.21.0 Bumps [golang.org/x/image](https://github.com/golang/image) from 0.19.0 to 0.21.0. - [Commits](https://github.com/golang/image/compare/v0.19.0...v0.21.0) --- updated-dependencies: - dependency-name: golang.org/x/image dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 398caca..22ee943 100644 --- a/go.mod +++ b/go.mod @@ -14,9 +14,9 @@ require ( github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 - golang.org/x/image v0.19.0 + golang.org/x/image v0.21.0 golang.org/x/net v0.29.0 - golang.org/x/text v0.18.0 + golang.org/x/text v0.19.0 golang.org/x/time v0.7.0 gopkg.in/telebot.v3 v3.3.8 ) diff --git a/go.sum b/go.sum index 214296b..7d228f6 100644 --- a/go.sum +++ b/go.sum @@ -534,8 +534,8 @@ golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQ golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ= -golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys= +golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s= +golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -738,8 +738,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 86a45bc67455e7d7767aac62b0eb5a4c76ee4c69 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 04:25:16 +0000 Subject: [PATCH 33/53] build(deps): bump golang.org/x/net from 0.28.0 to 0.30.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.28.0 to 0.30.0. - [Commits](https://github.com/golang/net/compare/v0.28.0...v0.30.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index a82b41b..861f0cc 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 golang.org/x/image v0.21.0 - golang.org/x/net v0.29.0 + golang.org/x/net v0.30.0 golang.org/x/text v0.19.0 golang.org/x/time v0.7.0 gopkg.in/telebot.v3 v3.3.8 @@ -60,10 +60,10 @@ require ( github.com/u2takey/go-utils v0.3.1 // indirect go.uber.org/mock v0.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.27.0 // indirect + golang.org/x/crypto v0.28.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/sys v0.25.0 // indirect + golang.org/x/sys v0.26.0 // indirect golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 79e9f19..6728e70 100644 --- a/go.sum +++ b/go.sum @@ -517,8 +517,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A= -golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -608,8 +608,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -725,8 +725,8 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From c2f4c4de3575b93e981b88e3bdec31e42f0f0ef2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 04:25:19 +0000 Subject: [PATCH 34/53] build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.4 to 1.20.5. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.4...v1.20.5) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a82b41b..6da34b8 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 github.com/meilisearch/meilisearch-go v0.28.0 - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.46.0 github.com/redis/go-redis/v9 v9.7.0 diff --git a/go.sum b/go.sum index 79e9f19..704796b 100644 --- a/go.sum +++ b/go.sum @@ -390,8 +390,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From 72305675dfd085e563c2b27b4975234e060cfeca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 25 Oct 2024 06:08:57 +0000 Subject: [PATCH 35/53] build(deps): bump github.com/quic-go/quic-go from 0.46.0 to 0.48.1 Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.46.0 to 0.48.1. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](https://github.com/quic-go/quic-go/compare/v0.46.0...v0.48.1) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 79ae0bc..7f1b82e 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/meilisearch/meilisearch-go v0.28.0 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 - github.com/quic-go/quic-go v0.46.0 + github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 github.com/sashabaranov/go-openai v1.28.2 github.com/spf13/viper v1.19.0 @@ -48,7 +48,7 @@ require ( github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/quic-go/qpack v0.4.0 // indirect + github.com/quic-go/qpack v0.5.1 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/samber/lo v1.47.0 diff --git a/go.sum b/go.sum index 72e104c..5b5eb6b 100644 --- a/go.sum +++ b/go.sum @@ -411,10 +411,10 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= -github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= -github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y= -github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI= +github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= +github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= +github.com/quic-go/quic-go v0.48.1 h1:y/8xmfWI9qmGTc+lBr4jKRUWLGSlSigv847ULJ4hYXA= +github.com/quic-go/quic-go v0.48.1/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= From 20b444179cb9e2cb7556510528f254064621c084 Mon Sep 17 00:00:00 2001 From: Anthony Hoo <30752208+Anthony-Hoo@users.noreply.github.com> Date: Fri, 25 Oct 2024 16:13:23 +0800 Subject: [PATCH 36/53] fix: make linter happy --- base/encode.go | 14 +++++++------- chat/chat.go | 6 ++++-- entities/command.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- sd/sd.go | 4 ++-- util/constraints.go | 1 - util/heap/ordered_heap_test.go | 2 ++ util/urlx/extract_test.go | 4 ++-- 9 files changed, 21 insertions(+), 18 deletions(-) diff --git a/base/encode.go b/base/encode.go index d765e2f..1dde3df 100644 --- a/base/encode.go +++ b/base/encode.go @@ -3,7 +3,7 @@ package base import ( "bytes" "csust-got/entities" - "math/rand/v2" + "math/rand" "regexp" . "gopkg.in/telebot.v3" @@ -41,20 +41,20 @@ func hooEncode(s string) string { bs := bytes.NewBufferString("h") if i1 >= i2-1 { - for range 4 { - bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) + for i := 0; i < 4; i++ { // Corrected the range to an explicit integer + bs.WriteRune(hooRunes[rand.Intn(len(hooRunes))]) // Changed rand.N to rand.Intn } return bs.String() } - for range 2 { - bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) + for i := 0; i < 2; i++ { // Corrected the range to an explicit integer + bs.WriteRune(hooRunes[rand.Intn(len(hooRunes))]) } bs.WriteString(s[i1:i2]) - for range 2 { - bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) + for i := 0; i < 2; i++ { // Corrected the range to an explicit integer + bs.WriteRune(hooRunes[rand.Intn(len(hooRunes))]) } return bs.String() diff --git a/chat/chat.go b/chat/chat.go index 75b9aae..67f48dd 100644 --- a/chat/chat.go +++ b/chat/chat.go @@ -39,8 +39,10 @@ func InitChat() { if config.BotConfig.ChatConfig.Key != "" { clientConfig := openai.DefaultConfig(config.BotConfig.ChatConfig.Key) if u, err := url.Parse(config.BotConfig.Proxy); err == nil && u.Host != "" { - clientConfig.HTTPClient.Transport = &http.Transport{ - Proxy: http.ProxyURL(u), + clientConfig.HTTPClient = &http.Client{ + Transport: &http.Transport{ + Proxy: http.ProxyURL(u), + }, } } else { log.Error("[chat] failed to parse proxy url", zap.Error(err)) diff --git a/entities/command.go b/entities/command.go index 60f20ee..90dfe8d 100644 --- a/entities/command.go +++ b/entities/command.go @@ -114,4 +114,4 @@ func (c BotCommand) ArgAllInOneFrom(idx int) string { // Args get all args func (c BotCommand) Args() []string { return c.args -} \ No newline at end of file +} diff --git a/go.mod b/go.mod index 7f1b82e..bd96712 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.28.2 + github.com/sashabaranov/go-openai v1.32.3 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 5b5eb6b..d3c7d0f 100644 --- a/go.sum +++ b/go.sum @@ -430,8 +430,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0= -github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.32.3 h1:6xZ393PbZFoJrgwveBXVZggmyH7zdp4joUdnCy7FFD8= +github.com/sashabaranov/go-openai v1.32.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= diff --git a/sd/sd.go b/sd/sd.go index 4855d8a..fa65ff4 100644 --- a/sd/sd.go +++ b/sd/sd.go @@ -37,7 +37,7 @@ type mixRoundTripper struct { H3RoundTripper http.RoundTripper } -func newMixRoundTripper(t http.RoundTripper, h3 *http3.RoundTripper) *mixRoundTripper { +func newMixRoundTripper(t http.RoundTripper, h3 *http3.Transport) *mixRoundTripper { return &mixRoundTripper{ TraditionalRoundTripper: t, H3RoundTripper: h3, @@ -66,7 +66,7 @@ func init() { } transport.DialContext = dialer.DialContext - h3RoundTripper := &http3.RoundTripper{ + h3RoundTripper := &http3.Transport{ QUICConfig: &quic.Config{ MaxIdleTimeout: 3 * time.Minute, diff --git a/util/constraints.go b/util/constraints.go index 8852533..3a34c1d 100644 --- a/util/constraints.go +++ b/util/constraints.go @@ -68,4 +68,3 @@ func Min[T Ordered](args ...T) T { } return temp } - diff --git a/util/heap/ordered_heap_test.go b/util/heap/ordered_heap_test.go index f6342c2..dc3a332 100644 --- a/util/heap/ordered_heap_test.go +++ b/util/heap/ordered_heap_test.go @@ -1,4 +1,6 @@ +//go:build heap_test // +build heap_test + // go:build heap_test package heap diff --git a/util/urlx/extract_test.go b/util/urlx/extract_test.go index 4c960f5..ff4053e 100644 --- a/util/urlx/extract_test.go +++ b/util/urlx/extract_test.go @@ -98,12 +98,12 @@ func TestExtractStr(t *testing.T) { func TestUrlToExtraUrl(t *testing.T) { tests := []struct { name string - url string + url string want *ExtraUrl }{ { name: "url test", - url: "https://example.com/echo?q=query#hello", + url: "https://example.com/echo?q=query#hello", want: &ExtraUrl{ Text: "https://example.com/echo?q=query#hello", Scheme: "https", From 7affb1331f86146b7b8461c712132d6949945687 Mon Sep 17 00:00:00 2001 From: Anthony Hoo Date: Fri, 25 Oct 2024 16:46:06 +0800 Subject: [PATCH 37/53] fix: 1. command shouldn't appear in text when encode and decode 2. add unit test for command split --- base/decode.go | 2 +- base/encode.go | 2 +- entities/command_test.go | 89 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/base/decode.go b/base/decode.go index 2d191f5..ea0cf1d 100644 --- a/base/decode.go +++ b/base/decode.go @@ -31,7 +31,7 @@ var errInvalidCmd = errors.New("invalid command") // Decode decode text command // nolint:goconst func Decode(ctx tb.Context) error { - cmd, text, err := entities.CommandTakeArgs(ctx.Message(), 0) + cmd, text, err := entities.CommandTakeArgs(ctx.Message(), -1) if err != nil { return err } diff --git a/base/encode.go b/base/encode.go index 1dde3df..d844d98 100644 --- a/base/encode.go +++ b/base/encode.go @@ -17,7 +17,7 @@ var ( // HooEncoder encode 'XXX' to 'hooXXXoo'. func HooEncoder(ctx Context) error { - _, s, err := entities.CommandTakeArgs(ctx.Message(), 0) + _, s, err := entities.CommandTakeArgs(ctx.Message(), -1) if err != nil { return ctx.Reply("h0oOo") } diff --git a/entities/command_test.go b/entities/command_test.go index ed12d26..bcbca55 100644 --- a/entities/command_test.go +++ b/entities/command_test.go @@ -2,6 +2,8 @@ package entities import ( + "errors" + "reflect" "testing" "github.com/stretchr/testify/assert" @@ -65,3 +67,90 @@ func Test_splitText(t *testing.T) { assert.Equal(t, []string{"love", "and peace"}, got) }) } + +func Test_CommandFromText(t *testing.T) { + tests := []struct { + name string + text string + argc int + wantCmd *BotCommand + wantRest string + wantErr error + }{ + { + name: "simple command", + text: "/hello", + argc: -1, + wantCmd: &BotCommand{ + name: "hello", + args: []string{}, + }, + wantRest: "", + wantErr: nil, + }, + { + name: "command with args", + text: "/hello world foo", + argc: -1, + wantCmd: &BotCommand{ + name: "hello", + args: []string{"world", "foo"}, + }, + wantRest: "", + wantErr: nil, + }, + { + name: "unicode test", + text: "/hello 你好 👋", + argc: -1, + wantCmd: &BotCommand{ + name: "hello", + args: []string{"你好", "👋"}, + }, + wantRest: "", + wantErr: nil, + }, + { + name: "command with argc", + text: "/hello world foo", + argc: 1, + wantCmd: &BotCommand{ + name: "hello", + args: []string{"world"}, + }, + wantRest: "foo", + wantErr: nil, + }, + { + name: "invalid command", + text: "hello world", + argc: -1, + wantCmd: nil, + wantRest: "", + wantErr: errParseCommandName, + }, + { + name: "empty text", + text: "", + argc: -1, + wantCmd: nil, + wantRest: "", + wantErr: errParseCommand, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + cmd, rest, err := CommandFromText(tt.text, tt.argc) + if !reflect.DeepEqual(cmd, tt.wantCmd) { + t.Errorf("CommandFromText() cmd = %v, want %v", cmd, tt.wantCmd) + } + if rest != tt.wantRest { + t.Errorf("CommandFromText() rest = %v, want %v", rest, tt.wantRest) + } + if !errors.Is(err, tt.wantErr) { + t.Errorf("CommandFromText() err = %v, want %v", err, tt.wantErr) + } + }) + } +} From fb281066e15e08843275d14281737045e9c13670 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 25 Oct 2024 17:03:53 +0800 Subject: [PATCH 38/53] Revert "fix: make linter happy" This reverts commit 20b444179cb9e2cb7556510528f254064621c084. --- base/encode.go | 14 +++++++------- chat/chat.go | 6 ++---- entities/command.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- sd/sd.go | 4 ++-- util/constraints.go | 1 + util/heap/ordered_heap_test.go | 2 -- util/urlx/extract_test.go | 4 ++-- 9 files changed, 18 insertions(+), 21 deletions(-) diff --git a/base/encode.go b/base/encode.go index d844d98..20999cd 100644 --- a/base/encode.go +++ b/base/encode.go @@ -3,7 +3,7 @@ package base import ( "bytes" "csust-got/entities" - "math/rand" + "math/rand/v2" "regexp" . "gopkg.in/telebot.v3" @@ -41,20 +41,20 @@ func hooEncode(s string) string { bs := bytes.NewBufferString("h") if i1 >= i2-1 { - for i := 0; i < 4; i++ { // Corrected the range to an explicit integer - bs.WriteRune(hooRunes[rand.Intn(len(hooRunes))]) // Changed rand.N to rand.Intn + for range 4 { + bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } return bs.String() } - for i := 0; i < 2; i++ { // Corrected the range to an explicit integer - bs.WriteRune(hooRunes[rand.Intn(len(hooRunes))]) + for range 2 { + bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } bs.WriteString(s[i1:i2]) - for i := 0; i < 2; i++ { // Corrected the range to an explicit integer - bs.WriteRune(hooRunes[rand.Intn(len(hooRunes))]) + for range 2 { + bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } return bs.String() diff --git a/chat/chat.go b/chat/chat.go index 67f48dd..75b9aae 100644 --- a/chat/chat.go +++ b/chat/chat.go @@ -39,10 +39,8 @@ func InitChat() { if config.BotConfig.ChatConfig.Key != "" { clientConfig := openai.DefaultConfig(config.BotConfig.ChatConfig.Key) if u, err := url.Parse(config.BotConfig.Proxy); err == nil && u.Host != "" { - clientConfig.HTTPClient = &http.Client{ - Transport: &http.Transport{ - Proxy: http.ProxyURL(u), - }, + clientConfig.HTTPClient.Transport = &http.Transport{ + Proxy: http.ProxyURL(u), } } else { log.Error("[chat] failed to parse proxy url", zap.Error(err)) diff --git a/entities/command.go b/entities/command.go index 90dfe8d..60f20ee 100644 --- a/entities/command.go +++ b/entities/command.go @@ -114,4 +114,4 @@ func (c BotCommand) ArgAllInOneFrom(idx int) string { // Args get all args func (c BotCommand) Args() []string { return c.args -} +} \ No newline at end of file diff --git a/go.mod b/go.mod index bd96712..7f1b82e 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.32.3 + github.com/sashabaranov/go-openai v1.28.2 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index d3c7d0f..5b5eb6b 100644 --- a/go.sum +++ b/go.sum @@ -430,8 +430,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.32.3 h1:6xZ393PbZFoJrgwveBXVZggmyH7zdp4joUdnCy7FFD8= -github.com/sashabaranov/go-openai v1.32.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0= +github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= diff --git a/sd/sd.go b/sd/sd.go index fa65ff4..4855d8a 100644 --- a/sd/sd.go +++ b/sd/sd.go @@ -37,7 +37,7 @@ type mixRoundTripper struct { H3RoundTripper http.RoundTripper } -func newMixRoundTripper(t http.RoundTripper, h3 *http3.Transport) *mixRoundTripper { +func newMixRoundTripper(t http.RoundTripper, h3 *http3.RoundTripper) *mixRoundTripper { return &mixRoundTripper{ TraditionalRoundTripper: t, H3RoundTripper: h3, @@ -66,7 +66,7 @@ func init() { } transport.DialContext = dialer.DialContext - h3RoundTripper := &http3.Transport{ + h3RoundTripper := &http3.RoundTripper{ QUICConfig: &quic.Config{ MaxIdleTimeout: 3 * time.Minute, diff --git a/util/constraints.go b/util/constraints.go index 3a34c1d..8852533 100644 --- a/util/constraints.go +++ b/util/constraints.go @@ -68,3 +68,4 @@ func Min[T Ordered](args ...T) T { } return temp } + diff --git a/util/heap/ordered_heap_test.go b/util/heap/ordered_heap_test.go index dc3a332..f6342c2 100644 --- a/util/heap/ordered_heap_test.go +++ b/util/heap/ordered_heap_test.go @@ -1,6 +1,4 @@ -//go:build heap_test // +build heap_test - // go:build heap_test package heap diff --git a/util/urlx/extract_test.go b/util/urlx/extract_test.go index ff4053e..4c960f5 100644 --- a/util/urlx/extract_test.go +++ b/util/urlx/extract_test.go @@ -98,12 +98,12 @@ func TestExtractStr(t *testing.T) { func TestUrlToExtraUrl(t *testing.T) { tests := []struct { name string - url string + url string want *ExtraUrl }{ { name: "url test", - url: "https://example.com/echo?q=query#hello", + url: "https://example.com/echo?q=query#hello", want: &ExtraUrl{ Text: "https://example.com/echo?q=query#hello", Scheme: "https", From 8102c3416e15907bc74ce33e1ed1be98f9e27188 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 25 Oct 2024 17:06:04 +0800 Subject: [PATCH 39/53] fix lint issue --- sd/sd.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sd/sd.go b/sd/sd.go index 4855d8a..5ddcc59 100644 --- a/sd/sd.go +++ b/sd/sd.go @@ -37,7 +37,7 @@ type mixRoundTripper struct { H3RoundTripper http.RoundTripper } -func newMixRoundTripper(t http.RoundTripper, h3 *http3.RoundTripper) *mixRoundTripper { +func newMixRoundTripper(t http.RoundTripper, h3 *http3.Transport) *mixRoundTripper { return &mixRoundTripper{ TraditionalRoundTripper: t, H3RoundTripper: h3, @@ -66,8 +66,7 @@ func init() { } transport.DialContext = dialer.DialContext - h3RoundTripper := &http3.RoundTripper{ - + h3RoundTripper := &http3.Transport{ QUICConfig: &quic.Config{ MaxIdleTimeout: 3 * time.Minute, KeepAlivePeriod: 10 * time.Second, From a8a2b8b40441d5867cd461bca6bc7cdb2f565f78 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Fri, 25 Oct 2024 17:10:21 +0800 Subject: [PATCH 40/53] Revert "fix: 1. command shouldn't appear in text when encode and decode" This reverts commit 7affb1331f86146b7b8461c712132d6949945687. --- base/decode.go | 2 +- base/encode.go | 2 +- entities/command_test.go | 89 ---------------------------------------- 3 files changed, 2 insertions(+), 91 deletions(-) diff --git a/base/decode.go b/base/decode.go index ea0cf1d..2d191f5 100644 --- a/base/decode.go +++ b/base/decode.go @@ -31,7 +31,7 @@ var errInvalidCmd = errors.New("invalid command") // Decode decode text command // nolint:goconst func Decode(ctx tb.Context) error { - cmd, text, err := entities.CommandTakeArgs(ctx.Message(), -1) + cmd, text, err := entities.CommandTakeArgs(ctx.Message(), 0) if err != nil { return err } diff --git a/base/encode.go b/base/encode.go index 20999cd..d765e2f 100644 --- a/base/encode.go +++ b/base/encode.go @@ -17,7 +17,7 @@ var ( // HooEncoder encode 'XXX' to 'hooXXXoo'. func HooEncoder(ctx Context) error { - _, s, err := entities.CommandTakeArgs(ctx.Message(), -1) + _, s, err := entities.CommandTakeArgs(ctx.Message(), 0) if err != nil { return ctx.Reply("h0oOo") } diff --git a/entities/command_test.go b/entities/command_test.go index bcbca55..ed12d26 100644 --- a/entities/command_test.go +++ b/entities/command_test.go @@ -2,8 +2,6 @@ package entities import ( - "errors" - "reflect" "testing" "github.com/stretchr/testify/assert" @@ -67,90 +65,3 @@ func Test_splitText(t *testing.T) { assert.Equal(t, []string{"love", "and peace"}, got) }) } - -func Test_CommandFromText(t *testing.T) { - tests := []struct { - name string - text string - argc int - wantCmd *BotCommand - wantRest string - wantErr error - }{ - { - name: "simple command", - text: "/hello", - argc: -1, - wantCmd: &BotCommand{ - name: "hello", - args: []string{}, - }, - wantRest: "", - wantErr: nil, - }, - { - name: "command with args", - text: "/hello world foo", - argc: -1, - wantCmd: &BotCommand{ - name: "hello", - args: []string{"world", "foo"}, - }, - wantRest: "", - wantErr: nil, - }, - { - name: "unicode test", - text: "/hello 你好 👋", - argc: -1, - wantCmd: &BotCommand{ - name: "hello", - args: []string{"你好", "👋"}, - }, - wantRest: "", - wantErr: nil, - }, - { - name: "command with argc", - text: "/hello world foo", - argc: 1, - wantCmd: &BotCommand{ - name: "hello", - args: []string{"world"}, - }, - wantRest: "foo", - wantErr: nil, - }, - { - name: "invalid command", - text: "hello world", - argc: -1, - wantCmd: nil, - wantRest: "", - wantErr: errParseCommandName, - }, - { - name: "empty text", - text: "", - argc: -1, - wantCmd: nil, - wantRest: "", - wantErr: errParseCommand, - }, - } - - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - cmd, rest, err := CommandFromText(tt.text, tt.argc) - if !reflect.DeepEqual(cmd, tt.wantCmd) { - t.Errorf("CommandFromText() cmd = %v, want %v", cmd, tt.wantCmd) - } - if rest != tt.wantRest { - t.Errorf("CommandFromText() rest = %v, want %v", rest, tt.wantRest) - } - if !errors.Is(err, tt.wantErr) { - t.Errorf("CommandFromText() err = %v, want %v", err, tt.wantErr) - } - }) - } -} From 232bba13790782bf7d2bb551fa6103fb3fb97146 Mon Sep 17 00:00:00 2001 From: Anthony Hoo Date: Fri, 25 Oct 2024 17:32:25 +0800 Subject: [PATCH 41/53] fix: update go-openai --- base/encode.go | 6 +++--- chat/chat.go | 6 ++++-- go.mod | 2 +- go.sum | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/base/encode.go b/base/encode.go index d765e2f..5b98cdd 100644 --- a/base/encode.go +++ b/base/encode.go @@ -41,19 +41,19 @@ func hooEncode(s string) string { bs := bytes.NewBufferString("h") if i1 >= i2-1 { - for range 4 { + for i := 0; i < 4; i++ { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } return bs.String() } - for range 2 { + for i := 0; i < 2; i++ { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } bs.WriteString(s[i1:i2]) - for range 2 { + for i := 0; i < 2; i++ { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } diff --git a/chat/chat.go b/chat/chat.go index 75b9aae..67f48dd 100644 --- a/chat/chat.go +++ b/chat/chat.go @@ -39,8 +39,10 @@ func InitChat() { if config.BotConfig.ChatConfig.Key != "" { clientConfig := openai.DefaultConfig(config.BotConfig.ChatConfig.Key) if u, err := url.Parse(config.BotConfig.Proxy); err == nil && u.Host != "" { - clientConfig.HTTPClient.Transport = &http.Transport{ - Proxy: http.ProxyURL(u), + clientConfig.HTTPClient = &http.Client{ + Transport: &http.Transport{ + Proxy: http.ProxyURL(u), + }, } } else { log.Error("[chat] failed to parse proxy url", zap.Error(err)) diff --git a/go.mod b/go.mod index 7f1b82e..bd96712 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.28.2 + github.com/sashabaranov/go-openai v1.32.3 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 5b5eb6b..866cf8f 100644 --- a/go.sum +++ b/go.sum @@ -432,6 +432,7 @@ github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0= github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.32.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 2e118e3f2fa666652603aed656b11bc686881372 Mon Sep 17 00:00:00 2001 From: Anthony Hoo Date: Fri, 25 Oct 2024 17:37:19 +0800 Subject: [PATCH 42/53] fix: update requires --- go.mod | 30 ++++++++++++++------------ go.sum | 66 +++++++++++++++++++++++++++------------------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/go.mod b/go.mod index bd96712..93a177e 100644 --- a/go.mod +++ b/go.mod @@ -21,51 +21,55 @@ require ( gopkg.in/telebot.v3 v3.3.8 ) +require ( + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect + golang.org/x/sync v0.8.0 // indirect +) + require ( github.com/adamzy/cedar-go v0.0.0-20170805034717-80a9c64b256d // indirect - github.com/aws/aws-sdk-go v1.38.20 // indirect + github.com/aws/aws-sdk-go v1.55.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect - github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a // indirect + github.com/google/pprof v0.0.0-20241023014458-598669927662 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/ginkgo/v2 v2.13.0 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/onsi/ginkgo/v2 v2.20.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/quic-go/qpack v0.5.1 // indirect - github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/samber/lo v1.47.0 github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect - github.com/spf13/cast v1.6.0 // indirect + github.com/spf13/cast v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/u2takey/go-utils v0.3.1 // indirect - go.uber.org/mock v0.4.0 // indirect + go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.28.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect + golang.org/x/mod v0.21.0 // indirect golang.org/x/sys v0.26.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/protobuf v1.34.2 // indirect + golang.org/x/tools v0.26.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 866cf8f..f2cb67e 100644 --- a/go.sum +++ b/go.sum @@ -72,8 +72,9 @@ github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmV github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/aws/aws-sdk-go v1.38.20 h1:QbzNx/tdfATbdKfubBpkt84OM6oBkxQZRw6+bW2GyeA= github.com/aws/aws-sdk-go v1.38.20/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= +github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= +github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -146,15 +147,15 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -193,8 +194,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -234,8 +233,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a h1:fEBsGL/sjAuJrgah5XqmmYsTLzJp/TO9Lhy39gkverk= -github.com/google/pprof v0.0.0-20231101202521-4ca4178f5c7a/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= +github.com/google/pprof v0.0.0-20241023014458-598669927662 h1:SKMkD83p7FwUqKmBsPdLHF5dNyxq3jOWwu9w9UyH5vA= +github.com/google/pprof v0.0.0-20241023014458-598669927662/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -305,8 +304,8 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -365,17 +364,17 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= -github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= +github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4= +github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/panjf2000/ants/v2 v2.4.2/go.mod h1:f6F0NZVFsGCp5A7QW/Zj/m92atWwOkY0OIhFxRNFr4A= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= -github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -424,14 +423,13 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sagikazarmark/crypt v0.6.0/go.mod h1:U8+INwJo3nBv1m6A/8OBXAq7Jnpspk5AxSgDyEQcea8= -github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= -github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= +github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.28.2 h1:Q3pi34SuNYNN7YrqpHlHbpeYlf75ljgHOAVM/r1yun0= -github.com/sashabaranov/go-openai v1.28.2/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.32.3 h1:6xZ393PbZFoJrgwveBXVZggmyH7zdp4joUdnCy7FFD8= github.com/sashabaranov/go-openai v1.32.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -445,8 +443,8 @@ github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfA github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= -github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= +github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -457,7 +455,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -468,7 +465,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= @@ -499,8 +495,8 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= -go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= -go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= @@ -530,8 +526,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= -golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY= +golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -560,8 +556,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -802,8 +798,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -979,8 +975,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From a63ebcc7834bd64d52201ed000abc81c1a423a53 Mon Sep 17 00:00:00 2001 From: Hugefiver Date: Mon, 28 Oct 2024 14:27:41 +0800 Subject: [PATCH 43/53] use go 1.23 for range --- base/encode.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/encode.go b/base/encode.go index 5b98cdd..41a8da0 100644 --- a/base/encode.go +++ b/base/encode.go @@ -41,19 +41,19 @@ func hooEncode(s string) string { bs := bytes.NewBufferString("h") if i1 >= i2-1 { - for i := 0; i < 4; i++ { + for range 4 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } return bs.String() } - for i := 0; i < 2; i++ { + for range 4 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } bs.WriteString(s[i1:i2]) - for i := 0; i < 2; i++ { + for range 4 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } From c0572e2e8d18edc7b4932a5c964db7daf45ba5f1 Mon Sep 17 00:00:00 2001 From: Anthony Hoo Date: Tue, 29 Oct 2024 09:56:26 +0800 Subject: [PATCH 44/53] fix: update requires , fix encode iteration errors --- base/encode.go | 4 ++-- go.mod | 5 +++-- go.sum | 10 ++++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/base/encode.go b/base/encode.go index 41a8da0..d765e2f 100644 --- a/base/encode.go +++ b/base/encode.go @@ -47,13 +47,13 @@ func hooEncode(s string) string { return bs.String() } - for range 4 { + for range 2 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } bs.WriteString(s[i1:i2]) - for range 4 { + for range 2 { bs.WriteRune(hooRunes[rand.N(len(hooRunes))]) } diff --git a/go.mod b/go.mod index 93a177e..d09b1c4 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,12 @@ go 1.23 require ( github.com/huichen/sego v0.0.0-20210824061530-c87651ea5c76 - github.com/meilisearch/meilisearch-go v0.28.0 + github.com/meilisearch/meilisearch-go v0.29.0 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.32.3 + github.com/sashabaranov/go-openai v1.32.4 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 @@ -22,6 +22,7 @@ require ( ) require ( + github.com/andybalholm/brotli v1.1.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect golang.org/x/sync v0.8.0 // indirect ) diff --git a/go.sum b/go.sum index f2cb67e..0c7cba9 100644 --- a/go.sum +++ b/go.sum @@ -66,6 +66,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M= +github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= @@ -340,8 +342,8 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/meilisearch/meilisearch-go v0.28.0 h1:f3XJ66ZM+R8bANAOLqsjvoq/HhQNpVJPYoNt6QgNzME= -github.com/meilisearch/meilisearch-go v0.28.0/go.mod h1:Szcc9CaDiKIfjdgdt49jlmDKpEzjD+x+b6Y6heMdlQ0= +github.com/meilisearch/meilisearch-go v0.29.0 h1:HZ9NEKN59USINQ/DXJge/aaXq8IrsKbXGTdAoBaaDz4= +github.com/meilisearch/meilisearch-go v0.29.0/go.mod h1:2cRCAn4ddySUsFfNDLVPod/plRibQsJkXF/4gLhxbOk= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= @@ -429,8 +431,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.32.3 h1:6xZ393PbZFoJrgwveBXVZggmyH7zdp4joUdnCy7FFD8= -github.com/sashabaranov/go-openai v1.32.3/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.32.4 h1:blCQWmKA3Z1UNSnPpWiJqPhYKyp3suuGJIObFMQ+cXI= +github.com/sashabaranov/go-openai v1.32.4/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From e4407c808b31a4f422d1e883b510a17e186ce288 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 19:12:36 +0000 Subject: [PATCH 45/53] build(deps): bump github.com/sashabaranov/go-openai Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.32.4 to 1.32.5. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.32.4...v1.32.5) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d09b1c4..0031d25 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.32.4 + github.com/sashabaranov/go-openai v1.32.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 0c7cba9..b19917e 100644 --- a/go.sum +++ b/go.sum @@ -431,8 +431,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.32.4 h1:blCQWmKA3Z1UNSnPpWiJqPhYKyp3suuGJIObFMQ+cXI= -github.com/sashabaranov/go-openai v1.32.4/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.32.5 h1:/eNVa8KzlE7mJdKPZDj6886MUzZQjoVHyn0sLvIt5qA= +github.com/sashabaranov/go-openai v1.32.5/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 8cfb69caf8aa3b67a9aaa4960267b8d5343f27a0 Mon Sep 17 00:00:00 2001 From: Anthony Hoo Date: Tue, 5 Nov 2024 08:29:00 +0800 Subject: [PATCH 46/53] fix: upgrade requires & golangci-lint --- .github/workflows/lint.yml | 8 ++++---- go.mod | 2 +- go.sum | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d8c861b..77803dd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -9,17 +9,17 @@ jobs: name: Golangci Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: go-version: ^1.23 - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: - version: v1.60 + version: v1.61 args: --issues-exit-code=1 only-new-issues: false skip-pkg-cache: true diff --git a/go.mod b/go.mod index 0031d25..08a65a7 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/google/pprof v0.0.0-20241023014458-598669927662 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/go.sum b/go.sum index b19917e..dd01924 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,9 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= From e87a36e20bbb95f9b18d643444f03e56dade25d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:07:10 +0000 Subject: [PATCH 47/53] build(deps): bump golang.org/x/time from 0.7.0 to 0.8.0 Bumps [golang.org/x/time](https://github.com/golang/time) from 0.7.0 to 0.8.0. - [Commits](https://github.com/golang/time/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: golang.org/x/time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 08a65a7..3554a9f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( golang.org/x/image v0.21.0 golang.org/x/net v0.30.0 golang.org/x/text v0.19.0 - golang.org/x/time v0.7.0 + golang.org/x/time v0.8.0 gopkg.in/telebot.v3 v3.3.8 ) diff --git a/go.sum b/go.sum index dd01924..83e7744 100644 --- a/go.sum +++ b/go.sum @@ -743,8 +743,8 @@ golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 609c726cfb293086d7220a536b890e28f61ce97e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:07:28 +0000 Subject: [PATCH 48/53] build(deps): bump github.com/sashabaranov/go-openai Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.32.5 to 1.35.6. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.32.5...v1.35.6) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 08a65a7..8b357de 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.32.5 + github.com/sashabaranov/go-openai v1.35.6 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index dd01924..35f5dba 100644 --- a/go.sum +++ b/go.sum @@ -432,8 +432,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.32.5 h1:/eNVa8KzlE7mJdKPZDj6886MUzZQjoVHyn0sLvIt5qA= -github.com/sashabaranov/go-openai v1.32.5/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.35.6 h1:oi0rwCvyxMxgFALDGnyqFTyCJm6n72OnEG3sybIFR0g= +github.com/sashabaranov/go-openai v1.35.6/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 8af3ebe42196742807fdbd24d0a911b723c35d85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Nov 2024 07:42:10 +0000 Subject: [PATCH 49/53] build(deps): bump golang.org/x/net from 0.30.0 to 0.31.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.30.0 to 0.31.0. - [Commits](https://github.com/golang/net/compare/v0.30.0...v0.31.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 3554a9f..f9d306d 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,8 @@ require ( github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 golang.org/x/image v0.21.0 - golang.org/x/net v0.30.0 - golang.org/x/text v0.19.0 + golang.org/x/net v0.31.0 + golang.org/x/text v0.20.0 golang.org/x/time v0.8.0 gopkg.in/telebot.v3 v3.3.8 ) @@ -24,7 +24,7 @@ require ( require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect - golang.org/x/sync v0.8.0 // indirect + golang.org/x/sync v0.9.0 // indirect ) require ( @@ -65,10 +65,10 @@ require ( github.com/u2takey/go-utils v0.3.1 // indirect go.uber.org/mock v0.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.28.0 // indirect + golang.org/x/crypto v0.29.0 // indirect golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/sys v0.26.0 // indirect + golang.org/x/sys v0.27.0 // indirect golang.org/x/tools v0.26.0 // indirect google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 83e7744..ce960cc 100644 --- a/go.sum +++ b/go.sum @@ -517,8 +517,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -608,8 +608,8 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -644,8 +644,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220513210516-0976fa681c29/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -725,8 +725,8 @@ golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -738,8 +738,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= From 8d4ca8ec62e40bc69b61643d19339ca43411d657 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 9 Nov 2024 12:27:27 +0000 Subject: [PATCH 50/53] build(deps): bump golang.org/x/image from 0.21.0 to 0.22.0 Bumps [golang.org/x/image](https://github.com/golang/image) from 0.21.0 to 0.22.0. - [Commits](https://github.com/golang/image/compare/v0.21.0...v0.22.0) --- updated-dependencies: - dependency-name: golang.org/x/image dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 9f08cff..c113595 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 - golang.org/x/image v0.21.0 + golang.org/x/image v0.22.0 golang.org/x/net v0.31.0 golang.org/x/text v0.20.0 golang.org/x/time v0.8.0 diff --git a/go.sum b/go.sum index c91608e..1916536 100644 --- a/go.sum +++ b/go.sum @@ -534,8 +534,8 @@ golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.21.0 h1:c5qV36ajHpdj4Qi0GnE0jUc/yuo33OLFaa0d+crTD5s= -golang.org/x/image v0.21.0/go.mod h1:vUbsLavqK/W303ZroQQVKQ+Af3Yl6Uz1Ppu5J/cLz78= +golang.org/x/image v0.22.0 h1:UtK5yLUzilVrkjMAZAZ34DXGpASN8i8pj8g+O+yd10g= +golang.org/x/image v0.22.0/go.mod h1:9hPFhljd4zZ1GNSIZJ49sqbp45GKK9t6w+iXvGqZUz4= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= From 9253f7b422ac6ed2c4d21fca14ff0a2cf00198d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:54:40 +0000 Subject: [PATCH 51/53] build(deps): bump github.com/sashabaranov/go-openai Bumps [github.com/sashabaranov/go-openai](https://github.com/sashabaranov/go-openai) from 1.35.6 to 1.35.7. - [Release notes](https://github.com/sashabaranov/go-openai/releases) - [Commits](https://github.com/sashabaranov/go-openai/compare/v1.35.6...v1.35.7) --- updated-dependencies: - dependency-name: github.com/sashabaranov/go-openai dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c113595..f991b6b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.60.1 github.com/quic-go/quic-go v0.48.1 github.com/redis/go-redis/v9 v9.7.0 - github.com/sashabaranov/go-openai v1.35.6 + github.com/sashabaranov/go-openai v1.35.7 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 github.com/u2takey/ffmpeg-go v0.5.0 diff --git a/go.sum b/go.sum index 1916536..ac7501b 100644 --- a/go.sum +++ b/go.sum @@ -432,8 +432,8 @@ github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6g github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc= github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU= -github.com/sashabaranov/go-openai v1.35.6 h1:oi0rwCvyxMxgFALDGnyqFTyCJm6n72OnEG3sybIFR0g= -github.com/sashabaranov/go-openai v1.35.6/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= +github.com/sashabaranov/go-openai v1.35.7 h1:icyrRbkYoKPa4rbO1WSInpJu3qDQrPEnsoJVZ6QymdI= +github.com/sashabaranov/go-openai v1.35.7/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 8675234b9bf82963999f9c0eedce19bb14c42760 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 19:05:34 +0000 Subject: [PATCH 52/53] build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](https://github.com/stretchr/testify/compare/v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c113595..f637c62 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/redis/go-redis/v9 v9.7.0 github.com/sashabaranov/go-openai v1.35.6 github.com/spf13/viper v1.19.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 github.com/u2takey/ffmpeg-go v0.5.0 go.uber.org/zap v1.27.0 golang.org/x/image v0.22.0 diff --git a/go.sum b/go.sum index 1916536..243661f 100644 --- a/go.sum +++ b/go.sum @@ -468,8 +468,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= From 6dee5cb2b536cbc017454293ba837dec397ab039 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Nov 2024 19:55:43 +0000 Subject: [PATCH 53/53] build(deps): bump github.com/quic-go/quic-go from 0.48.1 to 0.48.2 Bumps [github.com/quic-go/quic-go](https://github.com/quic-go/quic-go) from 0.48.1 to 0.48.2. - [Release notes](https://github.com/quic-go/quic-go/releases) - [Changelog](https://github.com/quic-go/quic-go/blob/master/Changelog.md) - [Commits](https://github.com/quic-go/quic-go/compare/v0.48.1...v0.48.2) --- updated-dependencies: - dependency-name: github.com/quic-go/quic-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 69093f3..7439ad6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/meilisearch/meilisearch-go v0.29.0 github.com/prometheus/client_golang v1.20.5 github.com/prometheus/common v0.60.1 - github.com/quic-go/quic-go v0.48.1 + github.com/quic-go/quic-go v0.48.2 github.com/redis/go-redis/v9 v9.7.0 github.com/sashabaranov/go-openai v1.35.7 github.com/spf13/viper v1.19.0 diff --git a/go.sum b/go.sum index 26e4889..c3c034e 100644 --- a/go.sum +++ b/go.sum @@ -415,8 +415,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= -github.com/quic-go/quic-go v0.48.1 h1:y/8xmfWI9qmGTc+lBr4jKRUWLGSlSigv847ULJ4hYXA= -github.com/quic-go/quic-go v0.48.1/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= +github.com/quic-go/quic-go v0.48.2 h1:wsKXZPeGWpMpCGSWqOcqpW2wZYic/8T3aqiOID0/KWE= +github.com/quic-go/quic-go v0.48.2/go.mod h1:yBgs3rWBOADpga7F+jJsb6Ybg1LSYiQvwWlLX+/6HMs= github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=