astra/telegram-join-approval-nuzzles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update telegram-approval-join submodule and apply patches

Browse source
This commit is contained in:
Astra 2026-03-09 20:59:57 +00:00
parent 655276d1f9
commit b5fc6c0c1a
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile
View file

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

2
go.mod
View file

@ -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 go 1.25.3

2
handlers/admin.go
View file

@ -5,7 +5,7 @@ import (
"log" "log"
"strings" "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" api "github.com/OvyFlash/telegram-bot-api"
) )

2
handlers/callbacks.go
View file

@ -6,7 +6,7 @@ import (
"strings" "strings"
"time" "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" api "github.com/OvyFlash/telegram-bot-api"
) )

2
handlers/handlers.go
View file

@ -3,7 +3,7 @@ package handlers
import ( import (
"sync" "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" api "github.com/OvyFlash/telegram-bot-api"
) )

2
handlers/join.go
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"log" "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" api "github.com/OvyFlash/telegram-bot-api"
) )

4
main.go
View file

@ -3,8 +3,8 @@ package main
import ( import (
"log" "log"
"git.zio.sh/astra/telegram-approval-join-nuzzles/config" "git.zio.sh/astra/telegram-join-approval-nuzzles/config"
"git.zio.sh/astra/telegram-approval-join-nuzzles/handlers" "git.zio.sh/astra/telegram-join-approval-nuzzles/handlers"
api "github.com/OvyFlash/telegram-bot-api" api "github.com/OvyFlash/telegram-bot-api"
) )

6
scripts/sync.sh
View file

@ -42,13 +42,13 @@ rsync -a --stats --exclude='.git' --exclude='internal/telegram-approval-join' \
sed -i '/^scripts\/$/d' "$ROOT_DIR/.gitignore" sed -i '/^scripts\/$/d' "$ROOT_DIR/.gitignore"
# ── 3. Rewrite the Go module path inside the copied source ──────────────────── # ── 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 ..." 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 # Fix all import references in the copied source
echo "→ Rewriting import paths in .go files ..." 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 ──────────────────────────────────────────── # ── 4. Apply string patch ────────────────────────────────────────────
if [[ -f "$PATCH_FILE" ]]; then if [[ -f "$PATCH_FILE" ]]; then