From 20040853127c807b29137ee0760399a213a03e73 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 3 Dec 2025 15:24:08 +0200 Subject: [PATCH] connector: fix import ordering --- pkg/connector/backfill.go | 3 +-- pkg/connector/chatinfo.go | 3 +-- pkg/connector/client.go | 9 ++++----- pkg/connector/ids.go | 3 +-- pkg/connector/login.go | 3 +-- pkg/connector/matrixfmt/convert.go | 3 +-- pkg/connector/matrixfmt/html.go | 2 +- pkg/connector/media/transfer.go | 8 +++----- pkg/connector/metadata.go | 3 +-- pkg/connector/push.go | 3 +-- pkg/connector/reactions.go | 3 +-- pkg/connector/startchat.go | 3 +-- pkg/connector/store/scoped_store.go | 3 +-- pkg/connector/sync.go | 3 +-- pkg/connector/telegramfmt/convert.go | 3 +-- pkg/connector/tomatrix.go | 5 ++--- 16 files changed, 22 insertions(+), 38 deletions(-) diff --git a/pkg/connector/backfill.go b/pkg/connector/backfill.go index 1e9f83bb..55eec63e 100644 --- a/pkg/connector/backfill.go +++ b/pkg/connector/backfill.go @@ -28,10 +28,9 @@ import ( "maunium.net/go/mautrix/bridgev2/database" "maunium.net/go/mautrix/bridgev2/networkid" + "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/gotd/tg" "go.mau.fi/mautrix-telegram/pkg/gotd/tgerr" - - "go.mau.fi/mautrix-telegram/pkg/connector/ids" ) var ( diff --git a/pkg/connector/chatinfo.go b/pkg/connector/chatinfo.go index 9646fc17..5e882920 100644 --- a/pkg/connector/chatinfo.go +++ b/pkg/connector/chatinfo.go @@ -30,9 +30,8 @@ import ( "maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/event" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) var ( diff --git a/pkg/connector/client.go b/pkg/connector/client.go index 3ad406af..d54cc5df 100644 --- a/pkg/connector/client.go +++ b/pkg/connector/client.go @@ -41,17 +41,16 @@ import ( "maunium.net/go/mautrix/bridgev2/status" "maunium.net/go/mautrix/id" - "go.mau.fi/mautrix-telegram/pkg/gotd/telegram" - "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/auth" - "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/updates" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/humanise" "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/connector/matrixfmt" "go.mau.fi/mautrix-telegram/pkg/connector/store" "go.mau.fi/mautrix-telegram/pkg/connector/telegramfmt" "go.mau.fi/mautrix-telegram/pkg/connector/util" + "go.mau.fi/mautrix-telegram/pkg/gotd/telegram" + "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/auth" + "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/updates" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) var ( diff --git a/pkg/connector/ids.go b/pkg/connector/ids.go index b99f797b..0213baf0 100644 --- a/pkg/connector/ids.go +++ b/pkg/connector/ids.go @@ -19,9 +19,8 @@ package connector import ( "maunium.net/go/mautrix/bridgev2/networkid" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) func (t *TelegramClient) makePortalKeyFromPeer(peer tg.PeerClass) networkid.PortalKey { diff --git a/pkg/connector/login.go b/pkg/connector/login.go index d889fed4..7c1b0b43 100644 --- a/pkg/connector/login.go +++ b/pkg/connector/login.go @@ -28,10 +28,9 @@ import ( "maunium.net/go/mautrix/bridgev2/database" "maunium.net/go/mautrix/bridgev2/status" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/connector/util" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) const ( diff --git a/pkg/connector/matrixfmt/convert.go b/pkg/connector/matrixfmt/convert.go index 9ef7b77b..18f752c3 100644 --- a/pkg/connector/matrixfmt/convert.go +++ b/pkg/connector/matrixfmt/convert.go @@ -22,10 +22,9 @@ import ( "maunium.net/go/mautrix/event" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/connector/telegramfmt" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) func toTelegramEntity(br telegramfmt.BodyRange) tg.MessageEntityClass { diff --git a/pkg/connector/matrixfmt/html.go b/pkg/connector/matrixfmt/html.go index c1a232a7..360a0433 100644 --- a/pkg/connector/matrixfmt/html.go +++ b/pkg/connector/matrixfmt/html.go @@ -20,10 +20,10 @@ import ( "context" "fmt" "math" + "slices" "strconv" "strings" - "golang.org/x/exp/slices" "golang.org/x/net/html" "maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/event" diff --git a/pkg/connector/media/transfer.go b/pkg/connector/media/transfer.go index c3c1a0f3..adb53c11 100644 --- a/pkg/connector/media/transfer.go +++ b/pkg/connector/media/transfer.go @@ -24,17 +24,15 @@ import ( "net/http" "github.com/rs/zerolog" + "go.mau.fi/util/gnuzip" "maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/downloader" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - - "go.mau.fi/util/gnuzip" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/connector/store" + "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/downloader" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) type dimensionable interface { diff --git a/pkg/connector/metadata.go b/pkg/connector/metadata.go index 394115b3..116f3481 100644 --- a/pkg/connector/metadata.go +++ b/pkg/connector/metadata.go @@ -19,13 +19,12 @@ package connector import ( "context" + "go.mau.fi/util/jsontime" "maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2/database" "maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/id" - "go.mau.fi/util/jsontime" - "go.mau.fi/mautrix-telegram/pkg/gotd/crypto" "go.mau.fi/mautrix-telegram/pkg/gotd/session" ) diff --git a/pkg/connector/push.go b/pkg/connector/push.go index 2be3b482..a8ae396f 100644 --- a/pkg/connector/push.go +++ b/pkg/connector/push.go @@ -33,11 +33,10 @@ import ( "maunium.net/go/mautrix/bridgev2" "maunium.net/go/mautrix/bridgev2/networkid" + "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/gotd/bin" "go.mau.fi/mautrix-telegram/pkg/gotd/crypto" "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - - "go.mau.fi/mautrix-telegram/pkg/connector/ids" ) var ( diff --git a/pkg/connector/reactions.go b/pkg/connector/reactions.go index c3d6a8ac..b1958739 100644 --- a/pkg/connector/reactions.go +++ b/pkg/connector/reactions.go @@ -26,10 +26,9 @@ import ( "maunium.net/go/mautrix/bridgev2/networkid" "maunium.net/go/mautrix/bridgev2/simplevent" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/emojis" "go.mau.fi/mautrix-telegram/pkg/connector/ids" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) func (t *TelegramClient) computeReactionsList(ctx context.Context, peer tg.PeerClass, msgID int, msgReactions tg.MessageReactions) (reactions []tg.MessagePeerReaction, isFull bool, customEmojis map[networkid.EmojiID]emojis.EmojiInfo, err error) { diff --git a/pkg/connector/startchat.go b/pkg/connector/startchat.go index bc3b40ca..f030f9fe 100644 --- a/pkg/connector/startchat.go +++ b/pkg/connector/startchat.go @@ -27,10 +27,9 @@ import ( "go.mau.fi/util/ptr" "maunium.net/go/mautrix/bridgev2" + "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/query/hasher" "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - - "go.mau.fi/mautrix-telegram/pkg/connector/ids" ) var ( diff --git a/pkg/connector/store/scoped_store.go b/pkg/connector/store/scoped_store.go index e1648d07..dcab0c24 100644 --- a/pkg/connector/store/scoped_store.go +++ b/pkg/connector/store/scoped_store.go @@ -25,9 +25,8 @@ import ( "go.mau.fi/util/dbutil" - "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/updates" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" + "go.mau.fi/mautrix-telegram/pkg/gotd/telegram/updates" ) // ScopedStore is a wrapper around a database that implements diff --git a/pkg/connector/sync.go b/pkg/connector/sync.go index 256a6039..de8cfc83 100644 --- a/pkg/connector/sync.go +++ b/pkg/connector/sync.go @@ -30,9 +30,8 @@ import ( "maunium.net/go/mautrix/bridgev2/simplevent" "maunium.net/go/mautrix/event" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) func (t *TelegramClient) SyncChats(ctx context.Context) error { diff --git a/pkg/connector/telegramfmt/convert.go b/pkg/connector/telegramfmt/convert.go index 20a435b3..d2844dcb 100644 --- a/pkg/connector/telegramfmt/convert.go +++ b/pkg/connector/telegramfmt/convert.go @@ -26,10 +26,9 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/connector/emojis" "go.mau.fi/mautrix-telegram/pkg/connector/ids" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" ) type UserInfo struct { diff --git a/pkg/connector/tomatrix.go b/pkg/connector/tomatrix.go index 3f03170c..3ebfcd15 100644 --- a/pkg/connector/tomatrix.go +++ b/pkg/connector/tomatrix.go @@ -34,14 +34,13 @@ import ( "maunium.net/go/mautrix/event" "maunium.net/go/mautrix/id" - "go.mau.fi/mautrix-telegram/pkg/gotd/tg" - "go.mau.fi/mautrix-telegram/pkg/gotd/tgerr" - "go.mau.fi/mautrix-telegram/pkg/connector/ids" "go.mau.fi/mautrix-telegram/pkg/connector/media" "go.mau.fi/mautrix-telegram/pkg/connector/telegramfmt" "go.mau.fi/mautrix-telegram/pkg/connector/util" "go.mau.fi/mautrix-telegram/pkg/connector/waveform" + "go.mau.fi/mautrix-telegram/pkg/gotd/tg" + "go.mau.fi/mautrix-telegram/pkg/gotd/tgerr" ) type spoilable interface {