Compare commits

...

3 commits

Author SHA1 Message Date
8f860142bf Update sync.sh 2026-03-10 06:59:36 +00:00
2a09812147 Update telegram-join-approval-bot submodule and apply patches 2026-03-10 06:57:04 +00:00
b00a6ff9d5 Remove .gitignore 2026-03-10 06:56:47 +00:00
9 changed files with 11 additions and 11 deletions

2
go.mod
View file

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

View file

@ -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"
)

View file

@ -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"
)

View file

@ -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"
)

View file

@ -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"
)

View file

@ -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"
)

1
scripts/.gitignore vendored
View file

@ -1 +0,0 @@
config.yaml

View file

@ -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
@ -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..."

@ -1 +1 @@
Subproject commit 1c48c2a40ccc8d83ef2bff80fd4d5f9b848afab2
Subproject commit 4f3a0b9b06c097480e161d5351dcce50ea0692d0