diff --git a/go.mod b/go.mod index b40ea65..ccc0e15 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.zio.sh/astra/telegram-join-approval-nuzzles +module git.zio.sh/astra/telegram-approval-join go 1.25.3 diff --git a/handlers/admin.go b/handlers/admin.go index e779c8d..982f3e5 100644 --- a/handlers/admin.go +++ b/handlers/admin.go @@ -5,7 +5,7 @@ import ( "log" "strings" - utils "git.zio.sh/astra/telegram-join-approval-nuzzles/pkg/utils" + utils "git.zio.sh/astra/telegram-approval-join/pkg/utils" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/handlers/callbacks.go b/handlers/callbacks.go index 59afc85..c086d0a 100644 --- a/handlers/callbacks.go +++ b/handlers/callbacks.go @@ -6,7 +6,7 @@ import ( "strings" "time" - utils "git.zio.sh/astra/telegram-join-approval-nuzzles/pkg/utils" + utils "git.zio.sh/astra/telegram-approval-join/pkg/utils" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/handlers/handlers.go b/handlers/handlers.go index 84136ee..e840a71 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -3,7 +3,7 @@ package handlers import ( "sync" - config "git.zio.sh/astra/telegram-join-approval-nuzzles/config" + config "git.zio.sh/astra/telegram-approval-join/config" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/handlers/join.go b/handlers/join.go index b050d11..2e7cea0 100644 --- a/handlers/join.go +++ b/handlers/join.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - utils "git.zio.sh/astra/telegram-join-approval-nuzzles/pkg/utils" + utils "git.zio.sh/astra/telegram-approval-join/pkg/utils" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/main.go b/main.go index 06766a1..cbed5cf 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "git.zio.sh/astra/telegram-join-approval-nuzzles/config" - "git.zio.sh/astra/telegram-join-approval-nuzzles/handlers" + "git.zio.sh/astra/telegram-approval-join/config" + "git.zio.sh/astra/telegram-approval-join/handlers" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/scripts/.gitignore b/scripts/.gitignore new file mode 100644 index 0000000..5b6b072 --- /dev/null +++ b/scripts/.gitignore @@ -0,0 +1 @@ +config.yaml diff --git a/scripts/sync.sh b/scripts/sync.sh index 23090b4..f14f0ee 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -35,7 +35,7 @@ sed -i "s|^module git\.zio\.sh/astra/telegram-join-approval-bot|module git.zio.s # Fix all import references in the copied source echo "→ Rewriting import paths in .go files ..." -find "$ROOT_DIR" -name '*.go' -not -path "*/telegram-join-approval-nuzzles/telegram-join-approval-bot/*" | xargs sed -i 's|git\.zio\.sh/astra/telegram-join-approval-bot|git.zio.sh/astra/telegram-join-approval-nuzzles|g' +find "$ROOT_DIR" -name '*.go' -not -path "*/telegram-join-approval-bot/telegram-join-approval-bot/*" | xargs sed -i 's|git\.zio\.sh/astra/telegram-join-approval-bot|git.zio.sh/astra/telegram-join-approval-nuzzles|g' # ── 4. Apply string patch ──────────────────────────────────────────── if [[ -f "$PATCH_FILE" ]]; then @@ -59,8 +59,7 @@ fi # ── 5. Verify it builds ─────────────────────────────────────────────────────── echo "→ Verifying build ..." -go build "$ROOT_DIR" 2>&1 && echo " Build OK." || { echo "❌ Build failed."; exit 1; } -rm "$SCRIPT_DIR/telegram-join-approval-nuzzles" +go build ./... 2>&1 && echo " Build OK." || { echo "❌ Build failed."; exit 1; } # ── 6. Commit changes ───────────────────────────────────────────────────────── echo "→ Committing changes..." diff --git a/telegram-join-approval-bot b/telegram-join-approval-bot index 4f3a0b9..1c48c2a 160000 --- a/telegram-join-approval-bot +++ b/telegram-join-approval-bot @@ -1 +1 @@ -Subproject commit 4f3a0b9b06c097480e161d5351dcce50ea0692d0 +Subproject commit 1c48c2a40ccc8d83ef2bff80fd4d5f9b848afab2