From bebd5156f20162ce7a651fb5619051e0bfb93afe Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Sun, 8 Jun 2025 23:27:29 +0530 Subject: [PATCH] [server] Rename module --- server/cmd/phylum.go | 2 +- server/go.mod | 2 +- .../internal/api/authenticator/authenticator.go | 2 +- server/internal/api/publink/publink.go | 4 ++-- server/internal/api/serve/serve.go | 4 ++-- server/internal/api/v1/api.go | 14 +++++++------- server/internal/api/v1/auth/routes.go | 10 +++++----- server/internal/api/v1/fs/contents.go | 6 +++--- server/internal/api/v1/fs/copy.go | 6 +++--- server/internal/api/v1/fs/delete.go | 4 ++-- server/internal/api/v1/fs/info.go | 4 ++-- server/internal/api/v1/fs/mkdir.go | 6 +++--- server/internal/api/v1/fs/move.go | 6 +++--- server/internal/api/v1/fs/routes.go | 2 +- server/internal/api/v1/fs/search.go | 6 +++--- server/internal/api/v1/fs/share.go | 6 +++--- server/internal/api/v1/fs/storage.go | 2 +- server/internal/api/v1/fs/upload.go | 6 +++--- server/internal/api/v1/my/bookmarks.go | 6 +++--- server/internal/api/v1/my/bootstrap.go | 8 ++++---- server/internal/api/v1/my/details.go | 8 ++++---- server/internal/api/v1/my/routes.go | 6 +++--- server/internal/api/v1/publinks/create.go | 2 +- server/internal/api/v1/publinks/routes.go | 2 +- server/internal/api/v1/responses/helpers.go | 2 +- server/internal/api/v1/responses/responses.go | 2 +- server/internal/api/v1/trash/routes.go | 6 +++--- server/internal/api/v1/users/invite.go | 8 ++++---- server/internal/api/v1/users/users.go | 4 ++-- server/internal/api/webdav/handler.go | 4 ++-- server/internal/api/webdav/impl/copy_move.go | 2 +- server/internal/api/webdav/impl/prop.go | 2 +- server/internal/api/webdav/impl/webdav.go | 4 ++-- server/internal/api/webdav/impl/xml.go | 2 +- server/internal/api/webdav/impl/xml_test.go | 2 +- server/internal/command/admin/cmd.go | 6 +++--- server/internal/command/admin/schema/cmd.go | 2 +- server/internal/command/admin/storage/cmd.go | 4 ++-- server/internal/command/admin/user/cmd.go | 2 +- server/internal/command/admin/user/invite.go | 6 +++--- server/internal/command/admin/user/mod.go | 4 ++-- server/internal/command/admin/user/passwd.go | 2 +- .../internal/command/admin/user/permissions.go | 2 +- server/internal/command/admin/user/pwreset.go | 4 ++-- server/internal/command/command.go | 16 ++++++++-------- server/internal/command/common/common.go | 4 ++-- server/internal/command/common/format.go | 2 +- server/internal/command/config.go | 12 ++++++------ server/internal/command/fs/cat.go | 2 +- server/internal/command/fs/cmd.go | 4 ++-- server/internal/command/fs/cp.go | 4 ++-- server/internal/command/fs/import.go | 4 ++-- server/internal/command/fs/ls.go | 2 +- server/internal/command/fs/mkdir.go | 4 ++-- server/internal/command/fs/mv.go | 4 ++-- server/internal/command/fs/publink/create.go | 4 ++-- server/internal/command/fs/publink/list.go | 2 +- server/internal/command/fs/rm.go | 2 +- server/internal/command/fs/search.go | 2 +- server/internal/command/fs/setfacl.go | 4 ++-- server/internal/command/fs/trash/delete.go | 2 +- server/internal/command/fs/trash/empty.go | 2 +- server/internal/command/fs/trash/list.go | 2 +- server/internal/command/fs/trash/restore.go | 2 +- server/internal/command/fs/trash/summary.go | 4 ++-- server/internal/command/serve/cmd.go | 12 ++++++------ server/internal/command/serve/engine.go | 2 +- server/internal/command/user/bookmarks/cmd.go | 4 ++-- server/internal/command/user/cmd.go | 2 +- server/internal/core/core.go | 2 +- server/internal/core/filesystem.go | 2 +- server/internal/core/filesystem_readonly.go | 4 ++-- server/internal/core/resource_create.go | 2 +- server/internal/core/resource_delete.go | 2 +- server/internal/core/resource_open.go | 4 ++-- server/internal/core/resource_publink.go | 2 +- server/internal/core/trash.go | 4 ++-- server/internal/core/user_auth.go | 6 +++--- server/internal/core/user_manager.go | 2 +- server/internal/core/user_update.go | 2 +- server/internal/core/version.go | 2 +- server/internal/db/db.go | 2 +- server/internal/db/schema.go | 2 +- server/internal/jobs/delete.go | 4 ++-- server/internal/jobs/migrate.go | 4 ++-- server/internal/mail/mail.go | 2 +- server/internal/mail/password_reset.go | 2 +- server/internal/mail/welcome.go | 2 +- server/internal/storage/storage.go | 2 +- 89 files changed, 176 insertions(+), 176 deletions(-) diff --git a/server/cmd/phylum.go b/server/cmd/phylum.go index eb4c9fdf..9d63295e 100644 --- a/server/cmd/phylum.go +++ b/server/cmd/phylum.go @@ -1,7 +1,7 @@ package main import ( - "github.com/shroff/phylum/server/internal/command" + "codeberg.org/shroff/phylum/server/internal/command" ) func main() { diff --git a/server/go.mod b/server/go.mod index 89b1fef7..4664bb15 100644 --- a/server/go.mod +++ b/server/go.mod @@ -1,4 +1,4 @@ -module github.com/shroff/phylum/server +module codeberg.org/shroff/phylum/server go 1.23.0 diff --git a/server/internal/api/authenticator/authenticator.go b/server/internal/api/authenticator/authenticator.go index 585b461f..c7eb7fc1 100644 --- a/server/internal/api/authenticator/authenticator.go +++ b/server/internal/api/authenticator/authenticator.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/core" ) var errAuthRequired = core.NewError(http.StatusUnauthorized, "auth_required", "authorization required") diff --git a/server/internal/api/publink/publink.go b/server/internal/api/publink/publink.go index acbf26fa..24219561 100644 --- a/server/internal/api/publink/publink.go +++ b/server/internal/api/publink/publink.go @@ -4,9 +4,9 @@ import ( "errors" "net/http" + "codeberg.org/shroff/phylum/server/internal/api/serve" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/serve" - "github.com/shroff/phylum/server/internal/core" ) func Setup(r *gin.RouterGroup) { diff --git a/server/internal/api/serve/serve.go b/server/internal/api/serve/serve.go index 7ad0a0c6..6b2845d7 100644 --- a/server/internal/api/serve/serve.go +++ b/server/internal/api/serve/serve.go @@ -12,9 +12,9 @@ import ( "strings" "time" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/storage" ) var htmlReplacer = strings.NewReplacer( diff --git a/server/internal/api/v1/api.go b/server/internal/api/v1/api.go index 8231e027..690aaa9d 100644 --- a/server/internal/api/v1/api.go +++ b/server/internal/api/v1/api.go @@ -1,14 +1,14 @@ package apiv1 import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/auth" + "codeberg.org/shroff/phylum/server/internal/api/v1/fs" + "codeberg.org/shroff/phylum/server/internal/api/v1/my" + "codeberg.org/shroff/phylum/server/internal/api/v1/publinks" + "codeberg.org/shroff/phylum/server/internal/api/v1/trash" + "codeberg.org/shroff/phylum/server/internal/api/v1/users" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/auth" - "github.com/shroff/phylum/server/internal/api/v1/fs" - "github.com/shroff/phylum/server/internal/api/v1/my" - "github.com/shroff/phylum/server/internal/api/v1/publinks" - "github.com/shroff/phylum/server/internal/api/v1/trash" - "github.com/shroff/phylum/server/internal/api/v1/users" ) func Setup(r *gin.RouterGroup) { diff --git a/server/internal/api/v1/auth/routes.go b/server/internal/api/v1/auth/routes.go index 28a94c60..a3710b1d 100644 --- a/server/internal/api/v1/auth/routes.go +++ b/server/internal/api/v1/auth/routes.go @@ -4,12 +4,12 @@ import ( "errors" "net/http" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/my" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/mail" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/my" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/mail" ) type passwordParams struct { diff --git a/server/internal/api/v1/fs/contents.go b/server/internal/api/v1/fs/contents.go index 91b9c113..2d0256da 100644 --- a/server/internal/api/v1/fs/contents.go +++ b/server/internal/api/v1/fs/contents.go @@ -5,11 +5,11 @@ import ( "io" "net/http" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/serve" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/serve" - "github.com/shroff/phylum/server/internal/core" ) var errGetCollectionContents = core.NewError(http.StatusBadRequest, "resource_is_collection", "Cannot get contents of collection") diff --git a/server/internal/api/v1/fs/copy.go b/server/internal/api/v1/fs/copy.go index a77bd4ac..51c32f52 100644 --- a/server/internal/api/v1/fs/copy.go +++ b/server/internal/api/v1/fs/copy.go @@ -1,11 +1,11 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type copyParams struct { diff --git a/server/internal/api/v1/fs/delete.go b/server/internal/api/v1/fs/delete.go index 312be0fb..d4443bdf 100644 --- a/server/internal/api/v1/fs/delete.go +++ b/server/internal/api/v1/fs/delete.go @@ -1,9 +1,9 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" ) type deleteParams struct { diff --git a/server/internal/api/v1/fs/info.go b/server/internal/api/v1/fs/info.go index 1faa2df4..b367711d 100644 --- a/server/internal/api/v1/fs/info.go +++ b/server/internal/api/v1/fs/info.go @@ -1,9 +1,9 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" ) func handleInfoRequest(c *gin.Context) { diff --git a/server/internal/api/v1/fs/mkdir.go b/server/internal/api/v1/fs/mkdir.go index 6afd4fce..5ee615d3 100644 --- a/server/internal/api/v1/fs/mkdir.go +++ b/server/internal/api/v1/fs/mkdir.go @@ -1,11 +1,11 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type mkdirParams struct { diff --git a/server/internal/api/v1/fs/move.go b/server/internal/api/v1/fs/move.go index 903fdcbb..eda856b8 100644 --- a/server/internal/api/v1/fs/move.go +++ b/server/internal/api/v1/fs/move.go @@ -1,10 +1,10 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type moveParams struct { diff --git a/server/internal/api/v1/fs/routes.go b/server/internal/api/v1/fs/routes.go index 424945e4..765bbc15 100644 --- a/server/internal/api/v1/fs/routes.go +++ b/server/internal/api/v1/fs/routes.go @@ -3,8 +3,8 @@ package fs import ( "net/http" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/core" ) var ( diff --git a/server/internal/api/v1/fs/search.go b/server/internal/api/v1/fs/search.go index 2dc0eea3..dd8f138f 100644 --- a/server/internal/api/v1/fs/search.go +++ b/server/internal/api/v1/fs/search.go @@ -3,10 +3,10 @@ package fs import ( "net/http" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) var errSearchQueryEmpty = core.NewError(http.StatusBadRequest, "search_query_empty", "Empty Search Query") diff --git a/server/internal/api/v1/fs/share.go b/server/internal/api/v1/fs/share.go index 71dd3306..bdc17377 100644 --- a/server/internal/api/v1/fs/share.go +++ b/server/internal/api/v1/fs/share.go @@ -1,10 +1,10 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type shareParams struct { diff --git a/server/internal/api/v1/fs/storage.go b/server/internal/api/v1/fs/storage.go index 79166ec1..a24d6acb 100644 --- a/server/internal/api/v1/fs/storage.go +++ b/server/internal/api/v1/fs/storage.go @@ -1,8 +1,8 @@ package fs import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" ) type DiskUsageResponse struct { diff --git a/server/internal/api/v1/fs/upload.go b/server/internal/api/v1/fs/upload.go index dd920332..8f994401 100644 --- a/server/internal/api/v1/fs/upload.go +++ b/server/internal/api/v1/fs/upload.go @@ -4,11 +4,11 @@ import ( "io" "net/http" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type uploadParams struct { diff --git a/server/internal/api/v1/my/bookmarks.go b/server/internal/api/v1/my/bookmarks.go index c0f79a48..75c4a552 100644 --- a/server/internal/api/v1/my/bookmarks.go +++ b/server/internal/api/v1/my/bookmarks.go @@ -6,11 +6,11 @@ import ( "strconv" "time" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type bookmarksResponse struct { diff --git a/server/internal/api/v1/my/bootstrap.go b/server/internal/api/v1/my/bootstrap.go index 35713f3a..380db625 100644 --- a/server/internal/api/v1/my/bootstrap.go +++ b/server/internal/api/v1/my/bootstrap.go @@ -6,11 +6,11 @@ import ( "strconv" "time" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/api/v1/users" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/api/v1/users" - "github.com/shroff/phylum/server/internal/core" ) func handleBootstrapRoute(c *gin.Context) { diff --git a/server/internal/api/v1/my/details.go b/server/internal/api/v1/my/details.go index 4e287b91..2b9bac14 100644 --- a/server/internal/api/v1/my/details.go +++ b/server/internal/api/v1/my/details.go @@ -1,11 +1,11 @@ package my import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/db" ) type detailsParams struct { diff --git a/server/internal/api/v1/my/routes.go b/server/internal/api/v1/my/routes.go index 838d3b51..e8697161 100644 --- a/server/internal/api/v1/my/routes.go +++ b/server/internal/api/v1/my/routes.go @@ -1,10 +1,10 @@ package my import ( + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) type homeResponse struct { diff --git a/server/internal/api/v1/publinks/create.go b/server/internal/api/v1/publinks/create.go index ef41f2c5..ce8b54e5 100644 --- a/server/internal/api/v1/publinks/create.go +++ b/server/internal/api/v1/publinks/create.go @@ -3,9 +3,9 @@ package publinks import ( "time" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" "github.com/gin-gonic/gin" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/api/authenticator" ) type createParams struct { diff --git a/server/internal/api/v1/publinks/routes.go b/server/internal/api/v1/publinks/routes.go index 2efda67b..f5cc8c75 100644 --- a/server/internal/api/v1/publinks/routes.go +++ b/server/internal/api/v1/publinks/routes.go @@ -3,8 +3,8 @@ package publinks import ( "net/http" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/core" ) var ( diff --git a/server/internal/api/v1/responses/helpers.go b/server/internal/api/v1/responses/helpers.go index 75568184..7fc99bc0 100644 --- a/server/internal/api/v1/responses/helpers.go +++ b/server/internal/api/v1/responses/helpers.go @@ -1,6 +1,6 @@ package responses -import "github.com/shroff/phylum/server/internal/core" +import "codeberg.org/shroff/phylum/server/internal/core" func FullResourceFromFS(f core.FileSystem, r core.Resource) ResourceFull { response := ResourceFull{ diff --git a/server/internal/api/v1/responses/responses.go b/server/internal/api/v1/responses/responses.go index 304c7735..6c650b21 100644 --- a/server/internal/api/v1/responses/responses.go +++ b/server/internal/api/v1/responses/responses.go @@ -4,9 +4,9 @@ import ( "encoding/json" "time" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/core" ) type Ancestor struct { diff --git a/server/internal/api/v1/trash/routes.go b/server/internal/api/v1/trash/routes.go index cd808174..4f7ef141 100644 --- a/server/internal/api/v1/trash/routes.go +++ b/server/internal/api/v1/trash/routes.go @@ -3,11 +3,11 @@ package trash import ( "net/http" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) const trashListLength = 100 diff --git a/server/internal/api/v1/users/invite.go b/server/internal/api/v1/users/invite.go index 76998b11..88710181 100644 --- a/server/internal/api/v1/users/invite.go +++ b/server/internal/api/v1/users/invite.go @@ -3,11 +3,11 @@ package users import ( "net/http" + "codeberg.org/shroff/phylum/server/internal/api/authenticator" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/mail" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/authenticator" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/mail" ) type inviteParams struct { diff --git a/server/internal/api/v1/users/users.go b/server/internal/api/v1/users/users.go index 05ef9283..f89ed55a 100644 --- a/server/internal/api/v1/users/users.go +++ b/server/internal/api/v1/users/users.go @@ -5,9 +5,9 @@ import ( "net/http" "strconv" + "codeberg.org/shroff/phylum/server/internal/api/v1/responses" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/v1/responses" - "github.com/shroff/phylum/server/internal/core" ) var errInvalidParams = core.NewError(http.StatusBadRequest, "invalid_parameters", "Invalid Request Parameters") diff --git a/server/internal/api/webdav/handler.go b/server/internal/api/webdav/handler.go index 4f0b1b3f..ea0e1f17 100644 --- a/server/internal/api/webdav/handler.go +++ b/server/internal/api/webdav/handler.go @@ -4,11 +4,11 @@ import ( "errors" "net/http" + webdav "codeberg.org/shroff/phylum/server/internal/api/webdav/impl" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" - webdav "github.com/shroff/phylum/server/internal/api/webdav/impl" - "github.com/shroff/phylum/server/internal/core" "github.com/sirupsen/logrus" ) diff --git a/server/internal/api/webdav/impl/copy_move.go b/server/internal/api/webdav/impl/copy_move.go index 19c15c3a..1cd776b5 100644 --- a/server/internal/api/webdav/impl/copy_move.go +++ b/server/internal/api/webdav/impl/copy_move.go @@ -4,8 +4,8 @@ import ( "net/http" "net/url" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/core" ) func (h *Handler) handleCopyMove(_ http.ResponseWriter, r *http.Request) (status int, err error) { diff --git a/server/internal/api/webdav/impl/prop.go b/server/internal/api/webdav/impl/prop.go index 9d27ad8c..45018c96 100644 --- a/server/internal/api/webdav/impl/prop.go +++ b/server/internal/api/webdav/impl/prop.go @@ -10,7 +10,7 @@ import ( "net/http" "strconv" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/core" ) // Proppatch describes a property update instruction as defined in RFC 4918. diff --git a/server/internal/api/webdav/impl/webdav.go b/server/internal/api/webdav/impl/webdav.go index 07670636..0e1dd55b 100644 --- a/server/internal/api/webdav/impl/webdav.go +++ b/server/internal/api/webdav/impl/webdav.go @@ -15,9 +15,9 @@ import ( "strings" "time" + "codeberg.org/shroff/phylum/server/internal/api/serve" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/api/serve" - "github.com/shroff/phylum/server/internal/core" ) type Handler struct { diff --git a/server/internal/api/webdav/impl/xml.go b/server/internal/api/webdav/impl/xml.go index 84db7099..815a5ea8 100644 --- a/server/internal/api/webdav/impl/xml.go +++ b/server/internal/api/webdav/impl/xml.go @@ -32,7 +32,7 @@ import ( // In the long term, this package should use the standard library's version // only, and the internal fork deleted, once // https://github.com/golang/go/issues/13400 is resolved. - ixml "github.com/shroff/phylum/server/internal/api/webdav/xml" + ixml "codeberg.org/shroff/phylum/server/internal/api/webdav/xml" ) // http://www.webdav.org/specs/rfc4918.html#ELEMENT_lockinfo diff --git a/server/internal/api/webdav/impl/xml_test.go b/server/internal/api/webdav/impl/xml_test.go index 8b34bca1..cfc15927 100644 --- a/server/internal/api/webdav/impl/xml_test.go +++ b/server/internal/api/webdav/impl/xml_test.go @@ -16,7 +16,7 @@ import ( "strings" "testing" - ixml "github.com/shroff/phylum/server/internal/api/webdav/xml" + ixml "codeberg.org/shroff/phylum/server/internal/api/webdav/xml" ) func TestReadLockInfo(t *testing.T) { diff --git a/server/internal/command/admin/cmd.go b/server/internal/command/admin/cmd.go index fb3595dd..1f1b1be9 100644 --- a/server/internal/command/admin/cmd.go +++ b/server/internal/command/admin/cmd.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/shroff/phylum/server/internal/command/admin/schema" - "github.com/shroff/phylum/server/internal/command/admin/storage" - "github.com/shroff/phylum/server/internal/command/admin/user" + "codeberg.org/shroff/phylum/server/internal/command/admin/schema" + "codeberg.org/shroff/phylum/server/internal/command/admin/storage" + "codeberg.org/shroff/phylum/server/internal/command/admin/user" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/schema/cmd.go b/server/internal/command/admin/schema/cmd.go index bc2ce1d1..15eac4a0 100644 --- a/server/internal/command/admin/schema/cmd.go +++ b/server/internal/command/admin/schema/cmd.go @@ -6,7 +6,7 @@ import ( "os" "strconv" - "github.com/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/storage/cmd.go b/server/internal/command/admin/storage/cmd.go index 6b40895b..5ec32c47 100644 --- a/server/internal/command/admin/storage/cmd.go +++ b/server/internal/command/admin/storage/cmd.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/storage" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/user/cmd.go b/server/internal/command/admin/user/cmd.go index ae3d9f2a..8e17fc36 100644 --- a/server/internal/command/admin/user/cmd.go +++ b/server/internal/command/admin/user/cmd.go @@ -3,7 +3,7 @@ package user import ( "context" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/user/invite.go b/server/internal/command/admin/user/invite.go index 442c080a..82c9f3da 100644 --- a/server/internal/command/admin/user/invite.go +++ b/server/internal/command/admin/user/invite.go @@ -6,9 +6,9 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/mail" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/mail" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/user/mod.go b/server/internal/command/admin/user/mod.go index 909fecbf..53fe0ce8 100644 --- a/server/internal/command/admin/user/mod.go +++ b/server/internal/command/admin/user/mod.go @@ -5,9 +5,9 @@ import ( "fmt" "os" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/db" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/user/passwd.go b/server/internal/command/admin/user/passwd.go index 276c9e62..0ddc4e7c 100644 --- a/server/internal/command/admin/user/passwd.go +++ b/server/internal/command/admin/user/passwd.go @@ -6,7 +6,7 @@ import ( "os" "syscall" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/spf13/cobra" "golang.org/x/term" ) diff --git a/server/internal/command/admin/user/permissions.go b/server/internal/command/admin/user/permissions.go index 982ebc47..9764e9fd 100644 --- a/server/internal/command/admin/user/permissions.go +++ b/server/internal/command/admin/user/permissions.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/admin/user/pwreset.go b/server/internal/command/admin/user/pwreset.go index 96697e89..9b34ef4a 100644 --- a/server/internal/command/admin/user/pwreset.go +++ b/server/internal/command/admin/user/pwreset.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/mail" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/mail" "github.com/spf13/cobra" ) diff --git a/server/internal/command/command.go b/server/internal/command/command.go index cec89197..46f547c4 100644 --- a/server/internal/command/command.go +++ b/server/internal/command/command.go @@ -8,6 +8,14 @@ import ( "path" "strings" + "codeberg.org/shroff/phylum/server/internal/command/admin" + "codeberg.org/shroff/phylum/server/internal/command/fs" + "codeberg.org/shroff/phylum/server/internal/command/serve" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/crypt" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/mail" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/google/uuid" "github.com/knadh/koanf/parsers/yaml" "github.com/knadh/koanf/providers/env" @@ -15,14 +23,6 @@ import ( "github.com/knadh/koanf/providers/posflag" "github.com/knadh/koanf/providers/rawbytes" "github.com/knadh/koanf/v2" - "github.com/shroff/phylum/server/internal/command/admin" - "github.com/shroff/phylum/server/internal/command/fs" - "github.com/shroff/phylum/server/internal/command/serve" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/crypt" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/mail" - "github.com/shroff/phylum/server/internal/storage" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/server/internal/command/common/common.go b/server/internal/command/common/common.go index d94d1a31..26272b5d 100644 --- a/server/internal/command/common/common.go +++ b/server/internal/command/common/common.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/spf13/cobra" ) diff --git a/server/internal/command/common/format.go b/server/internal/command/common/format.go index 5e94db5a..d6b36f16 100644 --- a/server/internal/command/common/format.go +++ b/server/internal/command/common/format.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/core" ) func FormatResourceSummary(r core.Resource, name string, deleted pgtype.Timestamp) string { diff --git a/server/internal/command/config.go b/server/internal/command/config.go index f37ad915..a87c5f8d 100644 --- a/server/internal/command/config.go +++ b/server/internal/command/config.go @@ -1,12 +1,12 @@ package command import ( - "github.com/shroff/phylum/server/internal/command/serve" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/crypt" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/mail" - "github.com/shroff/phylum/server/internal/storage" + "codeberg.org/shroff/phylum/server/internal/command/serve" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/crypt" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/mail" + "codeberg.org/shroff/phylum/server/internal/storage" ) type Config struct { diff --git a/server/internal/command/fs/cat.go b/server/internal/command/fs/cat.go index aeb5e5e9..0559858e 100644 --- a/server/internal/command/fs/cat.go +++ b/server/internal/command/fs/cat.go @@ -5,8 +5,8 @@ import ( "io" "os" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/cmd.go b/server/internal/command/fs/cmd.go index 3ab821c3..f3dc7377 100644 --- a/server/internal/command/fs/cmd.go +++ b/server/internal/command/fs/cmd.go @@ -1,8 +1,8 @@ package fs import ( - "github.com/shroff/phylum/server/internal/command/fs/publink" - "github.com/shroff/phylum/server/internal/command/fs/trash" + "codeberg.org/shroff/phylum/server/internal/command/fs/publink" + "codeberg.org/shroff/phylum/server/internal/command/fs/trash" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/cp.go b/server/internal/command/fs/cp.go index 4248ed06..5bb573d2 100644 --- a/server/internal/command/fs/cp.go +++ b/server/internal/command/fs/cp.go @@ -4,9 +4,9 @@ import ( "fmt" "os" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/import.go b/server/internal/command/fs/import.go index e91bd853..d6d07dd5 100644 --- a/server/internal/command/fs/import.go +++ b/server/internal/command/fs/import.go @@ -8,9 +8,9 @@ import ( "os" "path" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/ls.go b/server/internal/command/fs/ls.go index 22456d76..e68f2cde 100644 --- a/server/internal/command/fs/ls.go +++ b/server/internal/command/fs/ls.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/mkdir.go b/server/internal/command/fs/mkdir.go index ff6324c5..23d22b55 100644 --- a/server/internal/command/fs/mkdir.go +++ b/server/internal/command/fs/mkdir.go @@ -4,9 +4,9 @@ import ( "fmt" "os" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/mv.go b/server/internal/command/fs/mv.go index 2b37b84e..992bc91a 100644 --- a/server/internal/command/fs/mv.go +++ b/server/internal/command/fs/mv.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/publink/create.go b/server/internal/command/fs/publink/create.go index 544c7a29..46b61052 100644 --- a/server/internal/command/fs/publink/create.go +++ b/server/internal/command/fs/publink/create.go @@ -5,9 +5,9 @@ import ( "fmt" "time" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/publink/list.go b/server/internal/command/fs/publink/list.go index 8975c75d..33a5f2a4 100644 --- a/server/internal/command/fs/publink/list.go +++ b/server/internal/command/fs/publink/list.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/rm.go b/server/internal/command/fs/rm.go index 9013a57c..4f435a77 100644 --- a/server/internal/command/fs/rm.go +++ b/server/internal/command/fs/rm.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/search.go b/server/internal/command/fs/search.go index bae46d19..0cc58bef 100644 --- a/server/internal/command/fs/search.go +++ b/server/internal/command/fs/search.go @@ -5,8 +5,8 @@ import ( "os" "strings" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/setfacl.go b/server/internal/command/fs/setfacl.go index c3c75225..f1963663 100644 --- a/server/internal/command/fs/setfacl.go +++ b/server/internal/command/fs/setfacl.go @@ -6,8 +6,8 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/trash/delete.go b/server/internal/command/fs/trash/delete.go index 941c9912..76650f74 100644 --- a/server/internal/command/fs/trash/delete.go +++ b/server/internal/command/fs/trash/delete.go @@ -4,8 +4,8 @@ import ( "fmt" "os" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/trash/empty.go b/server/internal/command/fs/trash/empty.go index d41d3738..8305a648 100644 --- a/server/internal/command/fs/trash/empty.go +++ b/server/internal/command/fs/trash/empty.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/trash/list.go b/server/internal/command/fs/trash/list.go index 3c4f3c19..5b95a424 100644 --- a/server/internal/command/fs/trash/list.go +++ b/server/internal/command/fs/trash/list.go @@ -4,8 +4,8 @@ import ( "fmt" "os" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/trash/restore.go b/server/internal/command/fs/trash/restore.go index d21d3175..4a248295 100644 --- a/server/internal/command/fs/trash/restore.go +++ b/server/internal/command/fs/trash/restore.go @@ -4,8 +4,8 @@ import ( "fmt" "os" + "codeberg.org/shroff/phylum/server/internal/command/common" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/command/common" "github.com/spf13/cobra" ) diff --git a/server/internal/command/fs/trash/summary.go b/server/internal/command/fs/trash/summary.go index a2b4c0cb..27464794 100644 --- a/server/internal/command/fs/trash/summary.go +++ b/server/internal/command/fs/trash/summary.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/serve/cmd.go b/server/internal/command/serve/cmd.go index b0186aad..37079efd 100644 --- a/server/internal/command/serve/cmd.go +++ b/server/internal/command/serve/cmd.go @@ -8,15 +8,15 @@ import ( "strings" "time" + "codeberg.org/shroff/phylum/server/internal/api/publink" + apiv1 "codeberg.org/shroff/phylum/server/internal/api/v1" + "codeberg.org/shroff/phylum/server/internal/api/webdav" + "codeberg.org/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/jobs" "github.com/fvbock/endless" "github.com/gin-contrib/static" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/api/publink" - apiv1 "github.com/shroff/phylum/server/internal/api/v1" - "github.com/shroff/phylum/server/internal/api/webdav" - "github.com/shroff/phylum/server/internal/core" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/jobs" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/server/internal/command/serve/engine.go b/server/internal/command/serve/engine.go index f4270a47..54ac81f7 100644 --- a/server/internal/command/serve/engine.go +++ b/server/internal/command/serve/engine.go @@ -5,9 +5,9 @@ import ( "strings" "time" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/gin-contrib/cors" "github.com/gin-gonic/gin" - "github.com/shroff/phylum/server/internal/core" "github.com/sirupsen/logrus" ) diff --git a/server/internal/command/user/bookmarks/cmd.go b/server/internal/command/user/bookmarks/cmd.go index f030944b..1f9122df 100644 --- a/server/internal/command/user/bookmarks/cmd.go +++ b/server/internal/command/user/bookmarks/cmd.go @@ -5,8 +5,8 @@ import ( "fmt" "os" - "github.com/shroff/phylum/server/internal/command/common" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/command/common" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/spf13/cobra" ) diff --git a/server/internal/command/user/cmd.go b/server/internal/command/user/cmd.go index 37726ce5..a93a5196 100644 --- a/server/internal/command/user/cmd.go +++ b/server/internal/command/user/cmd.go @@ -1,7 +1,7 @@ package user import ( - "github.com/shroff/phylum/server/internal/command/user/bookmarks" + "codeberg.org/shroff/phylum/server/internal/command/user/bookmarks" "github.com/spf13/cobra" ) diff --git a/server/internal/core/core.go b/server/internal/core/core.go index 3c7ef1ca..57989dd8 100644 --- a/server/internal/core/core.go +++ b/server/internal/core/core.go @@ -3,11 +3,11 @@ package core import ( "io" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/doug-martin/goqu/v9" _ "github.com/doug-martin/goqu/v9/dialect/postgres" "github.com/google/uuid" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/db" ) var Cfg Config diff --git a/server/internal/core/filesystem.go b/server/internal/core/filesystem.go index 89c8ce55..4c986b60 100644 --- a/server/internal/core/filesystem.go +++ b/server/internal/core/filesystem.go @@ -4,10 +4,10 @@ import ( "context" "errors" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/db" "github.com/sirupsen/logrus" ) diff --git a/server/internal/core/filesystem_readonly.go b/server/internal/core/filesystem_readonly.go index 7f880dc9..4e1d027d 100644 --- a/server/internal/core/filesystem_readonly.go +++ b/server/internal/core/filesystem_readonly.go @@ -5,11 +5,11 @@ import ( "errors" "time" + "codeberg.org/shroff/phylum/server/internal/crypt" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/crypt" - "github.com/shroff/phylum/server/internal/db" ) type proxyFileSystemReadOnly struct { diff --git a/server/internal/core/resource_create.go b/server/internal/core/resource_create.go index 773a4b20..9835a9f3 100644 --- a/server/internal/core/resource_create.go +++ b/server/internal/core/resource_create.go @@ -6,11 +6,11 @@ import ( "path" "strings" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/doug-martin/goqu/v9" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/storage" ) type ResourceBindConflictResolution int32 diff --git a/server/internal/core/resource_delete.go b/server/internal/core/resource_delete.go index c17a8b8c..c32b633a 100644 --- a/server/internal/core/resource_delete.go +++ b/server/internal/core/resource_delete.go @@ -6,11 +6,11 @@ import ( "path" "time" + "codeberg.org/shroff/phylum/server/internal/jobs" "github.com/doug-martin/goqu/v9" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/jobs" ) func (f filesystem) deleteChildRecursive(r Resource, name string, softDelete bool) (Resource, error) { diff --git a/server/internal/core/resource_open.go b/server/internal/core/resource_open.go index 5401e175..cbf48d31 100644 --- a/server/internal/core/resource_open.go +++ b/server/internal/core/resource_open.go @@ -5,11 +5,11 @@ import ( "hash" "io" + "codeberg.org/shroff/phylum/server/internal/jobs" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/doug-martin/goqu/v9" "github.com/google/uuid" "github.com/jackc/pgx/v5" - "github.com/shroff/phylum/server/internal/jobs" - "github.com/shroff/phylum/server/internal/storage" ) func (f filesystem) OpenWrite(r Resource, versionID uuid.UUID) (io.WriteCloser, error) { diff --git a/server/internal/core/resource_publink.go b/server/internal/core/resource_publink.go index bf31c63e..2bc3f490 100644 --- a/server/internal/core/resource_publink.go +++ b/server/internal/core/resource_publink.go @@ -3,9 +3,9 @@ package core import ( "strings" + "codeberg.org/shroff/phylum/server/internal/crypt" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/crypt" ) func (f filesystem) CreatePublink(r Resource, id, password string, expires pgtype.Timestamp, accessLimit int) error { diff --git a/server/internal/core/trash.go b/server/internal/core/trash.go index 0aa87933..cb287165 100644 --- a/server/internal/core/trash.go +++ b/server/internal/core/trash.go @@ -7,11 +7,11 @@ import ( "fmt" "time" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/jobs" "github.com/doug-martin/goqu/v9" "github.com/google/uuid" "github.com/jackc/pgx/v5" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/jobs" "github.com/sirupsen/logrus" ) diff --git a/server/internal/core/user_auth.go b/server/internal/core/user_auth.go index 57218884..39884c4b 100644 --- a/server/internal/core/user_auth.go +++ b/server/internal/core/user_auth.go @@ -4,11 +4,11 @@ import ( "net/http" "time" + "codeberg.org/shroff/phylum/server/internal/crypt" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/rand" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/crypt" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/rand" ) const accessTokenLength = 16 diff --git a/server/internal/core/user_manager.go b/server/internal/core/user_manager.go index 5af4391a..608477bd 100644 --- a/server/internal/core/user_manager.go +++ b/server/internal/core/user_manager.go @@ -6,10 +6,10 @@ import ( "strings" "time" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/db" ) var ErrUserNotFound = NewError(http.StatusNotFound, "user_not_found", "no such user") diff --git a/server/internal/core/user_update.go b/server/internal/core/user_update.go index 8a475159..1b5b3424 100644 --- a/server/internal/core/user_update.go +++ b/server/internal/core/user_update.go @@ -1,8 +1,8 @@ package core import ( + "codeberg.org/shroff/phylum/server/internal/crypt" "github.com/jackc/pgx/v5/pgtype" - "github.com/shroff/phylum/server/internal/crypt" ) func (m manager) UpdateUserHome(user User, home pgtype.UUID) error { diff --git a/server/internal/core/version.go b/server/internal/core/version.go index d23ec0d9..7b8b36d2 100644 --- a/server/internal/core/version.go +++ b/server/internal/core/version.go @@ -4,8 +4,8 @@ import ( "errors" "io" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/google/uuid" - "github.com/shroff/phylum/server/internal/storage" ) // VersionInfo represents a single version of a resource diff --git a/server/internal/db/db.go b/server/internal/db/db.go index 44588a5b..3aece498 100644 --- a/server/internal/db/db.go +++ b/server/internal/db/db.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" + "codeberg.org/shroff/phylum/server/internal/pubsub" "github.com/jackc/pgx/v5/pgxpool" - "github.com/shroff/phylum/server/internal/pubsub" "github.com/sirupsen/logrus" ) diff --git a/server/internal/db/schema.go b/server/internal/db/schema.go index 5ff3b468..99174168 100644 --- a/server/internal/db/schema.go +++ b/server/internal/db/schema.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/shroff/phylum/server/internal/db/migrations" + "codeberg.org/shroff/phylum/server/internal/db/migrations" "github.com/sirupsen/logrus" ) diff --git a/server/internal/jobs/delete.go b/server/internal/jobs/delete.go index a703a3d4..2f377b8b 100644 --- a/server/internal/jobs/delete.go +++ b/server/internal/jobs/delete.go @@ -3,11 +3,11 @@ package jobs import ( "context" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/google/uuid" "github.com/jackc/pgx/v5" "github.com/riverqueue/river" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/storage" ) type DeleteArgs struct { diff --git a/server/internal/jobs/migrate.go b/server/internal/jobs/migrate.go index 66d49734..b31cdad4 100644 --- a/server/internal/jobs/migrate.go +++ b/server/internal/jobs/migrate.go @@ -4,10 +4,10 @@ import ( "context" "errors" + "codeberg.org/shroff/phylum/server/internal/db" + "codeberg.org/shroff/phylum/server/internal/storage" "github.com/google/uuid" "github.com/riverqueue/river" - "github.com/shroff/phylum/server/internal/db" - "github.com/shroff/phylum/server/internal/storage" "github.com/sirupsen/logrus" ) diff --git a/server/internal/mail/mail.go b/server/internal/mail/mail.go index 00442c5b..23cce926 100644 --- a/server/internal/mail/mail.go +++ b/server/internal/mail/mail.go @@ -3,7 +3,7 @@ package mail import ( "io" - "github.com/shroff/phylum/server/internal/core" + "codeberg.org/shroff/phylum/server/internal/core" "github.com/sirupsen/logrus" gomail "gopkg.in/mail.v2" ) diff --git a/server/internal/mail/password_reset.go b/server/internal/mail/password_reset.go index 1f7d35d2..b5f43df4 100644 --- a/server/internal/mail/password_reset.go +++ b/server/internal/mail/password_reset.go @@ -1,6 +1,6 @@ package mail -import "github.com/shroff/phylum/server/internal/core" +import "codeberg.org/shroff/phylum/server/internal/core" type ResetPasswordParams struct { Name string diff --git a/server/internal/mail/welcome.go b/server/internal/mail/welcome.go index 54f1892f..c10aef03 100644 --- a/server/internal/mail/welcome.go +++ b/server/internal/mail/welcome.go @@ -1,6 +1,6 @@ package mail -import "github.com/shroff/phylum/server/internal/core" +import "codeberg.org/shroff/phylum/server/internal/core" func SendWelcomeEmail(u core.User) error { email := emails["welcome"] diff --git a/server/internal/storage/storage.go b/server/internal/storage/storage.go index 43fb0a0f..c84d3004 100644 --- a/server/internal/storage/storage.go +++ b/server/internal/storage/storage.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" + "codeberg.org/shroff/phylum/server/internal/db" "github.com/jackc/pgx/v5" - "github.com/shroff/phylum/server/internal/db" "github.com/sirupsen/logrus" )