From f7be90763324b5ad47eb796a9d3653fe2ce3317c Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Tue, 27 Aug 2024 16:51:57 +0300 Subject: [PATCH] matrix: fix making message ID --- go.mod | 2 +- go.sum | 4 ++-- pkg/connector/matrix.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8ae499d4..94344a91 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa golang.org/x/net v0.28.0 - maunium.net/go/mautrix v0.20.1-0.20240827115426-7276f10fcf1e + maunium.net/go/mautrix v0.20.1-0.20240827134950-e3eb2953ddda ) require ( diff --git a/go.sum b/go.sum index c51cfcbd..17a322e2 100644 --- a/go.sum +++ b/go.sum @@ -116,8 +116,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.20240827115426-7276f10fcf1e h1:sCZhAaEKqc7GJ0zmBb4Jg7u7imQdMC71kaGkIR+5B00= -maunium.net/go/mautrix v0.20.1-0.20240827115426-7276f10fcf1e/go.mod h1:7hh/Hx5W9lUcqL0hkSw52kMyY+6nMUPTtdDN0qVEXwI= +maunium.net/go/mautrix v0.20.1-0.20240827134950-e3eb2953ddda h1:3n7LQS2LQFW4uNUeECEUNWCCCaNTygk0CGSE+CZtEqo= +maunium.net/go/mautrix v0.20.1-0.20240827134950-e3eb2953ddda/go.mod h1:7hh/Hx5W9lUcqL0hkSw52kMyY+6nMUPTtdDN0qVEXwI= 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/matrix.go b/pkg/connector/matrix.go index cd7f6fef..bb5c111f 100644 --- a/pkg/connector/matrix.go +++ b/pkg/connector/matrix.go @@ -182,7 +182,7 @@ func (t *TelegramClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2. resp = &bridgev2.MatrixMessageResponse{ DB: &database.Message{ - ID: ids.MakeMessageID(msg.Portal, tgMessageID), + ID: ids.MakeMessageID(msg.Portal.PortalKey, tgMessageID), MXID: msg.Event.ID, Room: msg.Portal.PortalKey, SenderID: t.userID,