From 80d8018905f1ad9a2319454b4f21e0cd7e67a0b1 Mon Sep 17 00:00:00 2001
From: Astra <astra@zio.sh>
Date: Tue, 10 Mar 2026 06:44:52 +0000
Subject: [PATCH] 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/.gitignore    |  1 +
 scripts/sync.sh       | 13 +++----------
 8 files changed, 11 insertions(+), 17 deletions(-)
 create mode 100644 scripts/.gitignore

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 550827a..f14f0ee 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -13,23 +13,16 @@ PATCH_FILE="$ROOT_DIR/patches/0001-nuzzles.patch"
 # ── 1. Ensure submodule is initialised ────────────────────────────────────────
 echo "→ Updating submodule..."
 
-# Capture the submodule commit before update
-OLD_COMMIT=$(git -C "$SUBMODULE_DIR" rev-parse HEAD 2>/dev/null || echo "")
-
 # Update the submodule
 git -C "$ROOT_DIR" submodule update --init --recursive --remote
 
-# Capture the submodule commit after update
-NEW_COMMIT=$(git -C "$SUBMODULE_DIR" rev-parse HEAD 2>/dev/null || echo "")
-
 # ── 2. Wipe and re-copy the submodule source ──────────────────────────────────
 echo "→ Copying telegram-join-approval-bot source to root..."
 # Clean up directories that will be replaced
-rm -rf "$ROOT_DIR/cmd" "$ROOT_DIR/internal" "$ROOT_DIR/go.mod" "$ROOT_DIR/go.sum" "$ROOT_DIR/config.yaml.example"
+rm -rf "$ROOT_DIR/config" "$ROOT_DIR/handlers" "$ROOT_DIR/pkg" "$ROOT_DIR/main.go"  "$ROOT_DIR/go.mod" "$ROOT_DIR/go.sum"
 
 # Copy source files, excluding .git and keeping patches/ and scripts/
-rsync -a --stats --exclude='.git' --exclude='internal/telegram-join-approval-bot' \
-  "$SUBMODULE_DIR/" "$ROOT_DIR/" \
+rsync -a --stats --exclude='.git' "$SUBMODULE_DIR/" "$ROOT_DIR/" \
   --exclude='patches' --exclude='scripts' --exclude='README.md' --exclude='Dockerfile'
 
 # Remove scripts/ from .gitignore so we can track our sync script
@@ -42,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/*" | 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