fix: Improve edge transparency handling by modifying only the Alpha channel

In our testing, the method of exclusively processing the Alpha channel yielded the best results. This approach focuses on adjusting transparency while preserving the RGB color information, which prevents color distortion and maintains image detail. Key reasons for the improvement include: - Protecting RGB from color alterations, avoiding color seepage and contamination. - Precisely removing unwanted semi-transparency in the Alpha channel, eliminating white edges. - Simplifying the process, reducing complexity, and minimizing risk of introducing new issues. By targeting transparency issues directly in the Alpha channel, we achieve cleaner edges without compromising the image's color quality and detail.
perf: convert static animated WebP to PNG
2025-08-12 19:11:43 +02:00 · 2024-09-15 16:26:58 +08:00 · 2024-09-15 13:21:41 +08:00 · 2024-09-14 23:03:26 +08:00 · 2024-09-14 16:44:32 +08:00 · 2024-07-17 11:18:08 +08:00
14 changed files with 308 additions and 171 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,11 @@
 *.pyc
 __pycache__
 *.egg-info
+build/

 node_modules
 web/lib/import-map.json
+web/packs/*.json

 *.session
 /*.json
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,3 @@
-variables:
-  GOTOOLCHAIN: local
-
 build giphy proxy docker:
  image: docker:stable
  stage: build
--- a/giphyproxy/example-config.yaml
+++ b/giphyproxy/example-config.yaml
@@ -4,18 +4,14 @@
 server_name: giphy.example.com
 # Optionally a custom .well-known response. This defaults to `server_name:443` if empty.
 well_known_response:
+# The proxy will use MSC3860/MSC3916 media download redirects if the requester supports it.
+# Optionally, you can force redirects and not allow proxying at all by setting this to false.
+allow_proxy: false
 # Matrix server signing key to make the federation tester pass, same format as synapse's .signing.key file.
 # You can generate one using `giphyproxy -generate-key`.
 server_key: CHANGE ME
-# Should federation authentication be enforced?
-# If true, requests to the /_matrix/federation/v1/media/download/... endpoint
-# will check the Authorization: X-Matrix header before redirecting.
-federation_auth: false

 # Hostname where the proxy should listen on
 hostname: 0.0.0.0
 # Port where the proxy should listen on
 port: 8008
-
-# Redirect destination. This can be changed to serve a different format.
-destination: https://i.giphy.com/%s.webp
--- a/giphyproxy/go.mod
+++ b/giphyproxy/go.mod
@@ -1,28 +1,24 @@
 module go.mau.fi/stickerpicker/giphyproxy

-go 1.23.0
-
-toolchain go1.24.4
+go 1.22.3

 require (
-	go.mau.fi/util v0.8.8
+	go.mau.fi/util v0.5.0
 	gopkg.in/yaml.v3 v3.0.1
-	maunium.net/go/mautrix v0.24.2-0.20250629161127-7a7d7f70ef92
+	maunium.net/go/mautrix v0.19.0-beta.1.0.20240619092812-451658374280
 )

 require (
-	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/rs/zerolog v1.34.0 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/rs/zerolog v1.33.0 // indirect
+	github.com/tidwall/gjson v1.17.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	golang.org/x/crypto v0.39.0 // indirect
-	golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 // indirect
-	golang.org/x/net v0.41.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.26.0 // indirect
+	golang.org/x/crypto v0.24.0 // indirect
+	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
 )
--- a/giphyproxy/go.sum
+++ b/giphyproxy/go.sum
@@ -1,54 +1,47 @@
-filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
-filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
-github.com/rs/zerolog v1.34.0 h1:k43nTLIwcTVQAncfCw4KZ2VY6ukYoZaBPNOE8txlOeY=
-github.com/rs/zerolog v1.34.0/go.mod h1:bJsvje4Z08ROH4Nhs5iH600c3IkWhwp44iRc54W6wYQ=
-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/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
+github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
+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/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
-github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
+github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
-github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
-go.mau.fi/util v0.8.8 h1:OnuEEc/sIJFhnq4kFggiImUpcmnmL/xpvQMRu5Fiy5c=
-go.mau.fi/util v0.8.8/go.mod h1:Y/kS3loxTEhy8Vill513EtPXr+CRDdae+Xj2BXXMy/c=
-golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
-golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
-golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476 h1:bsqhLWFR6G6xiQcb+JoGqdKdRU6WzPWmK8E0jxTjzo4=
-golang.org/x/exp v0.0.0-20250606033433-dcc06ee1d476/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
-golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
-golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
+go.mau.fi/util v0.5.0 h1:8yELAl+1CDRrwGe9NUmREgVclSs26Z68pTWePHVxuDo=
+go.mau.fi/util v0.5.0/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
+golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 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/mautrix v0.24.2-0.20250629161127-7a7d7f70ef92 h1:j/QuGIVm5/KPlxMgbViphre7shSwnI7LIjNeiLDSnL4=
-maunium.net/go/mautrix v0.24.2-0.20250629161127-7a7d7f70ef92/go.mod h1:Xy6o+pXmbqmgWsUWh15EQ1eozjC+k/VT/7kloByv9PI=
+maunium.net/go/mautrix v0.19.0-beta.1.0.20240619092812-451658374280 h1:+EHJF8h7obPow7kDnsmGoWN+bTCjHGxCKaH99MldZUI=
+maunium.net/go/mautrix v0.19.0-beta.1.0.20240619092812-451658374280/go.mod h1:cxv1w6+syudmEpOewHYIQT9yO7TM5UOWmf6xEBVI4H4=
--- a/giphyproxy/main.go
+++ b/giphyproxy/main.go
@@ -33,14 +33,12 @@ import (
 type Config struct {
 	mediaproxy.BasicConfig  `yaml:",inline"`
 	mediaproxy.ServerConfig `yaml:",inline"`
-	Destination             string `yaml:"destination"`
 }

 var configPath = flag.String("config", "config.yaml", "config file path")
 var generateServerKey = flag.Bool("generate-key", false, "generate a new server key and exit")

 var giphyIDRegex = regexp.MustCompile(`^[a-zA-Z0-9-_]+$`)
-var destination = "https://i.giphy.com/%s.webp"

 func main() {
 	flag.Parse()
@@ -51,15 +49,13 @@ func main() {
 		var cfg Config
 		exerrors.PanicIfNotNil(yaml.Unmarshal(cfgFile, &cfg))
 		mp := exerrors.Must(mediaproxy.NewFromConfig(cfg.BasicConfig, getMedia))
-		mp.KeyServer.Version.Name = "mautrix-go + maunium-stickerpicker giphy proxy"
-		if cfg.Destination != "" {
-			destination = cfg.Destination
-		}
+		mp.KeyServer.Version.Name = "maunium-stickerpicker giphy proxy"
+		mp.ForceProxyLegacyFederation = true
 		exerrors.PanicIfNotNil(mp.Listen(cfg.ServerConfig))
 	}
 }

-func getMedia(_ context.Context, id string, _ map[string]string) (response mediaproxy.GetMediaResponse, err error) {
+func getMedia(_ context.Context, id string) (response mediaproxy.GetMediaResponse, err error) {
 	// This is not related to giphy, but random cats are always fun
 	if id == "cat" {
 		return &mediaproxy.GetMediaResponseURL{
@@ -71,6 +67,6 @@ func getMedia(_ context.Context, id string, _ map[string]string) (response media
 		return nil, mediaproxy.ErrInvalidMediaIDSyntax
 	}
 	return &mediaproxy.GetMediaResponseURL{
-		URL: fmt.Sprintf(destination, id),
+		URL: fmt.Sprintf("https://i.giphy.com/%s.webp", id),
 	}, nil
 }
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ pillow
 telethon
 cryptg
 python-magic
+lottie[all]
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,5 @@ setuptools.setup(
    entry_points={"console_scripts": [
        "sticker-import=sticker.stickerimport:cmd",
        "sticker-pack=sticker.pack:cmd",
-        "sticker-download-thumbnails=sticker.download_thumbnails:cmd",
    ]},
 )
--- a/sticker/download_thumbnails.py
+++ b/sticker/download_thumbnails.py
@@ -1,58 +0,0 @@
-# maunium-stickerpicker - A fast and simple Matrix sticker picker widget.
-# Copyright (C) 2025 Tulir Asokan
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-from pathlib import Path
-from typing import Dict
-import argparse
-import asyncio
-import json
-
-from aiohttp import ClientSession
-from yarl import URL
-
-from .lib import matrix, util
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--config",
-                    help="Path to JSON file with Matrix homeserver and access_token",
-                    type=str, default="config.json", metavar="file")
-parser.add_argument("path", help="Path to the sticker pack JSON file", type=str)
-
-
-async def main(args: argparse.Namespace) -> None:
-    await matrix.load_config(args.config)
-    with util.open_utf8(args.path) as pack_file:
-        pack = json.load(pack_file)
-        print(f"Loaded existing pack meta from {args.path}")
-
-    stickers_data: Dict[str, bytes] = {}
-    async with ClientSession() as sess:
-        for sticker in pack["stickers"]:
-            dl_url = URL(matrix.homeserver_url) / "_matrix/client/v1/media/download" / sticker["url"].removeprefix("mxc://")
-            print("Downloading", sticker["url"])
-            async with sess.get(dl_url, headers={"Authorization": f"Bearer {matrix.access_token}"}) as resp:
-                resp.raise_for_status()
-                stickers_data[sticker["url"]] = await resp.read()
-
-    print("All stickers downloaded, generating thumbnails...")
-    util.add_thumbnails(pack["stickers"], stickers_data, Path(args.path).parent)
-    print("Done!")
-
-def cmd():
-    asyncio.run(main(parser.parse_args()))
-
-
-if __name__ == "__main__":
-    cmd()
--- a/sticker/lib/matrix.py
+++ b/sticker/lib/matrix.py
@@ -59,7 +59,7 @@ async def load_config(path: str) -> None:
        print("Matrix config file not found. Please enter your homeserver and access token.")
        homeserver_url = input("Homeserver URL: ")
        access_token = input("Access token: ")
-        whoami_url = URL(homeserver_url) / "_matrix" / "client" / "v3" / "account" / "whoami"
+        whoami_url = URL(homeserver_url) / "_matrix" / "client" / "r0" / "account" / "whoami"
        if whoami_url.scheme not in ("https", "http"):
            whoami_url = whoami_url.with_scheme("https")
        user_id = await whoami(whoami_url, access_token)
@@ -71,7 +71,7 @@ async def load_config(path: str) -> None:
            }, config_file)
        print(f"Wrote config to {path}")

-    upload_url = URL(homeserver_url) / "_matrix" / "media" / "v3" / "upload"
+    upload_url = URL(homeserver_url) / "_matrix" / "media" / "r0" / "upload"


 async def whoami(url: URL, access_token: str) -> str:
--- a/sticker/lib/util.py
+++ b/sticker/lib/util.py
@@ -15,33 +15,265 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from functools import partial
 from io import BytesIO
+import numpy as np
 import os.path
+import subprocess
 import json
-from pathlib import Path
-from typing import Dict, List
+import tempfile
+import mimetypes

-from PIL import Image
+try:
+    import magic
+except ImportError:
+    print("[Warning] Magic is not installed, using file extensions to guess mime types")
+    magic = None
+from PIL import Image, ImageSequence, ImageFilter

 from . import matrix

 open_utf8 = partial(open, encoding='UTF-8')

-def convert_image(data: bytes, max_w=256, max_h=256) -> (bytes, int, int):
-    image: Image.Image = Image.open(BytesIO(data)).convert("RGBA")
+
+def guess_mime(data: bytes) -> str:
+    mime = None
+    if magic:
+        try:
+            return magic.Magic(mime=True).from_buffer(data)
+        except Exception:
+            pass
+    else:
+        with tempfile.NamedTemporaryFile() as temp:
+            temp.write(data)
+            temp.close()
+            mime, _ = mimetypes.guess_type(temp.name)
+    return mime or "image/png"
+
+
+def _video_to_webp(data: bytes) -> bytes:
+    mime = guess_mime(data)
+    ext = mimetypes.guess_extension(mime)
+    with tempfile.NamedTemporaryFile(suffix=ext) as video:
+        video.write(data)
+        video.flush()
+        with tempfile.NamedTemporaryFile(suffix=".webp") as webp:
+            print(".", end="", flush=True)
+            ffmpeg_encoder_args = []
+            if mime == "video/webm":
+                encode = subprocess.run(["ffprobe", "-v", "error", "-select_streams", "v:0", "-show_entries", "stream=codec_name", "-of", "default=nokey=1:noprint_wrappers=1", video.name], capture_output=True, text=True).stdout.strip()
+                ffmpeg_encoder = None
+                if encode == "vp8":
+                    ffmpeg_encoder = "libvpx"
+                elif encode == "vp9":
+                    ffmpeg_encoder = "libvpx-vp9"
+                if ffmpeg_encoder:
+                    ffmpeg_encoder_args = ["-c:v", ffmpeg_encoder]
+            result = subprocess.run(["ffmpeg", "-y", "-threads", "auto", *ffmpeg_encoder_args, "-i", video.name, "-lossless", "1", webp.name],
+                                    capture_output=True)
+            if result.returncode != 0:
+                raise RuntimeError(f"Run ffmpeg failed with code {result.returncode}, Error occurred:\n{result.stderr}")
+            webp.seek(0)
+            return webp.read()
+
+
+def video_to_webp(data: bytes) -> bytes:
+    mime = guess_mime(data)
+    ext = mimetypes.guess_extension(mime)
+    # run ffmpeg to fix duration
+    with tempfile.NamedTemporaryFile(suffix=ext) as temp:
+        temp.write(data)
+        temp.flush()
+        with tempfile.NamedTemporaryFile(suffix=ext) as temp_fixed:
+            print(".", end="", flush=True)
+            result = subprocess.run(["ffmpeg", "-y", "-threads", "auto", "-i", temp.name, "-codec", "copy", temp_fixed.name],
+                                    capture_output=True)
+            if result.returncode != 0:
+                raise RuntimeError(f"Run ffmpeg failed with code {result.returncode}, Error occurred:\n{result.stderr}")
+            temp_fixed.seek(0)
+            data = temp_fixed.read()
+    return _video_to_webp(data)
+
+
+def process_frame(frame):
+    """
+    Process GIF frame, repair edges, ensure no white or semi-transparent pixels, while keeping color information intact.
+    """
+    frame = frame.convert('RGBA')
+
+    # Decompose Alpha channel
+    alpha = frame.getchannel('A')
+
+    # Process Alpha channel with threshold, remove semi-transparent pixels
+    # Threshold can be adjusted as needed (0-255), 128 is the middle value
+    threshold = 128
+    alpha = alpha.point(lambda x: 255 if x >= threshold else 0)
+
+    # Process Alpha channel with MinFilter, remove edge noise
+    alpha = alpha.filter(ImageFilter.MinFilter(3))
+
+    # Process Alpha channel with MaxFilter, repair edges
+    alpha = alpha.filter(ImageFilter.MaxFilter(3))
+
+    # Apply processed Alpha channel back to image
+    frame.putalpha(alpha)
+
+    return frame
+
+
+def webp_to_others(data: bytes, mimetype: str) -> bytes:
+    with tempfile.NamedTemporaryFile(suffix=".webp") as webp:
+        webp.write(data)
+        webp.flush()
+        ext = mimetypes.guess_extension(mimetype)
+        with tempfile.NamedTemporaryFile(suffix=ext) as img:
+            print(".", end="", flush=True)
+            im = Image.open(webp.name)
+            im.info.pop('background', None)
+
+            if mimetype == "image/gif":
+                frames = []
+                duration = []
+
+                for frame in ImageSequence.Iterator(im):
+                    frame = process_frame(frame)
+                    frames.append(frame)
+                    duration.append(frame.info.get('duration', 100))
+
+                frames[0].save(img.name, save_all=True, lossless=True, quality=100, method=6,
+                               append_images=frames[1:], loop=0, duration=duration, disposal=2)
+            else:
+                im.save(img.name, save_all=True, lossless=True, quality=100, method=6)
+
+            img.seek(0)
+            return img.read()
+
+
+def is_uniform_animated_webp(data: bytes) -> bool:
+    img = Image.open(BytesIO(data))
+    if img.n_frames <= 1:
+        return False
+
+    first_frame = np.array(img)
+    for frame_number in range(1, img.n_frames):
+        img.seek(frame_number)
+        current_frame = np.array(img)
+        if not np.array_equal(first_frame, current_frame):
+            return False
+
+    return True
+
+
+def webp_to_gif_or_png(data: bytes) -> bytes:
+    # check if the webp is animated
+    image: Image.Image = Image.open(BytesIO(data))
+    is_animated = getattr(image, "is_animated", False)
+    if is_animated and not is_uniform_animated_webp(data):
+        return webp_to_others(data, "image/gif")
+    else:
+        # convert to png
+        return webp_to_others(data, "image/png")
+
+
+def opermize_gif(data: bytes) -> bytes:
+    with tempfile.NamedTemporaryFile() as gif:
+        gif.write(data)
+        gif.flush()
+        # use gifsicle to optimize gif
+        result = subprocess.run(["gifsicle", "--batch", "--optimize=3", "--colors=256", gif.name],
+                                capture_output=True)
+        if result.returncode != 0:
+            raise RuntimeError(f"Run gifsicle failed with code {result.returncode}, Error occurred:\n{result.stderr}")
+        gif.seek(0)
+        return gif.read()
+
+
+def _convert_image(data: bytes, mimetype: str) -> (bytes, int, int):
+    image: Image.Image = Image.open(BytesIO(data))
    new_file = BytesIO()
-    image.save(new_file, "png")
-    w, h = image.size
-    if w > max_w or h > max_h:
+    # Determine if the image is a GIF
+    is_animated = getattr(image, "is_animated", False)
+    if is_animated:
+        frames = [frame.convert("RGBA") for frame in ImageSequence.Iterator(image)]
+        # Save the new GIF
+        frames[0].save(
+            new_file,
+            format='GIF',
+            save_all=True,
+            append_images=frames[1:],
+            loop=image.info.get('loop', 0),  # Default loop to 0 if not present
+            duration=image.info.get('duration', 100),  # Set a default duration if not present
+            disposal=image.info.get('disposal', 2)  # Default to disposal method 2 (restore to background)
+        )
+        # Get the size of the first frame to determine resizing
+        w, h = frames[0].size
+    else:
+        suffix = mimetypes.guess_extension(mimetype)
+        if suffix:
+            suffix = suffix[1:]
+        image = image.convert("RGBA")
+        image.save(new_file, format=suffix)
+        w, h = image.size
+    if w > 256 or h > 256:
        # Set the width and height to lower values so clients wouldn't show them as huge images
        if w > h:
-            h = int(h / (w / max_w))
-            w = max_w
+            h = int(h / (w / 256))
+            w = 256
        else:
-            w = int(w / (h / max_h))
-            h = max_h
+            w = int(w / (h / 256))
+            h = 256
    return new_file.getvalue(), w, h


+def _convert_sticker(data: bytes) -> (bytes, str, int, int):
+    mimetype = guess_mime(data)
+    if mimetype.startswith("video/"):
+        data = video_to_webp(data)
+        print(".", end="", flush=True)
+    elif mimetype.startswith("application/gzip"):
+        print(".", end="", flush=True)
+        # unzip file
+        import gzip
+        with gzip.open(BytesIO(data), "rb") as f:
+            data = f.read()
+            mimetype = guess_mime(data)
+            suffix = mimetypes.guess_extension(mimetype)
+            with tempfile.NamedTemporaryFile(suffix=suffix) as temp:
+                temp.write(data)
+                with tempfile.NamedTemporaryFile(suffix=".webp") as gif:
+                    # run lottie_convert.py input output
+                    print(".", end="", flush=True)
+                    import subprocess
+                    cmd = ["lottie_convert.py", temp.name, gif.name]
+                    result = subprocess.run(cmd, capture_output=True, text=True)
+                    retcode = result.returncode
+                    if retcode != 0:
+                        raise RuntimeError(f"Run {cmd} failed with code {retcode}, Error occurred:\n{result.stderr}")
+                    gif.seek(0)
+                    data = gif.read()
+    mimetype = guess_mime(data)
+    if mimetype == "image/webp":
+        data = webp_to_gif_or_png(data)
+        mimetype = guess_mime(data)
+    rlt = _convert_image(data, mimetype)
+    data = rlt[0]
+    if mimetype == "image/gif":
+        print(".", end="", flush=True)
+        data = opermize_gif(data)
+    return data, mimetype, rlt[1], rlt[2]
+
+
+def convert_sticker(data: bytes) -> (bytes, str, int, int):
+    try:
+        return _convert_sticker(data)
+    except Exception as e:
+        mimetype = guess_mime(data)
+        print(f"Error converting image, mimetype: {mimetype}")
+        ext = mimetypes.guess_extension(mimetype)
+        with tempfile.NamedTemporaryFile(delete=False, suffix=ext) as temp:
+            temp.write(data)
+            print(f"Saved to {temp.name}")
+        raise e
+
+
 def add_to_index(name: str, output_dir: str) -> None:
    index_path = os.path.join(output_dir, "index.json")
    try:
@@ -59,7 +291,7 @@ def add_to_index(name: str, output_dir: str) -> None:


 def make_sticker(mxc: str, width: int, height: int, size: int,
-                 body: str = "") -> matrix.StickerInfo:
+                 mimetype: str, body: str = "") -> matrix.StickerInfo:
    return {
        "body": body,
        "url": mxc,
@@ -67,7 +299,7 @@ def make_sticker(mxc: str, width: int, height: int, size: int,
            "w": width,
            "h": height,
            "size": size,
-            "mimetype": "image/png",
+            "mimetype": mimetype,

            # Element iOS compatibility hack
            "thumbnail_url": mxc,
@@ -75,20 +307,8 @@ def make_sticker(mxc: str, width: int, height: int, size: int,
                "w": width,
                "h": height,
                "size": size,
-                "mimetype": "image/png",
+                "mimetype": mimetype,
            },
        },
        "msgtype": "m.sticker",
    }
-
-
-def add_thumbnails(stickers: List[matrix.StickerInfo], stickers_data: Dict[str, bytes], output_dir: str) -> None:
-    thumbnails = Path(output_dir, "thumbnails")
-    thumbnails.mkdir(parents=True, exist_ok=True)
-
-    for sticker in stickers:       
-        image_data, _, _ = convert_image(stickers_data[sticker["url"]], 128, 128)
-        
-        name = sticker["url"].split("/")[-1]
-        thumbnail_path = thumbnails / name
-        thumbnail_path.write_bytes(image_data)
--- a/sticker/pack.py
+++ b/sticker/pack.py
@@ -13,7 +13,6 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-from pathlib import Path
 from typing import Dict, Optional
 from hashlib import sha256
 import mimetypes
@@ -78,11 +77,11 @@ async def upload_sticker(file: str, directory: str, old_stickers: Dict[str, matr
        }
        print(f".. using existing upload")
    else:
-        image_data, width, height = util.convert_image(image_data)
+        image_data, mimetype, width, height = util.convert_sticker(image_data)
        print(".", end="", flush=True)
-        mxc = await matrix.upload(image_data, "image/png", file)
+        mxc = await matrix.upload(image_data, mimetype, file)
        print(".", end="", flush=True)
-        sticker = util.make_sticker(mxc, width, height, len(image_data), name)
+        sticker = util.make_sticker(mxc, width, height, len(image_data), mimetype, name)
        sticker["id"] = sticker_id
        print(" uploaded", flush=True)
    return sticker
@@ -108,11 +107,9 @@ async def main(args: argparse.Namespace) -> None:
        old_stickers = {sticker["id"]: sticker for sticker in pack["stickers"]}
        pack["stickers"] = []

-    stickers_data: Dict[str, bytes] = {}
    for file in sorted(os.listdir(args.path)):
        sticker = await upload_sticker(file, args.path, old_stickers=old_stickers)
        if sticker:
-            stickers_data[sticker["url"]]  = Path(args.path, file).read_bytes()
            pack["stickers"].append(sticker)

    with util.open_utf8(meta_path, "w") as pack_file:
@@ -125,8 +122,6 @@ async def main(args: argparse.Namespace) -> None:
        with util.open_utf8(picker_pack_path, "w") as pack_file:
            json.dump(pack, pack_file)
        print(f"Copied pack to {picker_pack_path}")
-
-        util.add_thumbnails(pack["stickers"], stickers_data, args.add_to_index)
        util.add_to_index(picker_file_name, args.add_to_index)


@@ -143,7 +138,7 @@ parser.add_argument("path", help="Path to the sticker pack directory", type=str)


 def cmd():
-    asyncio.run(main(parser.parse_args()))
+    asyncio.get_event_loop().run_until_complete(main(parser.parse_args()))


 if __name__ == "__main__":
--- a/sticker/stickerimport.py
+++ b/sticker/stickerimport.py
@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-from typing import Dict, Tuple
+from typing import Dict
 import argparse
 import asyncio
 import os.path
@@ -29,15 +29,15 @@ from telethon.tl.types.messages import StickerSet as StickerSetFull
 from .lib import matrix, util


-async def reupload_document(client: TelegramClient, document: Document) -> Tuple[matrix.StickerInfo, bytes]:
+async def reupload_document(client: TelegramClient, document: Document) -> matrix.StickerInfo:
    print(f"Reuploading {document.id}", end="", flush=True)
    data = await client.download_media(document, file=bytes)
    print(".", end="", flush=True)
-    data, width, height = util.convert_image(data)
+    data, mimetype, width, height = util.convert_sticker(data)
    print(".", end="", flush=True)
-    mxc = await matrix.upload(data, "image/png", f"{document.id}.png")
+    mxc = await matrix.upload(data, mimetype, f"{document.id}.png")
    print(".", flush=True)
-    return util.make_sticker(mxc, width, height, len(data)), data
+    return util.make_sticker(mxc, width, height, len(data), mimetype)


 def add_meta(document: Document, info: matrix.StickerInfo, pack: StickerSetFull) -> None:
@@ -75,17 +75,15 @@ async def reupload_pack(client: TelegramClient, pack: StickerSetFull, output_dir
    except FileNotFoundError:
        pass

-    stickers_data: Dict[str, bytes] = {}
    reuploaded_documents: Dict[int, matrix.StickerInfo] = {}
    for document in pack.documents:
        try:
            reuploaded_documents[document.id] = already_uploaded[document.id]
            print(f"Skipped reuploading {document.id}")
        except KeyError:
-            reuploaded_documents[document.id], data = await reupload_document(client, document)
+            reuploaded_documents[document.id] = await reupload_document(client, document)
        # Always ensure the body and telegram metadata is correct
        add_meta(document, reuploaded_documents[document.id], pack)
-        stickers_data[reuploaded_documents[document.id]["url"]] = data

    for sticker in pack.packs:
        if not sticker.emoticon:
@@ -109,7 +107,6 @@ async def reupload_pack(client: TelegramClient, pack: StickerSetFull, output_dir
        }, pack_file, ensure_ascii=False)
    print(f"Saved {pack.set.title} as {pack.set.short_name}.json")

-    util.add_thumbnails(list(reuploaded_documents.values()), stickers_data, output_dir)
    util.add_to_index(os.path.basename(pack_path), output_dir)


@@ -161,7 +158,7 @@ async def main(args: argparse.Namespace) -> None:


 def cmd() -> None:
-    asyncio.run(main(parser.parse_args()))
+    asyncio.get_event_loop().run_until_complete(main(parser.parse_args()))


 if __name__ == "__main__":
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -29,8 +29,10 @@ const params = new URLSearchParams(document.location.search)
 if (params.has('config')) {
 	INDEX = params.get("config")
 }
+// This is updated from packs/index.json
+let HOMESERVER_URL = "https://matrix-client.matrix.org"

-const makeThumbnailURL = mxc => `${PACKS_BASE_URL}/thumbnails/${mxc.split("/").slice(-1)[0]}`
+const makeThumbnailURL = mxc => `${HOMESERVER_URL}/_matrix/media/v3/thumbnail/${mxc.slice(6)}?height=128&width=128&method=scale`

 // We need to detect iOS webkit because it has a bug related to scrolling non-fixed divs
 // This is also used to fix scrolling to sections on Element iOS
@@ -163,6 +165,7 @@ class App extends Component {
 				return
 			}
 			const indexData = await indexRes.json()
+			HOMESERVER_URL = indexData.homeserver_url || HOMESERVER_URL
 			if (indexData.giphy_api_key !== undefined) {
 				setGiphyAPIKey(indexData.giphy_api_key, indexData.giphy_mxc_prefix)
 			}
Author	SHA1	Message	Date
xz-dev	86cb2edcfa	fix: Improve edge transparency handling by modifying only the Alpha channel In our testing, the method of exclusively processing the Alpha channel yielded the best results. This approach focuses on adjusting transparency while preserving the RGB color information, which prevents color distortion and maintains image detail. Key reasons for the improvement include: - Protecting RGB from color alterations, avoiding color seepage and contamination. - Precisely removing unwanted semi-transparency in the Alpha channel, eliminating white edges. - Simplifying the process, reducing complexity, and minimizing risk of introducing new issues. By targeting transparency issues directly in the Alpha channel, we achieve cleaner edges without compromising the image's color quality and detail.	2024-09-15 16:26:58 +08:00
xz-dev	a0ef9f84be	perf: convert static animated WebP to PNG	2024-09-15 13:21:41 +08:00
xz-dev	a83bc15208	fix: keep webm transparency	2024-09-14 23:03:26 +08:00
xz-dev	8ce5be04fb	perf: ignore imported resources	2024-09-14 16:44:32 +08:00
xz-dev	47a98ba81b	perf: optimize gif via gifsicle	2024-07-17 11:18:08 +08:00
xz-dev	e38090e952	fix: fix webm duration via ffmpeg	2024-07-17 11:18:08 +08:00
xz-dev	a6b8c09379	fix: support animated sticker convert(RGBA)	2024-07-17 11:18:08 +08:00
xz-dev	be477874e3	feat: support animated(lottie) sticker	2024-07-17 11:18:08 +08:00
xz-dev	715f62af58	feat: support animated(webm) sticker	2024-07-17 11:18:02 +08:00