Change submodule name

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "telegram-join-approval-bot"]
+	path = telegram-join-approval-bot
+	url = ssh://git@git.zio.sh:2222/astra/telegram-join-approval-bot.git

Dockerfile

@@ -23,14 +23,14 @@ RUN apk add --no-cache ca-certificates
 WORKDIR /opt
 
 # Copy binary into a standard location
-COPY --from=builder /bin/telegram-join-approval-nuzzles /usr/local/bin/telegram-approval-join
+COPY --from=builder /bin/telegram-join-approval-nuzzles /usr/local/bin/telegram-join-approval-bot
 
 # Create a non-root user and group with specific UID:GID and set ownership
 RUN addgroup -g 65532 app && \
     adduser -D -H -u 65532 -G app -s /sbin/nologin app -h /opt && \
-    chown -R app:app /opt /usr/local/bin/telegram-approval-join
+    chown -R app:app /opt /usr/local/bin/telegram-join-approval-bot
 
 # Run as the created non-root user
 USER app:app
 
-ENTRYPOINT ["/usr/local/bin/telegram-approval-join"]
+ENTRYPOINT ["/usr/local/bin/telegram-join-approval-bot"]

scripts/sync.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# sync.sh — Copy telegram-approval-join submodule into internal/, then apply patches.
+# sync.sh — Copy telegram-join-approval-bot submodule into internal/, then apply patches.
 # Usage: ./scripts/sync.sh
 
 set -euo pipefail
@@ -7,7 +7,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
 
-SUBMODULE_DIR="$ROOT_DIR/telegram-approval-join"
+SUBMODULE_DIR="$ROOT_DIR/telegram-join-approval-bot"
 PATCH_FILE="$ROOT_DIR/patches/0001-nuzzles.patch"
 
 # ── 1. Ensure submodule is initialised ────────────────────────────────────────
@@ -22,19 +22,13 @@ 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 "")
 
-# Check if there were any changes
-# if [[ "$OLD_COMMIT" == "$NEW_COMMIT" ]] && [[ -n "$OLD_COMMIT" ]]; then
-#   echo "   Submodule is already up to date. Nothing to do."
-#   exit 0
-# fi
-
 # ── 2. Wipe and re-copy the submodule source ──────────────────────────────────
-echo "→ Copying telegram-approval-join source to root..."
+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"
 
 # Copy source files, excluding .git and keeping patches/ and scripts/
-rsync -a --stats --exclude='.git' --exclude='internal/telegram-approval-join' \
+rsync -a --stats --exclude='.git' --exclude='internal/telegram-join-approval-bot' \
   "$SUBMODULE_DIR/" "$ROOT_DIR/" \
   --exclude='patches' --exclude='scripts' --exclude='README.md' --exclude='Dockerfile'
 
@@ -42,13 +36,13 @@ rsync -a --stats --exclude='.git' --exclude='internal/telegram-approval-join' \
 sed -i '/^scripts\/$/d' "$ROOT_DIR/.gitignore"
 
 # ── 3. Rewrite the Go module path inside the copied source ────────────────────
-# Change the module from telegram-approval-join to telegram-join-approval-nuzzles
+# Change the module from telegram-join-approval-bot to telegram-join-approval-nuzzles
 echo "→ Rewriting module path in go.mod ..."
-sed -i "s|^module git\.zio\.sh/astra/telegram-approval-join|module git.zio.sh/astra/telegram-join-approval-nuzzles|" "$ROOT_DIR/go.mod"
+sed -i "s|^module git\.zio\.sh/astra/telegram-join-approval-bot|module git.zio.sh/astra/telegram-join-approval-nuzzles|" "$ROOT_DIR/go.mod"
 
 # Fix all import references in the copied source
 echo "→ Rewriting import paths in .go files ..."
-find "$ROOT_DIR" -name '*.go' -not -path "*/telegram-approval-join/*" | xargs sed -i 's|git\.zio\.sh/astra/telegram-approval-join|git.zio.sh/astra/telegram-join-approval-nuzzles|g'
+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'
 
 # ── 4. Apply string patch ────────────────────────────────────────────
 if [[ -f "$PATCH_FILE" ]]; then
@@ -59,7 +53,7 @@ if [[ -f "$PATCH_FILE" ]]; then
     echo "   Patch applied successfully."
   else
     echo ""
-    echo "⚠️  Patch did not apply cleanly — telegram-approval-join may have changed."
+    echo "⚠️  Patch did not apply cleanly — telegram-join-approval-bot may have changed."
     echo "   Run the following to see conflicts:"
     echo "     patch --dry-run -p1 -d $ROOT_DIR < $PATCH_FILE"
     echo ""
@@ -77,7 +71,7 @@ go build ./... 2>&1 && echo "   Build OK." || { echo "❌ Build failed."; exit 1
 # ── 6. Commit changes ─────────────────────────────────────────────────────────
 echo "→ Committing changes..."
 git -C "$ROOT_DIR" add -A
-git -C "$ROOT_DIR" commit -m "Update telegram-approval-join submodule and apply patches" || true
+git -C "$ROOT_DIR" commit -m "Update telegram-join-approval-bot submodule and apply patches" || true
 
 echo ""
-echo "✅ Sync complete. Root directory is up to date with telegram-approval-join (patched)."
+echo "✅ Sync complete. Root directory is up to date with telegram-join-approval-bot (patched)."

telegram-join-approval-bot

@@ -0,0 +1 @@
+Subproject commit 1c48c2a40ccc8d83ef2bff80fd4d5f9b848afab2