diff --git a/pkg/filekit/io.go b/pkg/filekit/io.go index 82a644f..855d2cc 100644 --- a/pkg/filekit/io.go +++ b/pkg/filekit/io.go @@ -6,7 +6,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex" "git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/proto" "github.com/goccy/go-json" ) diff --git a/pkg/internal/models/attachments.go b/pkg/filekit/models/attachments.go similarity index 100% rename from pkg/internal/models/attachments.go rename to pkg/filekit/models/attachments.go diff --git a/pkg/internal/models/boost.go b/pkg/filekit/models/boost.go similarity index 100% rename from pkg/internal/models/boost.go rename to pkg/filekit/models/boost.go diff --git a/pkg/internal/models/destination.go b/pkg/filekit/models/destination.go similarity index 100% rename from pkg/internal/models/destination.go rename to pkg/filekit/models/destination.go diff --git a/pkg/internal/models/pools.go b/pkg/filekit/models/pools.go similarity index 100% rename from pkg/internal/models/pools.go rename to pkg/filekit/models/pools.go diff --git a/pkg/internal/models/stickers.go b/pkg/filekit/models/stickers.go similarity index 100% rename from pkg/internal/models/stickers.go rename to pkg/filekit/models/stickers.go diff --git a/pkg/internal/database/migrator.go b/pkg/internal/database/migrator.go index 69181c3..9ec57ba 100644 --- a/pkg/internal/database/migrator.go +++ b/pkg/internal/database/migrator.go @@ -1,7 +1,7 @@ package database import ( - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "gorm.io/gorm" ) diff --git a/pkg/internal/fs/downloader.go b/pkg/internal/fs/downloader.go index 569b0d3..9c92554 100644 --- a/pkg/internal/fs/downloader.go +++ b/pkg/internal/fs/downloader.go @@ -7,7 +7,7 @@ import ( "path/filepath" pkg "git.solsynth.dev/hypernet/paperclip/pkg/internal" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" jsoniter "github.com/json-iterator/go" "github.com/minio/minio-go/v7" "github.com/spf13/viper" diff --git a/pkg/internal/fs/merger.go b/pkg/internal/fs/merger.go index 3285b46..4071187 100644 --- a/pkg/internal/fs/merger.go +++ b/pkg/internal/fs/merger.go @@ -7,7 +7,7 @@ import ( "path/filepath" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "github.com/spf13/viper" ) diff --git a/pkg/internal/fs/recycler.go b/pkg/internal/fs/recycler.go index 767a355..7272342 100644 --- a/pkg/internal/fs/recycler.go +++ b/pkg/internal/fs/recycler.go @@ -10,7 +10,7 @@ import ( "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "github.com/samber/lo" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" jsoniter "github.com/json-iterator/go" "github.com/minio/minio-go/v7" "github.com/rs/zerolog/log" diff --git a/pkg/internal/grpc/attachment.go b/pkg/internal/grpc/attachment.go index f1649a5..853c680 100644 --- a/pkg/internal/grpc/attachment.go +++ b/pkg/internal/grpc/attachment.go @@ -5,7 +5,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "git.solsynth.dev/hypernet/paperclip/pkg/proto" "github.com/rs/zerolog/log" diff --git a/pkg/internal/server/api/attachments_api.go b/pkg/internal/server/api/attachments_api.go index 641a6c1..d2542ef 100644 --- a/pkg/internal/server/api/attachments_api.go +++ b/pkg/internal/server/api/attachments_api.go @@ -9,7 +9,7 @@ import ( "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/server/exts" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" ) diff --git a/pkg/internal/server/api/boost_api.go b/pkg/internal/server/api/boost_api.go index 6f13bc8..e369ef1 100644 --- a/pkg/internal/server/api/boost_api.go +++ b/pkg/internal/server/api/boost_api.go @@ -3,7 +3,7 @@ package api import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/server/exts" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" diff --git a/pkg/internal/server/api/destinations_api.go b/pkg/internal/server/api/destinations_api.go index 2a326f8..a2424c6 100644 --- a/pkg/internal/server/api/destinations_api.go +++ b/pkg/internal/server/api/destinations_api.go @@ -1,7 +1,7 @@ package api import ( - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" jsoniter "github.com/json-iterator/go" diff --git a/pkg/internal/server/api/index_api.go b/pkg/internal/server/api/index_api.go index 7c62036..39fa026 100644 --- a/pkg/internal/server/api/index_api.go +++ b/pkg/internal/server/api/index_api.go @@ -10,7 +10,7 @@ import ( "gorm.io/datatypes" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" ) diff --git a/pkg/internal/server/api/pools_api.go b/pkg/internal/server/api/pools_api.go index 58e4e12..7a99f96 100644 --- a/pkg/internal/server/api/pools_api.go +++ b/pkg/internal/server/api/pools_api.go @@ -2,7 +2,7 @@ package api import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/server/exts" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" diff --git a/pkg/internal/server/api/sticker_packs_api.go b/pkg/internal/server/api/sticker_packs_api.go index 76a7977..920f9f5 100644 --- a/pkg/internal/server/api/sticker_packs_api.go +++ b/pkg/internal/server/api/sticker_packs_api.go @@ -4,7 +4,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/gap" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/server/exts" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "git.solsynth.dev/hypernet/passport/pkg/authkit" diff --git a/pkg/internal/server/api/stickers_api.go b/pkg/internal/server/api/stickers_api.go index a3b6688..1e44596 100644 --- a/pkg/internal/server/api/stickers_api.go +++ b/pkg/internal/server/api/stickers_api.go @@ -7,7 +7,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/server/exts" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" diff --git a/pkg/internal/server/api/up_direct_api.go b/pkg/internal/server/api/up_direct_api.go index 890fc53..6b21ea1 100644 --- a/pkg/internal/server/api/up_direct_api.go +++ b/pkg/internal/server/api/up_direct_api.go @@ -5,7 +5,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" jsoniter "github.com/json-iterator/go" diff --git a/pkg/internal/server/api/up_multipart_api.go b/pkg/internal/server/api/up_multipart_api.go index bf8c8c1..6201a06 100644 --- a/pkg/internal/server/api/up_multipart_api.go +++ b/pkg/internal/server/api/up_multipart_api.go @@ -7,7 +7,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/fs" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/server/exts" "git.solsynth.dev/hypernet/paperclip/pkg/internal/services" "github.com/gofiber/fiber/v2" diff --git a/pkg/internal/services/analyzer.go b/pkg/internal/services/analyzer.go index dae1a5a..80674b0 100644 --- a/pkg/internal/services/analyzer.go +++ b/pkg/internal/services/analyzer.go @@ -18,7 +18,7 @@ import ( "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/fs" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" jsoniter "github.com/json-iterator/go" "github.com/k0kubun/go-ansi" "github.com/kettek/apng" diff --git a/pkg/internal/services/attachments.go b/pkg/internal/services/attachments.go index 1849207..5f1f67f 100644 --- a/pkg/internal/services/attachments.go +++ b/pkg/internal/services/attachments.go @@ -15,7 +15,7 @@ import ( "git.solsynth.dev/hypernet/paperclip/pkg/internal/fs" "git.solsynth.dev/hypernet/paperclip/pkg/internal/gap" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "github.com/google/uuid" "gorm.io/gorm" ) diff --git a/pkg/internal/services/boost.go b/pkg/internal/services/boost.go index 2b3dedc..b1618ac 100644 --- a/pkg/internal/services/boost.go +++ b/pkg/internal/services/boost.go @@ -7,7 +7,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/fs" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" jsoniter "github.com/json-iterator/go" "github.com/rs/zerolog/log" "github.com/spf13/cast" diff --git a/pkg/internal/services/cleaner.go b/pkg/internal/services/cleaner.go index 85b53fc..4086e4e 100644 --- a/pkg/internal/services/cleaner.go +++ b/pkg/internal/services/cleaner.go @@ -4,7 +4,7 @@ import ( "time" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "github.com/rs/zerolog/log" ) diff --git a/pkg/internal/services/destinations.go b/pkg/internal/services/destinations.go index 50746df..d688d8b 100644 --- a/pkg/internal/services/destinations.go +++ b/pkg/internal/services/destinations.go @@ -3,7 +3,7 @@ package services import ( "fmt" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" jsoniter "github.com/json-iterator/go" "github.com/rs/zerolog/log" "github.com/spf13/cast" diff --git a/pkg/internal/services/fragments.go b/pkg/internal/services/fragments.go index f4f9f72..34c616d 100644 --- a/pkg/internal/services/fragments.go +++ b/pkg/internal/services/fragments.go @@ -14,7 +14,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/gap" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "github.com/gofiber/fiber/v2" "github.com/google/uuid" jsoniter "github.com/json-iterator/go" diff --git a/pkg/internal/services/opener.go b/pkg/internal/services/opener.go index 190ec97..eb0b144 100644 --- a/pkg/internal/services/opener.go +++ b/pkg/internal/services/opener.go @@ -12,7 +12,7 @@ import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/cachekit" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/gap" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" jsoniter "github.com/json-iterator/go" "github.com/minio/minio-go/v7" "github.com/samber/lo" diff --git a/pkg/internal/services/payment.go b/pkg/internal/services/payment.go index e46b72f..7436f88 100644 --- a/pkg/internal/services/payment.go +++ b/pkg/internal/services/payment.go @@ -6,7 +6,7 @@ import ( "time" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "git.solsynth.dev/hypernet/paperclip/pkg/internal/gap" wproto "git.solsynth.dev/hypernet/wallet/pkg/proto" diff --git a/pkg/internal/services/pools.go b/pkg/internal/services/pools.go index b3c191a..732cbf3 100644 --- a/pkg/internal/services/pools.go +++ b/pkg/internal/services/pools.go @@ -2,7 +2,7 @@ package services import ( "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" ) func ListAttachmentPool() ([]models.AttachmentPool, error) { diff --git a/pkg/internal/services/related.go b/pkg/internal/services/related.go index e32d1cf..9e6a4b5 100644 --- a/pkg/internal/services/related.go +++ b/pkg/internal/services/related.go @@ -5,7 +5,7 @@ import ( "strings" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" ) func SetAttachmentAsThumbnail(item models.Attachment) (models.Attachment, error) { diff --git a/pkg/internal/services/sticker_packs.go b/pkg/internal/services/sticker_packs.go index 6381095..00c053e 100644 --- a/pkg/internal/services/sticker_packs.go +++ b/pkg/internal/services/sticker_packs.go @@ -3,7 +3,7 @@ package services import ( "git.solsynth.dev/hypernet/nexus/pkg/nex/sec" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "gorm.io/gorm" ) diff --git a/pkg/internal/services/stickers.go b/pkg/internal/services/stickers.go index 13271c7..4a9b2c8 100644 --- a/pkg/internal/services/stickers.go +++ b/pkg/internal/services/stickers.go @@ -7,7 +7,7 @@ import ( "gorm.io/gorm" "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "github.com/spf13/viper" ) diff --git a/pkg/internal/services/uploader.go b/pkg/internal/services/uploader.go index 39b68e6..d57c950 100644 --- a/pkg/internal/services/uploader.go +++ b/pkg/internal/services/uploader.go @@ -10,7 +10,7 @@ import ( "git.solsynth.dev/hypernet/paperclip/pkg/internal/database" "git.solsynth.dev/hypernet/paperclip/pkg/internal/fs" - "git.solsynth.dev/hypernet/paperclip/pkg/internal/models" + "git.solsynth.dev/hypernet/paperclip/pkg/filekit/models" "github.com/gofiber/fiber/v2" jsoniter "github.com/json-iterator/go" "github.com/minio/minio-go/v7"