diff --git a/.air.toml b/.air.toml index df5befa..f9bcb01 100644 --- a/.air.toml +++ b/.air.toml @@ -4,7 +4,7 @@ tmp_dir = "tmp" [build] bin = "tmp/main.exe" - cmd = "go build -ldflags='-X github.com/capcom6/sms-gateway/internal/version.AppVersion=dev -X github.com/capcom6/sms-gateway/internal/version.AppRelease=1' -o ./tmp/main.exe ./cmd/sms-gateway" + cmd = "go build -ldflags='-X github.com/android-sms-gateway/server/internal/version.AppVersion=dev -X github.com/android-sms-gateway/server/internal/version.AppRelease=1' -o ./tmp/main.exe ./cmd/sms-gateway" delay = 1000 exclude_dir = ["api", "assets", "tmp", "vendor", "testdata", "tmp", "web"] exclude_file = [] diff --git a/README.md b/README.md index 0f816cd..64aa232 100644 --- a/README.md +++ b/README.md @@ -81,13 +81,13 @@ Distributed under the Apache-2.0 license. See [LICENSE](LICENSE) for more inform Android is a trademark of Google LLC. -[contributors-shield]: https://img.shields.io/github/contributors/capcom6/sms-gateway.svg?style=for-the-badge -[contributors-url]: https://github.com/capcom6/sms-gateway/graphs/contributors -[forks-shield]: https://img.shields.io/github/forks/capcom6/sms-gateway.svg?style=for-the-badge -[forks-url]: https://github.com/capcom6/sms-gateway/network/members -[stars-shield]: https://img.shields.io/github/stars/capcom6/sms-gateway.svg?style=for-the-badge -[stars-url]: https://github.com/capcom6/sms-gateway/stargazers -[issues-shield]: https://img.shields.io/github/issues/capcom6/sms-gateway.svg?style=for-the-badge -[issues-url]: https://github.com/capcom6/sms-gateway/issues -[license-shield]: https://img.shields.io/github/license/capcom6/sms-gateway.svg?style=for-the-badge -[license-url]: https://github.com/capcom6/sms-gateway/blob/master/LICENSE \ No newline at end of file +[contributors-shield]: https://img.shields.io/github/contributors/android-sms-gateway/server.svg?style=for-the-badge +[contributors-url]: https://github.com/android-sms-gateway/server/graphs/contributors +[forks-shield]: https://img.shields.io/github/forks/android-sms-gateway/server.svg?style=for-the-badge +[forks-url]: https://github.com/android-sms-gateway/server/network/members +[stars-shield]: https://img.shields.io/github/stars/android-sms-gateway/server.svg?style=for-the-badge +[stars-url]: https://github.com/android-sms-gateway/server/stargazers +[issues-shield]: https://img.shields.io/github/issues/android-sms-gateway/server.svg?style=for-the-badge +[issues-url]: https://github.com/android-sms-gateway/server/issues +[license-shield]: https://img.shields.io/github/license/android-sms-gateway/server.svg?style=for-the-badge +[license-url]: https://github.com/android-sms-gateway/server/blob/master/LICENSE diff --git a/cmd/sms-gateway/main.go b/cmd/sms-gateway/main.go index 7f98b9d..46d0108 100644 --- a/cmd/sms-gateway/main.go +++ b/cmd/sms-gateway/main.go @@ -1,7 +1,7 @@ package main import ( - smsgateway "github.com/capcom6/sms-gateway/internal/sms-gateway" + smsgateway "github.com/android-sms-gateway/server/internal/sms-gateway" ) // @securitydefinitions.basic ApiAuth diff --git a/go.mod b/go.mod index 46521d5..e271f35 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/capcom6/sms-gateway +module github.com/android-sms-gateway/server go 1.22.0 diff --git a/internal/config/module.go b/internal/config/module.go index 5d4c6a4..4f90bff 100644 --- a/internal/config/module.go +++ b/internal/config/module.go @@ -3,14 +3,14 @@ package config import ( "time" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push" "github.com/capcom6/go-infra-fx/config" "github.com/capcom6/go-infra-fx/db" "github.com/capcom6/go-infra-fx/http" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/internal/sms-gateway/app.go b/internal/sms-gateway/app.go index 4b21bc2..725c7d1 100644 --- a/internal/sms-gateway/app.go +++ b/internal/sms-gateway/app.go @@ -4,22 +4,22 @@ import ( "context" "sync" + appconfig "github.com/android-sms-gateway/server/internal/config" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/cleaner" + appdb "github.com/android-sms-gateway/server/internal/sms-gateway/modules/db" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/health" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/metrics" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/webhooks" "github.com/capcom6/go-infra-fx/cli" "github.com/capcom6/go-infra-fx/db" "github.com/capcom6/go-infra-fx/http" "github.com/capcom6/go-infra-fx/logger" "github.com/capcom6/go-infra-fx/validator" - appconfig "github.com/capcom6/sms-gateway/internal/config" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/cleaner" - appdb "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/health" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/metrics" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/webhooks" "go.uber.org/fx" "go.uber.org/fx/fxevent" "go.uber.org/zap" diff --git a/internal/sms-gateway/handlers/3rdparty.go b/internal/sms-gateway/handlers/3rdparty.go index ba74697..6df1934 100644 --- a/internal/sms-gateway/handlers/3rdparty.go +++ b/internal/sms-gateway/handlers/3rdparty.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - devicesCtrl "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/logs" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/webhooks" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + devicesCtrl "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/logs" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/basicauth" diff --git a/internal/sms-gateway/handlers/converters/devices.go b/internal/sms-gateway/handlers/converters/devices.go index 6e1844c..4dd0918 100644 --- a/internal/sms-gateway/handlers/converters/devices.go +++ b/internal/sms-gateway/handlers/converters/devices.go @@ -2,7 +2,7 @@ package converters import ( "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" ) func DeviceToDTO(device *models.Device) *smsgateway.Device { diff --git a/internal/sms-gateway/handlers/converters/devices_test.go b/internal/sms-gateway/handlers/converters/devices_test.go index 0d9fca5..289e428 100644 --- a/internal/sms-gateway/handlers/converters/devices_test.go +++ b/internal/sms-gateway/handlers/converters/devices_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/converters" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/pkg/types" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/converters" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/pkg/types" "github.com/go-playground/assert/v2" ) diff --git a/internal/sms-gateway/handlers/devices/3rdparty.go b/internal/sms-gateway/handlers/devices/3rdparty.go index 14be714..9be5099 100644 --- a/internal/sms-gateway/handlers/devices/3rdparty.go +++ b/internal/sms-gateway/handlers/devices/3rdparty.go @@ -4,12 +4,12 @@ import ( "fmt" "github.com/android-sms-gateway/client-go/smsgateway" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/pkg/types" "github.com/capcom6/go-helpers/slices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/pkg/types" "github.com/gofiber/fiber/v2" "go.uber.org/fx" "go.uber.org/zap" diff --git a/internal/sms-gateway/handlers/health.go b/internal/sms-gateway/handlers/health.go index 32c1701..d5c6809 100644 --- a/internal/sms-gateway/handlers/health.go +++ b/internal/sms-gateway/handlers/health.go @@ -2,10 +2,10 @@ package handlers import ( "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/health" - "github.com/capcom6/sms-gateway/internal/version" - "github.com/capcom6/sms-gateway/pkg/maps" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/health" + "github.com/android-sms-gateway/server/internal/version" + "github.com/android-sms-gateway/server/pkg/maps" "github.com/gofiber/fiber/v2" "go.uber.org/fx" "go.uber.org/zap" diff --git a/internal/sms-gateway/handlers/logs/3rdparty.go b/internal/sms-gateway/handlers/logs/3rdparty.go index e663b0c..080ad58 100644 --- a/internal/sms-gateway/handlers/logs/3rdparty.go +++ b/internal/sms-gateway/handlers/logs/3rdparty.go @@ -1,9 +1,9 @@ package logs import ( - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "go.uber.org/fx" diff --git a/internal/sms-gateway/handlers/mobile.go b/internal/sms-gateway/handlers/mobile.go index 570b0b8..ff9977d 100644 --- a/internal/sms-gateway/handlers/mobile.go +++ b/internal/sms-gateway/handlers/mobile.go @@ -6,14 +6,14 @@ import ( "strings" "github.com/android-sms-gateway/client-go/smsgateway" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/converters" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/messages" "github.com/capcom6/go-infra-fx/http/apikey" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/converters" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/webhooks" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/messages" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/limiter" diff --git a/internal/sms-gateway/handlers/module.go b/internal/sms-gateway/handlers/module.go index cfacb76..60cf686 100644 --- a/internal/sms-gateway/handlers/module.go +++ b/internal/sms-gateway/handlers/module.go @@ -1,10 +1,10 @@ package handlers import ( + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/logs" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/webhooks" "github.com/capcom6/go-infra-fx/http" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/logs" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/webhooks" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/internal/sms-gateway/handlers/root.go b/internal/sms-gateway/handlers/root.go index 3d55bc7..31f733e 100644 --- a/internal/sms-gateway/handlers/root.go +++ b/internal/sms-gateway/handlers/root.go @@ -3,7 +3,7 @@ package handlers import ( "net/http" - "github.com/capcom6/sms-gateway/pkg/swagger" + "github.com/android-sms-gateway/server/pkg/swagger" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/filesystem" ) diff --git a/internal/sms-gateway/handlers/upstream.go b/internal/sms-gateway/handlers/upstream.go index 1eb2c2b..ace97f5 100644 --- a/internal/sms-gateway/handlers/upstream.go +++ b/internal/sms-gateway/handlers/upstream.go @@ -4,9 +4,9 @@ import ( "time" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push" - "github.com/capcom6/sms-gateway/pkg/types" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push" + "github.com/android-sms-gateway/server/pkg/types" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "github.com/gofiber/fiber/v2/middleware/limiter" diff --git a/internal/sms-gateway/handlers/webhooks/3rdparty.go b/internal/sms-gateway/handlers/webhooks/3rdparty.go index e4f1aab..79d09ea 100644 --- a/internal/sms-gateway/handlers/webhooks/3rdparty.go +++ b/internal/sms-gateway/handlers/webhooks/3rdparty.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/webhooks" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/webhooks" "github.com/go-playground/validator/v10" "github.com/gofiber/fiber/v2" "go.uber.org/fx" diff --git a/internal/sms-gateway/handlers/webhooks/mobile.go b/internal/sms-gateway/handlers/webhooks/mobile.go index 78dd090..5222b70 100644 --- a/internal/sms-gateway/handlers/webhooks/mobile.go +++ b/internal/sms-gateway/handlers/webhooks/mobile.go @@ -3,10 +3,10 @@ package webhooks import ( "fmt" - "github.com/capcom6/sms-gateway/internal/sms-gateway/handlers/base" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/auth" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/webhooks" + "github.com/android-sms-gateway/server/internal/sms-gateway/handlers/base" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/auth" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/webhooks" "github.com/gofiber/fiber/v2" "go.uber.org/fx" "go.uber.org/zap" diff --git a/internal/sms-gateway/models/models_test.go b/internal/sms-gateway/models/models_test.go index 777d8c5..2ce82db 100644 --- a/internal/sms-gateway/models/models_test.go +++ b/internal/sms-gateway/models/models_test.go @@ -3,7 +3,7 @@ package models_test import ( "testing" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" ) func TestDevice_IsEmpty(t *testing.T) { diff --git a/internal/sms-gateway/modules/auth/decorators.go b/internal/sms-gateway/modules/auth/decorators.go index 63dad97..a4eb67a 100644 --- a/internal/sms-gateway/modules/auth/decorators.go +++ b/internal/sms-gateway/modules/auth/decorators.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" "github.com/gofiber/fiber/v2" ) diff --git a/internal/sms-gateway/modules/auth/repository.go b/internal/sms-gateway/modules/auth/repository.go index 6db97f4..579300f 100644 --- a/internal/sms-gateway/modules/auth/repository.go +++ b/internal/sms-gateway/modules/auth/repository.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" "gorm.io/gorm" ) diff --git a/internal/sms-gateway/modules/auth/service.go b/internal/sms-gateway/modules/auth/service.go index a2145e0..dd8a274 100644 --- a/internal/sms-gateway/modules/auth/service.go +++ b/internal/sms-gateway/modules/auth/service.go @@ -6,10 +6,10 @@ import ( "fmt" "time" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/pkg/crypto" - "github.com/capcom6/sms-gateway/pkg/types/cache" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/pkg/crypto" + "github.com/android-sms-gateway/server/pkg/types/cache" "github.com/jaevor/go-nanoid" "go.uber.org/fx" "go.uber.org/zap" diff --git a/internal/sms-gateway/modules/devices/module.go b/internal/sms-gateway/modules/devices/module.go index 59ac8b2..3efa8ae 100644 --- a/internal/sms-gateway/modules/devices/module.go +++ b/internal/sms-gateway/modules/devices/module.go @@ -1,7 +1,7 @@ package devices import ( - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/cleaner" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/cleaner" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/internal/sms-gateway/modules/devices/repository.go b/internal/sms-gateway/modules/devices/repository.go index cfe826b..c0421a9 100644 --- a/internal/sms-gateway/modules/devices/repository.go +++ b/internal/sms-gateway/modules/devices/repository.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" "gorm.io/gorm" ) diff --git a/internal/sms-gateway/modules/devices/service.go b/internal/sms-gateway/modules/devices/service.go index f44de74..9e8df1b 100644 --- a/internal/sms-gateway/modules/devices/service.go +++ b/internal/sms-gateway/modules/devices/service.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/db" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/internal/sms-gateway/modules/messages/module.go b/internal/sms-gateway/modules/messages/module.go index 142a949..f672cdc 100644 --- a/internal/sms-gateway/modules/messages/module.go +++ b/internal/sms-gateway/modules/messages/module.go @@ -1,7 +1,7 @@ package messages import ( - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/cleaner" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/cleaner" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/internal/sms-gateway/modules/messages/repository.go b/internal/sms-gateway/modules/messages/repository.go index 63254d7..0d572a1 100644 --- a/internal/sms-gateway/modules/messages/repository.go +++ b/internal/sms-gateway/modules/messages/repository.go @@ -6,7 +6,7 @@ import ( "errors" "time" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" "github.com/go-sql-driver/mysql" "gorm.io/gorm" "gorm.io/gorm/clause" diff --git a/internal/sms-gateway/modules/messages/service.go b/internal/sms-gateway/modules/messages/service.go index 1ec2054..bb33d2f 100644 --- a/internal/sms-gateway/modules/messages/service.go +++ b/internal/sms-gateway/modules/messages/service.go @@ -8,11 +8,11 @@ import ( "time" "github.com/android-sms-gateway/client-go/smsgateway" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/db" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push" + "github.com/android-sms-gateway/server/pkg/types" "github.com/capcom6/go-helpers/slices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push" - "github.com/capcom6/sms-gateway/pkg/types" "github.com/nyaruka/phonenumbers" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/internal/sms-gateway/modules/messages/service_test.go b/internal/sms-gateway/modules/messages/service_test.go index 920c7c3..2c4f9d8 100644 --- a/internal/sms-gateway/modules/messages/service_test.go +++ b/internal/sms-gateway/modules/messages/service_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" ) func TestService_recipientsStateToModel(t *testing.T) { diff --git a/internal/sms-gateway/modules/push/fcm/client.go b/internal/sms-gateway/modules/push/fcm/client.go index 71bdd2a..930b379 100644 --- a/internal/sms-gateway/modules/push/fcm/client.go +++ b/internal/sms-gateway/modules/push/fcm/client.go @@ -8,7 +8,7 @@ import ( firebase "firebase.google.com/go/v4" "firebase.google.com/go/v4/messaging" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/domain" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/domain" "google.golang.org/api/option" ) diff --git a/internal/sms-gateway/modules/push/module.go b/internal/sms-gateway/modules/push/module.go index 9a0b917..269e511 100644 --- a/internal/sms-gateway/modules/push/module.go +++ b/internal/sms-gateway/modules/push/module.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/fcm" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/upstream" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/fcm" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/upstream" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/internal/sms-gateway/modules/push/service.go b/internal/sms-gateway/modules/push/service.go index 4641ac9..14a8308 100644 --- a/internal/sms-gateway/modules/push/service.go +++ b/internal/sms-gateway/modules/push/service.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/capcom6/sms-gateway/pkg/types/cache" + "github.com/android-sms-gateway/server/pkg/types/cache" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "go.uber.org/fx" diff --git a/internal/sms-gateway/modules/push/types.go b/internal/sms-gateway/modules/push/types.go index d94c65d..55b24ac 100644 --- a/internal/sms-gateway/modules/push/types.go +++ b/internal/sms-gateway/modules/push/types.go @@ -4,7 +4,7 @@ import ( "context" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/domain" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/domain" ) type Mode string diff --git a/internal/sms-gateway/modules/push/upstream/client.go b/internal/sms-gateway/modules/push/upstream/client.go index 9d31bd3..72c79a3 100644 --- a/internal/sms-gateway/modules/push/upstream/client.go +++ b/internal/sms-gateway/modules/push/upstream/client.go @@ -10,7 +10,7 @@ import ( "sync" "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push/domain" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push/domain" ) const BASE_URL = "https://api.sms-gate.app/upstream/v1" diff --git a/internal/sms-gateway/modules/webhooks/models.go b/internal/sms-gateway/modules/webhooks/models.go index 4d10667..d1108ec 100644 --- a/internal/sms-gateway/modules/webhooks/models.go +++ b/internal/sms-gateway/modules/webhooks/models.go @@ -2,7 +2,7 @@ package webhooks import ( "github.com/android-sms-gateway/client-go/smsgateway" - "github.com/capcom6/sms-gateway/internal/sms-gateway/models" + "github.com/android-sms-gateway/server/internal/sms-gateway/models" "gorm.io/gorm" ) diff --git a/internal/sms-gateway/modules/webhooks/service.go b/internal/sms-gateway/modules/webhooks/service.go index 3ba0bea..f127ba1 100644 --- a/internal/sms-gateway/modules/webhooks/service.go +++ b/internal/sms-gateway/modules/webhooks/service.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/android-sms-gateway/client-go/smsgateway" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/db" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/devices" + "github.com/android-sms-gateway/server/internal/sms-gateway/modules/push" "github.com/capcom6/go-helpers/slices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/db" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/devices" - "github.com/capcom6/sms-gateway/internal/sms-gateway/modules/push" "go.uber.org/fx" "go.uber.org/zap" ) diff --git a/pkg/types/cache/cache_test.go b/pkg/types/cache/cache_test.go index 805515f..95a3a8a 100644 --- a/pkg/types/cache/cache_test.go +++ b/pkg/types/cache/cache_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/capcom6/sms-gateway/pkg/types/cache" + "github.com/android-sms-gateway/server/pkg/types/cache" ) func TestCache_Set(t *testing.T) {