From 15cb6ef44fb5b15e44b430f83383a0e48e4755de Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 8 Jul 2024 08:21:09 -0600 Subject: [PATCH] deps/mautrix: upgrade to latest Signed-off-by: Sumner Evans --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/connector/client.go | 36 +++++++++++++++++++++++++++++------- 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index a283fc7f..23b98720 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( go.mau.fi/util v0.5.1-0.20240702170310-bd1da3c069eb go.mau.fi/zerozap v0.1.1 go.uber.org/zap v1.27.0 - maunium.net/go/mautrix v0.19.0-beta.1.0.20240625211524-f246e7041420 + maunium.net/go/mautrix v0.19.0-beta.1.0.20240706124659-b4057a26c3ed ) require ( @@ -36,7 +36,7 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/sjson v1.2.5 // indirect - github.com/yuin/goldmark v1.7.2 // indirect + github.com/yuin/goldmark v1.7.4 // indirect go.mau.fi/zeroconfig v0.1.2 // indirect go.opentelemetry.io/otel v1.26.0 // indirect go.opentelemetry.io/otel/trace v1.26.0 // indirect diff --git a/go.sum b/go.sum index bbe7b154..af7ef4b7 100644 --- a/go.sum +++ b/go.sum @@ -65,8 +65,8 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/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= -github.com/yuin/goldmark v1.7.2 h1:NjGd7lO7zrUn/A7eKwn5PEOt4ONYGqpxSEeZuduvgxc= -github.com/yuin/goldmark v1.7.2/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= +github.com/yuin/goldmark v1.7.4 h1:BDXOHExt+A7gwPCJgPIIq7ENvceR7we7rOS9TNoLZeg= +github.com/yuin/goldmark v1.7.4/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= go.mau.fi/util v0.5.1-0.20240702170310-bd1da3c069eb h1:VZPo2pvfjNj6fkFv5e9FyTYx96BLwwYNA19WYaY+KN8= go.mau.fi/util v0.5.1-0.20240702170310-bd1da3c069eb/go.mod h1:DsJzUrJAG53lCZnnYvq9/mOyLuPScWwYhvETiTrpdP4= go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto= @@ -108,8 +108,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.19.0-beta.1.0.20240625211524-f246e7041420 h1:aMBQFbp5DFtLI8F23ab2HWhaYGSDmcYhd4sEYcWbHeY= -maunium.net/go/mautrix v0.19.0-beta.1.0.20240625211524-f246e7041420/go.mod h1:pFbqAannSyJnohVycF4NW3IngBLWUt/f9KYfJcwyQec= +maunium.net/go/mautrix v0.19.0-beta.1.0.20240706124659-b4057a26c3ed h1:3F4YHSFaUJ9N0l4zNGeXZvnTBIHC9PDVOWOFiOvNn3Y= +maunium.net/go/mautrix v0.19.0-beta.1.0.20240706124659-b4057a26c3ed/go.mod h1:bNQrvIftiwJ+7OjSh+Gza5xcncq1ooHk6oyDWq4B4sg= 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/client.go b/pkg/connector/client.go index 488950c7..6ec1a36f 100644 --- a/pkg/connector/client.go +++ b/pkg/connector/client.go @@ -298,7 +298,7 @@ func (t *TelegramClient) onUserName(ctx context.Context, e tg.Entities, update * func (t *TelegramClient) onDeleteMessages(ctx context.Context, e tg.Entities, update *tg.UpdateDeleteMessages) error { for _, messageID := range update.Messages { - parts, err := t.main.Bridge.DB.Message.GetAllPartsByID(ctx, ids.MakeMessageID(messageID)) + parts, err := t.main.Bridge.DB.Message.GetAllPartsByID(ctx, ids.MakeUserLoginID(t.loginID), ids.MakeMessageID(messageID)) if err != nil { return err } @@ -344,14 +344,16 @@ func (t *TelegramClient) Disconnect() { t.clientCancel() } -func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Portal) (*bridgev2.PortalInfo, error) { +func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Portal) (*bridgev2.ChatInfo, error) { fmt.Printf("%+v\n", portal) peerType, id, err := ids.ParsePortalID(portal.ID) if err != nil { return nil, err } var name string - var members []networkid.UserID + memberList := &bridgev2.ChatMemberList{ + IsFull: true, // TODO not true for channels + } var isSpace, isDM bool var avatar *bridgev2.Avatar @@ -368,7 +370,21 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta return nil, fmt.Errorf("returned user is not *tg.User") } else { name = util.FormatFullName(user.FirstName, user.LastName) // TODO gate this behind a config? - members = []networkid.UserID{ids.MakeUserID(id), ids.MakeUserID(t.loginID)} + memberList.Members = []bridgev2.ChatMember{ + { + EventSender: bridgev2.EventSender{ + SenderLogin: ids.MakeUserLoginID(id), + Sender: ids.MakeUserID(id), + }, + }, + { + EventSender: bridgev2.EventSender{ + IsFromMe: true, + SenderLogin: ids.MakeUserLoginID(t.loginID), + Sender: ids.MakeUserID(t.loginID), + }, + }, + } isDM = true } case ids.PeerTypeChat: @@ -399,17 +415,23 @@ func (t *TelegramClient) GetChatInfo(ctx context.Context, portal *bridgev2.Porta } for _, user := range fullChat.Users { - members = append(members, ids.MakeUserID(user.GetID())) + memberList.Members = append(memberList.Members, bridgev2.ChatMember{ + EventSender: bridgev2.EventSender{ + IsFromMe: user.GetID() == t.loginID, + SenderLogin: ids.MakeUserLoginID(user.GetID()), + Sender: ids.MakeUserID(user.GetID()), + }, + }) } default: fmt.Printf("%s %d\n", peerType, id) panic("unimplemented getchatinfo") } - return &bridgev2.PortalInfo{ + return &bridgev2.ChatInfo{ Name: &name, Avatar: avatar, - Members: members, + Members: memberList, IsDirectChat: &isDM, IsSpace: &isSpace, }, nil