From 0da121aebb309326abc9fa3d94f143f70e523f9b Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 8 Dec 2025 00:20:06 +0200 Subject: [PATCH] ids: fix reaction ids --- go.mod | 2 +- go.sum | 4 ++-- pkg/connector/ids/ids.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 6ea66032..edfebec9 100644 --- a/go.mod +++ b/go.mod @@ -41,7 +41,7 @@ require ( golang.org/x/sync v0.18.0 golang.org/x/tools v0.39.0 gopkg.in/yaml.v3 v3.0.1 - maunium.net/go/mautrix v0.26.1-0.20251207175222-00c58efc5906 + maunium.net/go/mautrix v0.26.1-0.20251207220725-315d2ab17d33 rsc.io/qr v0.2.0 ) diff --git a/go.sum b/go.sum index 25be22f4..aab658b8 100644 --- a/go.sum +++ b/go.sum @@ -237,7 +237,7 @@ 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.26.1-0.20251207175222-00c58efc5906 h1:5Y4XfVK3QRi/LIPO0yb0oBoEiba3NAh3ayUmP1byzUY= -maunium.net/go/mautrix v0.26.1-0.20251207175222-00c58efc5906/go.mod h1:pzwIT42s+BhBjEYovmcOt69VlNW2RkJ6pCyZjYQHKIc= +maunium.net/go/mautrix v0.26.1-0.20251207220725-315d2ab17d33 h1:VpcanSWAm0bOl9bYbh/eFAiTt5L4aB0toBPIW24TIYI= +maunium.net/go/mautrix v0.26.1-0.20251207220725-315d2ab17d33/go.mod h1:pzwIT42s+BhBjEYovmcOt69VlNW2RkJ6pCyZjYQHKIc= rsc.io/qr v0.2.0 h1:6vBLea5/NRMVTz8V66gipeLycZMl/+UlFmk8DvqQ6WY= rsc.io/qr v0.2.0/go.mod h1:IF+uZjkb9fqyeF/4tlBoynqmQxUoPfWEKh921coOuXs= diff --git a/pkg/connector/ids/ids.go b/pkg/connector/ids/ids.go index ac59ab15..3e5424e2 100644 --- a/pkg/connector/ids/ids.go +++ b/pkg/connector/ids/ids.go @@ -21,6 +21,7 @@ import ( "strconv" "strings" + "go.mau.fi/util/variationselector" "maunium.net/go/mautrix/bridgev2/networkid" "go.mau.fi/mautrix-telegram/pkg/gotd/tg" @@ -221,7 +222,7 @@ func MakeEmojiIDFromDocumentID(documentID int64) networkid.EmojiID { } func MakeEmojiIDFromEmoticon(emoji string) networkid.EmojiID { - return networkid.EmojiID(emoji) + return networkid.EmojiID(variationselector.Remove(emoji)) } func isNumbers(s string) bool {