From cd8352a7df447692a44ffd337362149d76e69ca1 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 9 Oct 2020 18:24:23 +0300 Subject: [PATCH] Remove webp conversion --- go.mod | 3 --- go.sum | 5 ----- no-cgo.go | 14 -------------- portal.go | 18 ------------------ webp.go | 14 -------------- 5 files changed, 54 deletions(-) delete mode 100644 no-cgo.go delete mode 100644 webp.go diff --git a/go.mod b/go.mod index dd981b7..a5dfa39 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,12 @@ go 1.14 require ( github.com/Rhymen/go-whatsapp v0.1.0 - github.com/chai2010/webp v1.1.0 github.com/gorilla/websocket v1.4.2 github.com/lib/pq v1.7.0 github.com/mattn/go-sqlite3 v1.14.0 - github.com/pkg/errors v0.8.1 github.com/prometheus/client_golang v1.7.0 github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e - golang.org/x/image v0.0.0-20200618115811-c13761719519 gopkg.in/yaml.v2 v2.3.0 maunium.net/go/mauflag v1.0.0 maunium.net/go/maulogger/v2 v2.1.1 diff --git a/go.sum b/go.sum index ccfc479..f9eac8e 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chai2010/webp v1.1.0 h1:4Ei0/BRroMF9FaXDG2e4OxwFcuW2vcXd+A6tyqTJUQQ= -github.com/chai2010/webp v1.1.0/go.mod h1:LP12PG5IFmLGHUU26tBiCBKnghxx3toZFwDjOYvd3Ow= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -116,7 +114,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= 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-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= @@ -188,7 +185,5 @@ 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/maulogger/v2 v2.1.1 h1:NAZNc6XUFJzgzfewCzVoGkxNAsblLCSSEdtDuIjP0XA= maunium.net/go/maulogger/v2 v2.1.1/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= -maunium.net/go/mautrix v0.7.10 h1:s9LMv0RCZBRJo653VS4xGO3Q/DbCrT2sShvDI7vR/u4= -maunium.net/go/mautrix v0.7.10/go.mod h1:FpsAvwNdG3Zeup7Y2Nlv81Lk0h6iVRPoIy6D7g/7YCE= maunium.net/go/mautrix v0.7.11 h1:3MdKRs8Dt1H8PvKH/6ES1AdooJngBVEGAwLLeVTnouk= maunium.net/go/mautrix v0.7.11/go.mod h1:FpsAvwNdG3Zeup7Y2Nlv81Lk0h6iVRPoIy6D7g/7YCE= diff --git a/no-cgo.go b/no-cgo.go deleted file mode 100644 index d7be10c..0000000 --- a/no-cgo.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build !cgo - -package main - -import ( - "image" - "io" - - "golang.org/x/image/webp" -) - -func decodeWebp(r io.Reader) (image.Image, error) { - return webp.Decode(r) -} diff --git a/portal.go b/portal.go index c6c0aa3..3e1bf42 100644 --- a/portal.go +++ b/portal.go @@ -1437,24 +1437,6 @@ func (portal *Portal) HandleMediaMessage(source *User, msg mediaMessage) { return } - // synapse doesn't handle webp well, so we convert it. This can be dropped once https://github.com/matrix-org/synapse/issues/4382 is fixed - if msg.mimeType == "image/webp" { - img, err := decodeWebp(bytes.NewReader(data)) - if err != nil { - portal.sendMediaBridgeFailure(source, intent, msg.info, fmt.Errorf("failed to decode webp: %w", err)) - return - } - - var buf bytes.Buffer - err = png.Encode(&buf, img) - if err != nil { - portal.sendMediaBridgeFailure(source, intent, msg.info, fmt.Errorf("failed to convert to png: %w", err)) - return - } - data = buf.Bytes() - msg.mimeType = "image/png" - } - var width, height int if strings.HasPrefix(msg.mimeType, "image/") { cfg, _, _ := image.DecodeConfig(bytes.NewReader(data)) diff --git a/webp.go b/webp.go deleted file mode 100644 index 79b5be2..0000000 --- a/webp.go +++ /dev/null @@ -1,14 +0,0 @@ -// +build cgo - -package main - -import ( - "image" - "io" - - "github.com/chai2010/webp" -) - -func decodeWebp(r io.Reader) (image.Image, error) { - return webp.Decode(r) -}