From 0921168b9149b42f2478e9e7875d5bb0bee1c11f Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 1 Jul 2024 15:55:12 -0600 Subject: [PATCH] pkg/store -> pkg/connector/store Signed-off-by: Sumner Evans --- pkg/connector/connector.go | 2 +- pkg/{ => connector}/store/container.go | 2 +- pkg/{ => connector}/store/scoped_store.go | 0 pkg/{ => connector}/store/telegramfile.go | 4 +++- pkg/{ => connector}/store/upgrades/00-latest.sql | 0 pkg/{ => connector}/store/upgrades/upgrades.go | 0 6 files changed, 5 insertions(+), 3 deletions(-) rename pkg/{ => connector}/store/container.go (95%) rename pkg/{ => connector}/store/scoped_store.go (100%) rename pkg/{ => connector}/store/telegramfile.go (96%) rename pkg/{ => connector}/store/upgrades/00-latest.sql (100%) rename pkg/{ => connector}/store/upgrades/upgrades.go (100%) diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go index af2ff0cd..9275105c 100644 --- a/pkg/connector/connector.go +++ b/pkg/connector/connector.go @@ -25,7 +25,7 @@ import ( "go.mau.fi/util/dbutil" "maunium.net/go/mautrix/bridgev2" - "go.mau.fi/mautrix-telegram/pkg/store" + "go.mau.fi/mautrix-telegram/pkg/connector/store" ) type TelegramConfig struct { diff --git a/pkg/store/container.go b/pkg/connector/store/container.go similarity index 95% rename from pkg/store/container.go rename to pkg/connector/store/container.go index 9494a04e..2bb6611d 100644 --- a/pkg/store/container.go +++ b/pkg/connector/store/container.go @@ -21,7 +21,7 @@ import ( "go.mau.fi/util/dbutil" - "go.mau.fi/mautrix-telegram/pkg/store/upgrades" + "go.mau.fi/mautrix-telegram/pkg/connector/store/upgrades" ) type Container struct { diff --git a/pkg/store/scoped_store.go b/pkg/connector/store/scoped_store.go similarity index 100% rename from pkg/store/scoped_store.go rename to pkg/connector/store/scoped_store.go diff --git a/pkg/store/telegramfile.go b/pkg/connector/store/telegramfile.go similarity index 96% rename from pkg/store/telegramfile.go rename to pkg/connector/store/telegramfile.go index 027c329f..f509fb89 100644 --- a/pkg/store/telegramfile.go +++ b/pkg/connector/store/telegramfile.go @@ -27,10 +27,12 @@ type TelegramFileQuery struct { *dbutil.QueryHelper[*TelegramFile] } +type TelegramFileLocationID string + type TelegramFile struct { qh *dbutil.QueryHelper[*TelegramFile] - LocationID string + LocationID TelegramFileLocationID MXC string MimeType string WasConverted bool diff --git a/pkg/store/upgrades/00-latest.sql b/pkg/connector/store/upgrades/00-latest.sql similarity index 100% rename from pkg/store/upgrades/00-latest.sql rename to pkg/connector/store/upgrades/00-latest.sql diff --git a/pkg/store/upgrades/upgrades.go b/pkg/connector/store/upgrades/upgrades.go similarity index 100% rename from pkg/store/upgrades/upgrades.go rename to pkg/connector/store/upgrades/upgrades.go