diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e7fe3f1..199b639 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,13 +4,13 @@ Thank you for your interest in contributing to Linstrom! All contributors are we ## Bug Reports -Use the [bug report issue template](https://gitlab.com/mstarongitlab/linstrom/issues/new?template=bug-report.md) to file a bug report. Please include a detailed description of the events leading up to the problem, your system configuration, and the program logs. If you're able to reproduce the bug reliably, attaching a debugger to the program, triggering it, and uploading the results would be very helpful. +Use the [bug report issue template](https://git.mstar.dev/mstar/linstrom/issues/new?template=bug-report.md) to file a bug report. Please include a detailed description of the events leading up to the problem, your system configuration, and the program logs. If you're able to reproduce the bug reliably, attaching a debugger to the program, triggering it, and uploading the results would be very helpful. This section *should* tell you how to find your logs, attach the debugger, and do whatever else you need for a detailed bug report. But nobody filled it out. Attach a picture of Goatse to your bug reports until we fix this. ## Feature Requests -Use the [feature request issue template](https://gitlab.com/mstarongitlab/linstrom/issues/new?template=suggestion.md) to suggest new features. Please note that we haven't replaced this placeholder text with the actual criteria we're looking for, which means you should spam us with utterly nonsensical ideas. +Use the [feature request issue template](https://git.mstar.dev/mstar/linstrom/issues/new?template=suggestion.md) to suggest new features. Please note that we haven't replaced this placeholder text with the actual criteria we're looking for, which means you should spam us with utterly nonsensical ideas. ## Submitting Translations @@ -22,7 +22,7 @@ This should have been removed and replaced with a quick overview of where the fi ### Forking -If you'd like to have a go at writing some code for Linstrom, fork the repository, then create a new branch with a name that describes the changes you're making. If there's a [relevant issue](https://gitlab.com/mstarongitlab/linstrom/issues), include the issue number in the branch name: +If you'd like to have a go at writing some code for Linstrom, fork the repository, then create a new branch with a name that describes the changes you're making. If there's a [relevant issue](https://git.mstar.dev/mstar/linstrom/issues), include the issue number in the branch name: ```sh git checkout -b 1337-prevent-computer-from-exploding @@ -46,7 +46,7 @@ For anything node: uhhh, yolo, idk yet Once your modifications are complete, you'll want to fetch the latest changes from this repository, rebase your branch, and publish your changes: ```sh -git remote add upstream https://gitlab.com/mstarongitlab/linstrom.git +git remote add upstream https://git.mstar.dev/mstar/linstrom.git git checkout main git pull upstream main git checkout 1337-prevent-computer-from-exploding @@ -54,4 +54,4 @@ git rebase master git push --set-upstream origin 1337-prevent-computer-from-exploding ``` -Finally, you can [create a pull request](https://gitlab.com/mstarongitlab/linstrom/pulls). It might not get approved, or you might have to make some additional changes to your code - but don't give up! +Finally, you can [create a pull request](https://git.mstar.dev/mstar/linstrom/pulls). It might not get approved, or you might have to make some additional changes to your code - but don't give up! diff --git a/Containerfile b/Containerfile index 554588f..d386db5 100644 --- a/Containerfile +++ b/Containerfile @@ -12,7 +12,7 @@ FROM gcr.io/distroless/static-debian12:latest as release LABEL org.opencontainers.image.authors="Melody Becker/m*" # LABEL org.opencontainers.image.url="Main linstrom page url here" # LABEL org.opencontainers.image.documentation="Url to main linstrom documentation here" -LABEL org.opencontainers.image.source="https://gitlab.com/mstarongitlab/linstrom" +LABEL org.opencontainers.image.source="https://git.mstar.dev/mstar/linstrom" # Make this one dynamic from build tag LABEL org.opencontainers.image.version="0.0.1" # LABEL org.opencontainers.image.revision="idk what" diff --git a/cmd/RolesApiConverter/main.go b/cmd/RolesApiConverter/main.go index f45c722..96a9453 100644 --- a/cmd/RolesApiConverter/main.go +++ b/cmd/RolesApiConverter/main.go @@ -11,7 +11,7 @@ import ( "regexp" "strings" - "gitlab.com/mstarongitlab/goutils/sliceutils" + "git.mstar.dev/mstar/goutils/sliceutils" ) var findRoleStructRegex = regexp.MustCompile(`type Role struct \{([\s\S]+)\}\n\n/\*`) @@ -89,7 +89,7 @@ func main() { `) outBuilder.WriteString("package server\n\n") - outBuilder.WriteString("import \"gitlab.com/mstarongitlab/linstrom/storage\"\n") + outBuilder.WriteString("import \"git.mstar.dev/mstar/linstrom/storage\"\n") outBuilder.WriteString("func convertRoleStorageToLinstrom(r storage.Role) linstromRole {\n") outBuilder.WriteString("return linstromRole{") diff --git a/cmd/RolesApiTypeGenerator/main.go b/cmd/RolesApiTypeGenerator/main.go index 4a64600..fea6b26 100644 --- a/cmd/RolesApiTypeGenerator/main.go +++ b/cmd/RolesApiTypeGenerator/main.go @@ -12,7 +12,7 @@ import ( "strings" "unicode" - "gitlab.com/mstarongitlab/goutils/sliceutils" + "git.mstar.dev/mstar/goutils/sliceutils" ) var findRoleStructRegex = regexp.MustCompile(`type Role struct \{([\s\S]+)\}\n\n/\*`) diff --git a/cmd/RolesFrontendGenerator/main.go b/cmd/RolesFrontendGenerator/main.go index 2a0cbe1..9e1e217 100644 --- a/cmd/RolesFrontendGenerator/main.go +++ b/cmd/RolesFrontendGenerator/main.go @@ -13,7 +13,7 @@ import ( "strings" "unicode" - "gitlab.com/mstarongitlab/goutils/sliceutils" + "git.mstar.dev/mstar/goutils/sliceutils" ) var findRoleStructRegex = regexp.MustCompile(`type Role struct \{([\s\S]+)\}\n\n/\*`) diff --git a/cmd/RolesGenerator/main.go b/cmd/RolesGenerator/main.go index 2c856dc..9f2671b 100644 --- a/cmd/RolesGenerator/main.go +++ b/cmd/RolesGenerator/main.go @@ -17,7 +17,7 @@ import ( "regexp" "strings" - "gitlab.com/mstarongitlab/goutils/sliceutils" + "git.mstar.dev/mstar/goutils/sliceutils" ) var findRoleStructRegex = regexp.MustCompile(`type Role struct \{([\s\S]+)\}\n\n/\*`) @@ -96,7 +96,7 @@ func main() { `) outBuilder.WriteString(pkgString + "\n\n") outBuilder.WriteString( - "import (\n \"slices\"\n \"gitlab.com/mstarongitlab/goutils/sliceutils\"\n)\n\n", + "import (\n \"slices\"\n \"git.mstar.dev/mstar/goutils/sliceutils\"\n)\n\n", ) // Build role collapse function diff --git a/config/config.go b/config/config.go index aab8a6f..a9b70a4 100644 --- a/config/config.go +++ b/config/config.go @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/goutils/other" + "git.mstar.dev/mstar/goutils/other" ) type ConfigSSL struct { diff --git a/config/config.go.old b/config/config.go.old index 19f633b..cbe19b2 100644 --- a/config/config.go.old +++ b/config/config.go.old @@ -6,7 +6,7 @@ import ( "github.com/BurntSushi/toml" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/goutils/other" + "git.mstar.dev/mstar/goutils/other" ) type ConfigSSL struct { diff --git a/go.mod b/go.mod index 337f040..7afd0b3 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,12 @@ -module gitlab.com/mstarongitlab/linstrom +module git.mstar.dev/mstar/linstrom go 1.23 toolchain go1.23.0 require ( + git.mstar.dev/mstar/goutils v1.5.4 github.com/BurntSushi/toml v1.4.0 - github.com/aws/aws-sdk-go v1.55.5 github.com/dgraph-io/ristretto v0.1.1 github.com/eko/gocache/lib/v4 v4.1.6 github.com/eko/gocache/store/redis/v4 v4.2.2 @@ -17,12 +17,12 @@ require ( github.com/google/jsonapi v1.0.0 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 + github.com/minio/minio-go/v7 v7.0.80 github.com/mstarongithub/passkey v0.0.0-20240817142622-de6912c8303e github.com/redis/go-redis/v9 v9.0.2 github.com/rs/zerolog v1.33.0 github.com/xhit/go-simple-mail/v2 v2.16.0 gitlab.com/mstarongitlab/goap v1.1.0 - gitlab.com/mstarongitlab/goutils v1.4.1 golang.org/x/image v0.20.0 gorm.io/driver/postgres v1.5.7 gorm.io/gorm v1.25.10 @@ -64,13 +64,11 @@ require ( github.com/jackc/pgx/v5 v5.4.3 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/compress v1.17.11 // indirect github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/minio/md5-simd v1.1.2 // indirect - github.com/minio/minio-go/v7 v7.0.80 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/piprate/json-gold v0.5.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -81,6 +79,7 @@ require ( github.com/tetratelabs/wazero v1.7.3 // indirect github.com/toorop/go-dkim v0.0.0-20201103131630-e1cd1a0a5208 // indirect github.com/x448/float16 v0.8.4 // indirect + gitlab.com/mstarongitlab/goutils v1.3.0 // indirect golang.org/x/crypto v0.28.0 // indirect golang.org/x/net v0.30.0 // indirect golang.org/x/sys v0.26.0 // indirect diff --git a/go.sum b/go.sum index ed80f6a..c483ca3 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.mstar.dev/mstar/goutils v1.5.4 h1:l/4oQe/fBk9zyXplQkGXbmQndnm0aRdHuy4wgQfNrFo= +git.mstar.dev/mstar/goutils v1.5.4/go.mod h1:juxY0eZEMnA95fedRp2LVXvUBgEjz66nE8SEdGKcxMA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= @@ -40,8 +42,6 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/aws/aws-sdk-go v1.55.5 h1:KKUZBfBoyqy5d3swXyiC7Q76ic40rYcbqH7qjh59kzU= -github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -197,10 +197,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -288,7 +284,6 @@ github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEt github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= -github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0= @@ -323,8 +318,6 @@ gitlab.com/mstarongitlab/goap v1.1.0 h1:uN05RP+Tq2NR2IuPq6XQa5oLpfailpoEvxo1Sfeh gitlab.com/mstarongitlab/goap v1.1.0/go.mod h1:rt9IYvJBPh1z6t+vvzifmxDtGjGlr8683tSPfa5dbXI= gitlab.com/mstarongitlab/goutils v1.3.0 h1:uuxPHjIU36lyJ8/z4T2xI32zOyh53Xj0Au8K12qkaJ4= gitlab.com/mstarongitlab/goutils v1.3.0/go.mod h1:SvqfzFxgashuZPqR9kPwQ9gFA7I1yskZjhmGmY2pAow= -gitlab.com/mstarongitlab/goutils v1.4.1 h1:g6bLX1gGqQeoRwmFC0Aw9lvxyw22cWjyG7RXsi+JmlI= -gitlab.com/mstarongitlab/goutils v1.4.1/go.mod h1:SvqfzFxgashuZPqR9kPwQ9gFA7I1yskZjhmGmY2pAow= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -336,8 +329,6 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -407,8 +398,6 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -475,8 +464,6 @@ golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -488,8 +475,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -628,9 +613,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/main.go b/main.go index 8b70a91..1b1bea7 100644 --- a/main.go +++ b/main.go @@ -13,12 +13,12 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - // "gitlab.com/mstarongitlab/linstrom/ap" - "gitlab.com/mstarongitlab/linstrom/config" - "gitlab.com/mstarongitlab/linstrom/server" - "gitlab.com/mstarongitlab/linstrom/storage" - "gitlab.com/mstarongitlab/linstrom/storage/cache" - "gitlab.com/mstarongitlab/linstrom/util" + // "git.mstar.dev/mstar/linstrom/ap" + "git.mstar.dev/mstar/linstrom/config" + "git.mstar.dev/mstar/linstrom/server" + "git.mstar.dev/mstar/linstrom/storage" + "git.mstar.dev/mstar/linstrom/storage/cache" + "git.mstar.dev/mstar/linstrom/util" ) //go:embed frontend-reactive/dist/* frontend-reactive/dist/assets diff --git a/server/apiLinstrom.go b/server/apiLinstrom.go index 52c9d4b..de943e6 100644 --- a/server/apiLinstrom.go +++ b/server/apiLinstrom.go @@ -3,8 +3,8 @@ package server import ( "net/http" - "gitlab.com/mstarongitlab/goutils/other" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/other" + "git.mstar.dev/mstar/linstrom/storage" ) func setupLinstromApiRouter() http.Handler { diff --git a/server/apiLinstromAccounts.go b/server/apiLinstromAccounts.go index 996fc14..5e8ae0e 100644 --- a/server/apiLinstromAccounts.go +++ b/server/apiLinstromAccounts.go @@ -5,9 +5,9 @@ import ( "github.com/google/jsonapi" "github.com/rs/zerolog/hlog" - "gitlab.com/mstarongitlab/goutils/other" - "gitlab.com/mstarongitlab/goutils/sliceutils" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/other" + "git.mstar.dev/mstar/goutils/sliceutils" + "git.mstar.dev/mstar/linstrom/storage" ) // No create account. That happens during passkey registration diff --git a/server/apiLinstromNotes.go b/server/apiLinstromNotes.go index b6ea1c5..d54cb2c 100644 --- a/server/apiLinstromNotes.go +++ b/server/apiLinstromNotes.go @@ -5,8 +5,8 @@ import ( "github.com/google/jsonapi" "github.com/rs/zerolog/hlog" - "gitlab.com/mstarongitlab/goutils/other" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/other" + "git.mstar.dev/mstar/linstrom/storage" ) // Notes diff --git a/server/apiLinstromTypeHelpers.go b/server/apiLinstromTypeHelpers.go index e02c282..92c4fd4 100644 --- a/server/apiLinstromTypeHelpers.go +++ b/server/apiLinstromTypeHelpers.go @@ -3,8 +3,8 @@ package server import ( "fmt" - "gitlab.com/mstarongitlab/goutils/sliceutils" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/sliceutils" + "git.mstar.dev/mstar/linstrom/storage" ) func convertAccountStorageToLinstrom( diff --git a/server/apiLinstromTypeHelpers_generated.go b/server/apiLinstromTypeHelpers_generated.go index f78672c..7b0b643 100644 --- a/server/apiLinstromTypeHelpers_generated.go +++ b/server/apiLinstromTypeHelpers_generated.go @@ -2,7 +2,7 @@ // If you need to refresh the content, run go generate again package server -import "gitlab.com/mstarongitlab/linstrom/storage" +import "git.mstar.dev/mstar/linstrom/storage" func convertRoleStorageToLinstrom(r storage.Role) linstromRole { return linstromRole{Id:r.ID,CreatedAt:r.CreatedAt,UpdatedAt:r.UpdatedAt,Name:r.Name,Priority:r.Priority,IsUserRole:r.IsUserRole,IsBuiltIn:r.IsBuiltIn,CanRecoverDeletedNotes:r.CanRecoverDeletedNotes,CanSendFollowerOnlyNotes:r.CanSendFollowerOnlyNotes,CanSendReplies:r.CanSendReplies,AutoNsfwMedia:r.AutoNsfwMedia,WithholdNotesForManualApproval:r.WithholdNotesForManualApproval,CanAffectOtherAdmins:r.CanAffectOtherAdmins,CanAssignRoles:r.CanAssignRoles,CanOverwriteDisplayNames:r.CanOverwriteDisplayNames,CanManageAvatarDecorations:r.CanManageAvatarDecorations,CanSendMedia:r.CanSendMedia,ScanCreatedLocalNotes:r.ScanCreatedLocalNotes,CanSendCustomEmotes:r.CanSendCustomEmotes,CanSendPublicNotes:r.CanSendPublicNotes,CanIncludeSurvey:r.CanIncludeSurvey,AutoCwPostsText:r.AutoCwPostsText,CanManageCustomEmotes:r.CanManageCustomEmotes,CanSendAnnouncements:r.CanSendAnnouncements,CanSendLocalNotes:r.CanSendLocalNotes,CanBoost:r.CanBoost,CanLogin:r.CanLogin,CanMentionOthers:r.CanMentionOthers,CanManageAds:r.CanManageAds,CanQuote:r.CanQuote,CanChangeDisplayName:r.CanChangeDisplayName,CanSubmitReports:r.CanSubmitReports,FullAdmin:r.FullAdmin,CanSendPrivateNotes:r.CanSendPrivateNotes,CanIncludeLinks:r.CanIncludeLinks,CanFederateFedi:r.CanFederateFedi,HasMentionCountLimit:r.HasMentionCountLimit,AutoCwPosts:r.AutoCwPosts,ScanCreatedPublicNotes:r.ScanCreatedPublicNotes,DisallowInteractionsWith:r.DisallowInteractionsWith,CanDeleteNotes:r.CanDeleteNotes,CanConfirmWithheldNotes:r.CanConfirmWithheldNotes,ScanCreatedPrivateNotes:r.ScanCreatedPrivateNotes,WithholdNotesBasedOnRegex:r.WithholdNotesBasedOnRegex,WithholdNotesRegexes:r.WithholdNotesRegexes,CanSupressInteractionsBetweenUsers:r.CanSupressInteractionsBetweenUsers,CanViewDeletedNotes:r.CanViewDeletedNotes,CanSendCustomReactions:r.CanSendCustomReactions,CanFederateBsky:r.CanFederateBsky,BlockedUsers:r.BlockedUsers,MentionLimit:r.MentionLimit,ScanCreatedFollowerOnlyNotes:r.ScanCreatedFollowerOnlyNotes,} } diff --git a/server/endpoints_ap.go b/server/endpoints_ap.go index e76176b..01cdb03 100644 --- a/server/endpoints_ap.go +++ b/server/endpoints_ap.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/rs/zerolog" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/linstrom/storage" "gorm.io/gorm" ) diff --git a/server/healthAndMetrics.go b/server/healthAndMetrics.go index 63fc35f..ad5a8fa 100644 --- a/server/healthAndMetrics.go +++ b/server/healthAndMetrics.go @@ -9,7 +9,7 @@ import ( "runtime/debug" "time" - "gitlab.com/mstarongitlab/goutils/other" + "git.mstar.dev/mstar/goutils/other" ) // Mounted at /profiling diff --git a/server/middlewareFixPasskeyPerms.go b/server/middlewareFixPasskeyPerms.go index a09ddb6..602ada6 100644 --- a/server/middlewareFixPasskeyPerms.go +++ b/server/middlewareFixPasskeyPerms.go @@ -9,9 +9,9 @@ import ( "time" "github.com/rs/zerolog/hlog" - "gitlab.com/mstarongitlab/goutils/other" + "git.mstar.dev/mstar/goutils/other" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/linstrom/storage" ) func forceCorrectPasskeyAuthFlowMiddleware( diff --git a/server/middlewares.go b/server/middlewares.go index 5d088f7..a4b5e36 100644 --- a/server/middlewares.go +++ b/server/middlewares.go @@ -9,9 +9,9 @@ import ( "github.com/rs/zerolog/hlog" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/goutils/other" - "gitlab.com/mstarongitlab/linstrom/config" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/other" + "git.mstar.dev/mstar/linstrom/config" + "git.mstar.dev/mstar/linstrom/storage" ) type HandlerBuilder func(http.Handler) http.Handler diff --git a/server/remoteServer/remoteServer.go b/server/remoteServer/remoteServer.go index 13b147e..1043093 100644 --- a/server/remoteServer/remoteServer.go +++ b/server/remoteServer/remoteServer.go @@ -1,6 +1,6 @@ package remotestorage -import "gitlab.com/mstarongitlab/linstrom/storage" +import "git.mstar.dev/mstar/linstrom/storage" // Wrapper around db storage // storage.Storage is for the db and cache access only, diff --git a/server/server.go b/server/server.go index a1b325f..b8c7b5a 100644 --- a/server/server.go +++ b/server/server.go @@ -7,8 +7,8 @@ import ( "github.com/mstarongithub/passkey" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/goutils/other" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/other" + "git.mstar.dev/mstar/linstrom/storage" ) type Server struct { diff --git a/server/utils.go b/server/utils.go index cae8e6d..9335d3e 100644 --- a/server/utils.go +++ b/server/utils.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/rs/zerolog/hlog" - "gitlab.com/mstarongitlab/goutils/other" - "gitlab.com/mstarongitlab/linstrom/storage" + "git.mstar.dev/mstar/goutils/other" + "git.mstar.dev/mstar/linstrom/storage" ) func placeholderEndpoint(w http.ResponseWriter, r *http.Request) { diff --git a/storage/cache.go b/storage/cache.go index 8600ff6..77e36b6 100644 --- a/storage/cache.go +++ b/storage/cache.go @@ -6,7 +6,7 @@ import ( "github.com/redis/go-redis/v9" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" ) // various prefixes for accessing items in the cache (since it's a simple key-value store) diff --git a/storage/cache/cache.go b/storage/cache/cache.go index 7e7d3d9..264f718 100644 --- a/storage/cache/cache.go +++ b/storage/cache/cache.go @@ -12,8 +12,8 @@ import ( ristretto_store "github.com/eko/gocache/store/ristretto/v4" "github.com/redis/go-redis/v9" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/config" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/config" + "git.mstar.dev/mstar/linstrom/util" ) type Cache struct { diff --git a/storage/inboundJobs.go b/storage/inboundJobs.go index d40394f..df3c0e2 100644 --- a/storage/inboundJobs.go +++ b/storage/inboundJobs.go @@ -2,7 +2,7 @@ package storage import ( "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/mediaFile.go b/storage/mediaFile.go index a7c5456..e83cb25 100644 --- a/storage/mediaFile.go +++ b/storage/mediaFile.go @@ -4,7 +4,7 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/mediaProvider/provider.go b/storage/mediaProvider/provider.go index 2188855..00c41eb 100644 --- a/storage/mediaProvider/provider.go +++ b/storage/mediaProvider/provider.go @@ -6,7 +6,7 @@ import ( "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" - "gitlab.com/mstarongitlab/linstrom/config" + "git.mstar.dev/mstar/linstrom/config" ) type Provider struct { diff --git a/storage/notes.go b/storage/notes.go index 1bd1702..fd87cec 100644 --- a/storage/notes.go +++ b/storage/notes.go @@ -5,7 +5,7 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/outboundJobs.go b/storage/outboundJobs.go index 6a7a10b..99e3eac 100644 --- a/storage/outboundJobs.go +++ b/storage/outboundJobs.go @@ -2,7 +2,7 @@ package storage import ( "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/passkeySessions.go b/storage/passkeySessions.go index d4fc78b..62c0cf6 100644 --- a/storage/passkeySessions.go +++ b/storage/passkeySessions.go @@ -4,7 +4,7 @@ import ( "github.com/go-webauthn/webauthn/webauthn" "github.com/google/uuid" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" ) // Session data used during login attempts with a passkey diff --git a/storage/remoteServerInfo.go b/storage/remoteServerInfo.go index 2ce618d..6fdd90e 100644 --- a/storage/remoteServerInfo.go +++ b/storage/remoteServerInfo.go @@ -2,7 +2,7 @@ package storage import ( "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/roles.go b/storage/roles.go index 2bb6840..9bb8a42 100644 --- a/storage/roles.go +++ b/storage/roles.go @@ -2,8 +2,8 @@ package storage import ( "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/goutils/sliceutils" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/goutils/sliceutils" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/rolesDefaults.go b/storage/rolesDefaults.go index a40b2ac..246b249 100644 --- a/storage/rolesDefaults.go +++ b/storage/rolesDefaults.go @@ -3,7 +3,7 @@ package storage import ( "math" - "gitlab.com/mstarongitlab/goutils/other" + "git.mstar.dev/mstar/goutils/other" ) // Default role every user has. Defines sane defaults for a normal user diff --git a/storage/rolesUtil_generated.go b/storage/rolesUtil_generated.go index 3ee693a..4d83e09 100644 --- a/storage/rolesUtil_generated.go +++ b/storage/rolesUtil_generated.go @@ -4,7 +4,7 @@ package storage import ( "slices" - "gitlab.com/mstarongitlab/goutils/sliceutils" + "git.mstar.dev/mstar/goutils/sliceutils" ) func CollapseRolesIntoOne(roles ...Role) Role { diff --git a/storage/storage.go b/storage/storage.go index f270c21..527d134 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -10,9 +10,9 @@ import ( "fmt" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/config" - "gitlab.com/mstarongitlab/linstrom/storage/cache" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/config" + "git.mstar.dev/mstar/linstrom/storage/cache" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/driver/postgres" "gorm.io/gorm" ) diff --git a/storage/storage.go.old b/storage/storage.go.old index 837424d..9bd457d 100644 --- a/storage/storage.go.old +++ b/storage/storage.go.old @@ -4,7 +4,7 @@ import ( "errors" "github.com/glebarez/sqlite" - "gitlab.com/mstarongitlab/linstrom/storage/cache" + "git.mstar.dev/mstar/linstrom/storage/cache" "gorm.io/driver/postgres" "gorm.io/gorm" ) diff --git a/storage/user.go b/storage/user.go index c205b42..1c8a4b6 100644 --- a/storage/user.go +++ b/storage/user.go @@ -12,8 +12,8 @@ import ( "github.com/google/uuid" "github.com/mstarongithub/passkey" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/ap" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/ap" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" ) diff --git a/storage/userIdentType.go b/storage/userIdentType.go index 59b67ad..9b48844 100644 --- a/storage/userIdentType.go +++ b/storage/userIdentType.go @@ -1,6 +1,6 @@ package storage -import "gitlab.com/mstarongitlab/goutils/sliceutils" +import "git.mstar.dev/mstar/goutils/sliceutils" // What kind of being a user identifies as type Being string diff --git a/storage/userInfoFields.go b/storage/userInfoFields.go index 5bc349a..8cb1658 100644 --- a/storage/userInfoFields.go +++ b/storage/userInfoFields.go @@ -4,7 +4,7 @@ import ( "time" "github.com/rs/zerolog/log" - "gitlab.com/mstarongitlab/linstrom/util" + "git.mstar.dev/mstar/linstrom/util" "gorm.io/gorm" )