From b5fc6c0c1a8d96cd97dfb0ad97d12f05a73f9b21 Mon Sep 17 00:00:00 2001 From: Astra Date: Mon, 9 Mar 2026 20:59:57 +0000 Subject: [PATCH] Update telegram-approval-join submodule and apply patches --- Dockerfile | 6 +++--- 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 | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1dd51bc..588051c 100644 --- a/Dockerfile +++ b/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-join-approval-nuzzles +COPY --from=builder /bin/telegram-approval-join /usr/local/bin/telegram-approval-join # 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-join-approval-nuzzles + chown -R app:app /opt /usr/local/bin/telegram-approval-join # Run as the created non-root user USER app:app -ENTRYPOINT ["/usr/local/bin/telegram-join-approval-nuzzles"] \ No newline at end of file +ENTRYPOINT ["/usr/local/bin/telegram-approval-join"] \ No newline at end of file diff --git a/go.mod b/go.mod index 946fb1a..b40ea65 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module git.zio.sh/astra/telegram-approval-join-nuzzles +module git.zio.sh/astra/telegram-join-approval-nuzzles go 1.25.3 diff --git a/handlers/admin.go b/handlers/admin.go index 46e2a8b..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-nuzzles/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 8ef2573..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-nuzzles/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 bce80c6..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-nuzzles/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 b13710b..04a2f4e 100644 --- a/handlers/join.go +++ b/handlers/join.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - utils "git.zio.sh/astra/telegram-approval-join-nuzzles/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 cca6977..06766a1 100644 --- a/main.go +++ b/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "git.zio.sh/astra/telegram-approval-join-nuzzles/config" - "git.zio.sh/astra/telegram-approval-join-nuzzles/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 9773c99..670375f 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -42,13 +42,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-approval-join-nuzzles +# Change the module from telegram-approval-join 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-approval-join-nuzzles|" "$ROOT_DIR/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" # 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-approval-join-nuzzles|g' +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' # ── 4. Apply string patch ──────────────────────────────────────────── if [[ -f "$PATCH_FILE" ]]; then