From 9609f437d55d8e8aceb28876c597e4cb62a28724 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 1 Oct 2024 10:50:16 -0600 Subject: [PATCH] deps/mautrix: upgrade Signed-off-by: Sumner Evans --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/connector/media/sticker.go | 17 +++++++++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index dd26c09e..e2b0e549 100644 --- a/go.mod +++ b/go.mod @@ -10,12 +10,12 @@ require ( github.com/gotd/td v0.105.0 github.com/rs/zerolog v1.33.0 github.com/stretchr/testify v1.9.0 - go.mau.fi/util v0.7.1-0.20240913102754-33e004cf1e96 + go.mau.fi/util v0.8.1-0.20240927174413-000d30f9a02a go.mau.fi/zerozap v0.1.1 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 golang.org/x/net v0.29.0 - maunium.net/go/mautrix v0.20.1-0.20240914094516-d89dac594db0 + maunium.net/go/mautrix v0.21.1-0.20241001164151-c27b62aa24ed ) require ( diff --git a/go.sum b/go.sum index c79c1a8c..e3e3077c 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg= github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -go.mau.fi/util v0.7.1-0.20240913102754-33e004cf1e96 h1:DQHSHa3wrZMmp/GKxVcdusLWkCalxtERh0Wu2lU0hY4= -go.mau.fi/util v0.7.1-0.20240913102754-33e004cf1e96/go.mod h1:1Ixb8HWoVbl3rT6nAX6nV4iMkzn7KU/KXwE0Rn5RmsQ= +go.mau.fi/util v0.8.1-0.20240927174413-000d30f9a02a h1:4TrWJ0ooHT9YssDBUgXNU8FiR2cwi9jEAjtaVur4f0M= +go.mau.fi/util v0.8.1-0.20240927174413-000d30f9a02a/go.mod h1:1Ixb8HWoVbl3rT6nAX6nV4iMkzn7KU/KXwE0Rn5RmsQ= go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM= go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70= go.mau.fi/zerozap v0.1.1 h1:mxE/dW4wtkqBYOXOEEzXldk5qKB+ahsZXjoTGnvEhZQ= @@ -117,8 +117,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= -maunium.net/go/mautrix v0.20.1-0.20240914094516-d89dac594db0 h1:fTX1P8TPv+oUqHGu08jj6FYH+Q/fC9jtmvkXcAw+KTo= -maunium.net/go/mautrix v0.20.1-0.20240914094516-d89dac594db0/go.mod h1:amzKPIZVO7v1piD2JhKG1RvGZoV+5wEZfoHaEXOjjqA= +maunium.net/go/mautrix v0.21.1-0.20241001164151-c27b62aa24ed h1:rTX22rxzoJAGmeGeyxDDhteksX8RQnH7o9zWIf337a0= +maunium.net/go/mautrix v0.21.1-0.20241001164151-c27b62aa24ed/go.mod h1:qN4yYKm3brOUWN8dlR0KPbKwSBGXQ4am/kzSQt/kLmY= nhooyr.io/websocket v1.8.11 h1:f/qXNc2/3DpoSZkHt1DQu6rj4zGC8JmkkLkWss0MgN0= nhooyr.io/websocket v1.8.11/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= diff --git a/pkg/connector/media/sticker.go b/pkg/connector/media/sticker.go index 069a4f25..3d4fd7ec 100644 --- a/pkg/connector/media/sticker.go +++ b/pkg/connector/media/sticker.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "fmt" + "os" "strconv" "github.com/rs/zerolog" @@ -46,21 +47,29 @@ func (c AnimatedStickerConfig) convert(ctx context.Context, data []byte) Convert } input := bytes.NewBuffer(data) - outputWriter := new(bytes.Buffer) - var thumbnailData []byte + var convertedData, thumbnailData []byte var mimeType, thumbnailMIMEType string var err error switch c.Target { case "png": mimeType = "image/png" + outputWriter := new(bytes.Buffer) err = lottie.Convert(ctx, input, "", outputWriter, c.Target, c.Args.Width, c.Args.Height, "1") + convertedData = outputWriter.Bytes() case "gif": mimeType = "image/gif" + outputWriter := new(bytes.Buffer) err = lottie.Convert(ctx, input, "", outputWriter, c.Target, c.Args.Width, c.Args.Height, strconv.Itoa(c.Args.FPS)) + convertedData = outputWriter.Bytes() case "webm", "webp": thumbnailMIMEType = "image/png" - outputWriter, mimeType, thumbnailData, err = lottie.FfmpegConvert(ctx, input, c.Target, c.Args.Width, c.Args.Height, c.Args.FPS) + mimeType = "image/" + c.Target + thumbnailData, err = lottie.FFmpegConvert(ctx, input, c.Target, c.Args.Width, c.Args.Height, c.Args.FPS) + if err != nil { + break + } + convertedData, err = os.ReadFile(c.Target) default: err = fmt.Errorf("unsupported target format %s", c.Target) } @@ -74,7 +83,7 @@ func (c AnimatedStickerConfig) convert(ctx context.Context, data []byte) Convert } return ConvertedSticker{ - Data: outputWriter.Bytes(), + Data: convertedData, MIMEType: mimeType, ThumbnailData: thumbnailData, ThumbnailMIMEType: thumbnailMIMEType,