From b00a6ff9d5e6e05f08a62a6efc2753540afc3bdf Mon Sep 17 00:00:00 2001 From: Astra Date: Tue, 10 Mar 2026 06:56:47 +0000 Subject: [PATCH 1/3] Remove .gitignore --- scripts/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 scripts/.gitignore diff --git a/scripts/.gitignore b/scripts/.gitignore deleted file mode 100644 index 5b6b072..0000000 --- a/scripts/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.yaml From 2a098121475893d6eb044f7cd4ca5eb9fe7590be Mon Sep 17 00:00:00 2001 From: Astra Date: Tue, 10 Mar 2026 06:57:04 +0000 Subject: [PATCH 2/3] Update telegram-join-approval-bot submodule and apply patches --- go.mod | 2 +- handlers/admin.go | 2 +- handlers/callbacks.go | 2 +- handlers/handlers.go | 2 +- handlers/join.go | 2 +- main.go | 4 ++-- scripts/sync.sh | 3 ++- telegram-join-approval-bot | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index ccc0e15..b40ea65 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.zio.sh/astra/telegram-approval-join +module git.zio.sh/astra/telegram-join-approval-nuzzles go 1.25.3 diff --git a/handlers/admin.go b/handlers/admin.go index 982f3e5..e779c8d 100644 --- a/handlers/admin.go +++ b/handlers/admin.go @@ -5,7 +5,7 @@ import ( "log" "strings" - utils "git.zio.sh/astra/telegram-approval-join/pkg/utils" + utils "git.zio.sh/astra/telegram-join-approval-nuzzles/pkg/utils" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/handlers/callbacks.go b/handlers/callbacks.go index c086d0a..59afc85 100644 --- a/handlers/callbacks.go +++ b/handlers/callbacks.go @@ -6,7 +6,7 @@ import ( "strings" "time" - utils "git.zio.sh/astra/telegram-approval-join/pkg/utils" + utils "git.zio.sh/astra/telegram-join-approval-nuzzles/pkg/utils" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/handlers/handlers.go b/handlers/handlers.go index e840a71..84136ee 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -3,7 +3,7 @@ package handlers import ( "sync" - config "git.zio.sh/astra/telegram-approval-join/config" + config "git.zio.sh/astra/telegram-join-approval-nuzzles/config" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/handlers/join.go b/handlers/join.go index 2e7cea0..b050d11 100644 --- a/handlers/join.go +++ b/handlers/join.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - utils "git.zio.sh/astra/telegram-approval-join/pkg/utils" + utils "git.zio.sh/astra/telegram-join-approval-nuzzles/pkg/utils" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/main.go b/main.go index cbed5cf..06766a1 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "git.zio.sh/astra/telegram-approval-join/config" - "git.zio.sh/astra/telegram-approval-join/handlers" + "git.zio.sh/astra/telegram-join-approval-nuzzles/config" + "git.zio.sh/astra/telegram-join-approval-nuzzles/handlers" api "github.com/OvyFlash/telegram-bot-api" ) diff --git a/scripts/sync.sh b/scripts/sync.sh index f14f0ee..0f2c6e0 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -59,7 +59,8 @@ fi # ── 5. Verify it builds ─────────────────────────────────────────────────────── echo "→ Verifying build ..." -go build ./... 2>&1 && echo " Build OK." || { echo "❌ Build failed."; exit 1; } +go build "$ROOT_DIR" 2>&1 && echo " Build OK." || { echo "❌ Build failed."; exit 1; } +rm "$SCRIPT_DIR/telegram-join-approval-nuzzles" # ── 6. Commit changes ───────────────────────────────────────────────────────── echo "→ Committing changes..." diff --git a/telegram-join-approval-bot b/telegram-join-approval-bot index 1c48c2a..4f3a0b9 160000 --- a/telegram-join-approval-bot +++ b/telegram-join-approval-bot @@ -1 +1 @@ -Subproject commit 1c48c2a40ccc8d83ef2bff80fd4d5f9b848afab2 +Subproject commit 4f3a0b9b06c097480e161d5351dcce50ea0692d0 From 8f860142bf8e1b8b02f93089f5d4e8a2c9f02735 Mon Sep 17 00:00:00 2001 From: Astra Date: Tue, 10 Mar 2026 06:59:36 +0000 Subject: [PATCH 3/3] Update sync.sh --- scripts/sync.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sync.sh b/scripts/sync.sh index 0f2c6e0..23090b4 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-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' +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' # ── 4. Apply string patch ──────────────────────────────────────────── if [[ -f "$PATCH_FILE" ]]; then