From 6bce6fdc6356beb231ba72a812410bcf3d3fd616 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 31 Jan 2025 00:19:01 +0200 Subject: [PATCH] dependencies: update --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- pkg/msgconv/urlpreview.go | 11 ++--------- 3 files changed, 17 insertions(+), 24 deletions(-) diff --git a/go.mod b/go.mod index 289eb8dd..c59d4f7e 100644 --- a/go.mod +++ b/go.mod @@ -9,15 +9,15 @@ require ( github.com/gorilla/websocket v1.5.0 github.com/lib/pq v1.10.9 github.com/rs/zerolog v1.33.0 - go.mau.fi/util v0.8.4 + go.mau.fi/util v0.8.5-0.20250129121406-18c356e558b8 go.mau.fi/webp v0.2.0 - go.mau.fi/whatsmeow v0.0.0-20250104105216-918c879fcd19 + go.mau.fi/whatsmeow v0.0.0-20250130221717-faf72d668860 golang.org/x/image v0.23.0 golang.org/x/net v0.34.0 golang.org/x/sync v0.10.0 - google.golang.org/protobuf v1.36.1 + google.golang.org/protobuf v1.36.4 gopkg.in/yaml.v3 v3.0.1 - maunium.net/go/mautrix v0.23.1-0.20250123130650-2d79ce4eed56 + maunium.net/go/mautrix v0.23.1-0.20250129195205-642e17f2aecb ) require ( @@ -40,7 +40,7 @@ require ( go.mau.fi/libsignal v0.1.1 // indirect go.mau.fi/zeroconfig v0.1.3 // indirect golang.org/x/crypto v0.32.0 // indirect - golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect + golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/go.sum b/go.sum index 4b5fcb24..aeb84b31 100644 --- a/go.sum +++ b/go.sum @@ -66,18 +66,18 @@ github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic= github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= go.mau.fi/libsignal v0.1.1 h1:m/0PGBh4QKP/I1MQ44ti4C0fMbLMuHb95cmDw01FIpI= go.mau.fi/libsignal v0.1.1/go.mod h1:QLs89F/OA3ThdSL2Wz2p+o+fi8uuQUz0e1BRa6ExdBw= -go.mau.fi/util v0.8.4 h1:mVKlJcXWfVo8ZW3f4vqtjGpqtZqJvX4ETekxawt2vnQ= -go.mau.fi/util v0.8.4/go.mod h1:MOfGTs1CBuK6ERTcSL4lb5YU7/ujz09eOPVEDckuazY= +go.mau.fi/util v0.8.5-0.20250129121406-18c356e558b8 h1:O1cRlXPahwbu1ckIf8XgUP3gHMJlSqJxaVTqwRlVK4s= +go.mau.fi/util v0.8.5-0.20250129121406-18c356e558b8/go.mod h1:MOfGTs1CBuK6ERTcSL4lb5YU7/ujz09eOPVEDckuazY= go.mau.fi/webp v0.2.0 h1:QVMenHw7JDb4vall5sV75JNBQj9Hw4u8AKbi1QetHvg= go.mau.fi/webp v0.2.0/go.mod h1:VSg9MyODn12Mb5pyG0NIyNFhujrmoFSsZBs8syOZD1Q= -go.mau.fi/whatsmeow v0.0.0-20250104105216-918c879fcd19 h1:uVS+Zct5fF8rSXV9lfs87zoXdge0JXTzVGNkjmZ61UU= -go.mau.fi/whatsmeow v0.0.0-20250104105216-918c879fcd19/go.mod h1:TLzm2XkwgufONEmiVAsFny+9uBqyEZnUoPrQAfMyuSU= +go.mau.fi/whatsmeow v0.0.0-20250130221717-faf72d668860 h1:jQhAJJGC42rwZ562nz6V9SXBCVz+QhORusd0r9cxiww= +go.mau.fi/whatsmeow v0.0.0-20250130221717-faf72d668860/go.mod h1:PG1x7fBW66I9q/e8a9mU2qF9M94+kK32MceMWgxBoiw= go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM= go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70= golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= -golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= +golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c h1:KL/ZBHXgKGVmuZBZ01Lt57yE5ws8ZPSkkihmEyq7FXc= +golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68= golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY= golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= @@ -91,8 +91,8 @@ golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= -google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM= +google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -102,5 +102,5 @@ 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.23.1-0.20250123130650-2d79ce4eed56 h1:31T/WEOtfzmtF5CD7jeeSys35EZ9jhSkkZ6gB9eOVyU= -maunium.net/go/mautrix v0.23.1-0.20250123130650-2d79ce4eed56/go.mod h1:AGnnaz3ylGikUo1I1MJVn9QLsl2No1/ZNnGDyO0QD5s= +maunium.net/go/mautrix v0.23.1-0.20250129195205-642e17f2aecb h1:YBd62lQxRi6Nqq0EBsH3BhPbftk94ETx4ZGvnXUMyRA= +maunium.net/go/mautrix v0.23.1-0.20250129195205-642e17f2aecb/go.mod h1:ihEeTLlL2RfcNWgx+LPIrXiny+Mxjp1+1M6bSGrA0SM= diff --git a/pkg/msgconv/urlpreview.go b/pkg/msgconv/urlpreview.go index 4165427b..62ac3122 100644 --- a/pkg/msgconv/urlpreview.go +++ b/pkg/msgconv/urlpreview.go @@ -43,14 +43,10 @@ func (mc *MessageConverter) convertURLPreviewToBeeper(ctx context.Context, msg * output := &event.BeeperLinkPreview{ MatchedURL: msg.GetMatchedText(), LinkPreview: event.LinkPreview{ - CanonicalURL: msg.GetCanonicalURL(), - Title: msg.GetTitle(), - Description: msg.GetDescription(), + Title: msg.GetTitle(), + Description: msg.GetDescription(), }, } - if len(output.CanonicalURL) == 0 { - output.CanonicalURL = output.MatchedURL - } var thumbnailData []byte if msg.ThumbnailDirectPath != nil { @@ -128,9 +124,6 @@ func (mc *MessageConverter) convertURLPreviewToWhatsApp(ctx context.Context, con } dest.MatchedText = &preview.MatchedURL - if len(preview.CanonicalURL) > 0 { - dest.CanonicalURL = &preview.CanonicalURL - } if len(preview.Description) > 0 { dest.Description = &preview.Description }