Merge pull request #24 from libost/dev

Release 1.9.4

Author: libost

.github/workflows/go.yml

@@ -36,7 +36,7 @@ permissions:
 
 jobs:
   release:
-    name: Release
+    name: Pre-Release
     if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
     runs-on: ubuntu-latest
     steps:
@@ -51,7 +51,7 @@ jobs:
           go-version: "1.25.0"
 
       - name: Delete existing dev release
-        uses: andreaswilli/delete-release-assets-action@main
+        uses: 8Mi-Tech/delete-release-assets-action@main
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           tag: "v0.0.0-dev"
@@ -75,6 +75,13 @@ jobs:
           git push -f origin "${DEV_TAG}"
           echo "DEV_TAG=${DEV_TAG}" >> $GITHUB_ENV
 
+      - name: Extract trigger commit message
+        id: extract_commit
+        run: |
+           echo "TRIGGER_COMMIT_MSG<<EOF" >> $GITHUB_OUTPUT
+           echo "${{ github.event.head_commit.message }}" >> $GITHUB_OUTPUT
+           echo "EOF" >> $GITHUB_OUTPUT
+
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v7
         with:
@@ -83,6 +90,7 @@ jobs:
           args: release --clean
         env:
           RELEASE_CHANNEL: dev
+          COMMIT_MESSAGE: ${{ steps.extract_commit.outputs.TRIGGER_COMMIT_MSG }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
           FEEDBACK: https://t.me/bangdream_feedback_bot

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Auto Release
+name: Stable Release
 
 on:
   push:
@@ -33,4 +33,30 @@ jobs:
           RELEASE_CHANNEL: stable
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
-          FEEDBACK: https://t.me/bangdream_feedback_bot
+          FEEDBACK: https://t.me/bangdream_feedback_bot
+  sync-branches:
+    name: Sync Branches
+    needs: release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Sync branches
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git fetch origin main dev
+          git checkout dev
+
+          # Prefer fast-forward; if not possible, create a merge commit
+          if git merge --ff-only origin/main; then
+            echo "Fast-forwarded dev to main"
+          else
+            git merge --no-ff origin/main -m "chore: sync main into dev after stable release"
+          fi
+
+          git push origin dev

.goreleaser.yml

@@ -120,6 +120,8 @@ announce:
 
       {{ if eq .Env.RELEASE_CHANNEL "dev" }}🚀 {{ .ProjectName | mdv2escape }} 新测试版发行: {{ .ShortCommit | mdv2escape }}{{ else }}🎉 {{ .ProjectName | mdv2escape }} 新版本发行: {{ .Tag | mdv2escape }}{{ end }}  
 
+      {{ if eq .Env.RELEASE_CHANNEL "dev" }}`{{ .ShortCommit | mdv2escape }}`: {{ .Env.COMMIT_MESSAGE | mdv2escape }}{{ end }}
+
       [有问题点我反馈]({{ .Env.FEEDBACK | mdv2escape }}) 
 
       [更新日志]({{ .ReleaseURL }})

callback/callback.go

@@ -182,6 +182,44 @@ func removeZipFiles(zipPaths []string) {
 }
 
 func GetPack(b *gotgbot.Bot, ctx *ext.Context, packName string, langCode string, msgId int64) error {
+	currentUsage, err := database.Init("usage", ctx.EffectiveUser.Id, nil)
+	if err != nil {
+		return err
+	}
+	if !currentUsage["exists"].(bool) {
+		database.Init("create", ctx.EffectiveUser.Id, nil)
+		currentUsage["usage"] = float64(0)
+		currentUsage["last_cycle_starts_at"] = float64(time.Now().Unix())
+	}
+	subErr := utils.SubscribeCheck(b, ctx, ctx.EffectiveUser.Id, langCode)
+	if subErr != nil {
+		return nil // 用户未订阅，已在 SubscribeCheck 中发送提示消息，直接返回不继续处理
+	}
+	limit := config.AppConfig.General.Limit
+	userGroup, err := database.Init("user_group", ctx.EffectiveUser.Id, nil)
+	if err != nil {
+		return err
+	}
+	if userGroup["user_group"] == "sponsor" && config.AppConfig.Donation.BonusEnabled {
+		limit = int(float64(config.AppConfig.General.Limit) * C.DonationBonusMultiplier) // 赞助用户的使用限制增加奖励倍数
+	}
+	if int(currentUsage["usage"].(float64)) >= limit && (int(currentUsage["last_cycle_starts_at"].(float64))+24*3600) >= int(time.Now().Unix()) {
+		displayText := fmt.Sprintf(I.GetLocalisedString("general.out_of_quota", langCode), limit)
+		if userGroup["user_group"] != "sponsor" && config.AppConfig.Donation.Enabled && config.AppConfig.Donation.BonusEnabled {
+			displayText += I.GetLocalisedString("general.donate_reminder_outofquota", langCode)
+		}
+		if userGroup["user_group"] == "sponsor" && config.AppConfig.Donation.BonusEnabled {
+			displayText += I.GetLocalisedString("general.donated", langCode)
+		}
+		_, _, _ = b.EditMessageText(displayText, &gotgbot.EditMessageTextOpts{
+			ChatId:    ctx.EffectiveChat.Id,
+			MessageId: msgId,
+		})
+		err := C.ErrOutofQuota
+		return err
+	} else if (int(currentUsage["last_cycle_starts_at"].(float64)) + 24*3600) < int(time.Now().Unix()) {
+		database.Init("reset_usage", ctx.EffectiveUser.Id, nil)
+	}
 	zipPaths, err := stickers.GetStickerPack(b, packName, ctx.EffectiveUser.Id, msgId, ctx)
 	var limitErr *stickers.StickerPackLimitError
 	if errors.As(err, &limitErr) {

commands/commands.go

@@ -143,6 +143,11 @@ func start(b *gotgbot.Bot, ctx *ext.Context) error {
 		}
 		err = callback.GetPack(b, ctx, param, langCode, msg.GetMessageId())
 		if err != nil {
+			if errors.Is(err, S.ErrUserConversionInProgress) {
+				return nil // 已在 callback.GetPack 中回复过转换中的消息，这里直接返回不再重复回复
+			} else if errors.Is(err, C.ErrOutofQuota) {
+				return nil // 已在 callback.GetPack 中回复过超出配额的消息，这里直接返回不再重复回复
+			}
 			log.Log(fmt.Sprintf("User %d failed to get sticker pack with parameter %s: %v", ctx.EffectiveUser.Id, param, err), C.LogLevelError)
 			_, err = ctx.EffectiveMessage.Reply(b, I.GetLocalisedString("commands.get_desc_failed", langCode), nil)
 			return err

config/config.go

@@ -62,7 +62,6 @@ type Config struct {
 	} `yaml:"donation,omitempty"`
 	Misc struct {
 		Timezone string `yaml:"timezone" default:"Asia/Shanghai"`
-		//SelfUse  bool   `yaml:"self_use" default:"false"`
 	} `yaml:"misc,omitempty"`
 }
 

constants/constants.go

@@ -1,6 +1,7 @@
 package constants
 
 import (
+	"errors"
 	"path/filepath"
 	"strings"
 	"time"
@@ -136,3 +137,7 @@ func CurrentTime(timezone string) (string, error) {
 	}
 	return time.Now().In(loc).Format("2006-01-02 15:04:05"), err
 }
+
+var (
+	ErrOutofQuota = errors.New("out of quota")
+)

main.go

@@ -340,7 +340,7 @@ func buildWebhookOptions(cfg *config.Config) (ext.WebhookOpts, *gotgbot.SetWebho
 		DropPendingUpdates: true,
 	}
 
-	if cfg.Webhook.NginxEnabled {
+	if cfg.Webhook.NginxEnabled && os.Getenv("IN_DOCKER") != "true" {
 		webhookOpts.ListenAddr = fmt.Sprintf("127.0.0.1:%d", cfg.Webhook.Port)
 		return webhookOpts, setWebhookOpts
 	}

stickers/stickers.go

@@ -63,6 +63,7 @@ func stickerHandler(b *gotgbot.Bot, ctx *ext.Context) error {
 	if !currentUsage["exists"].(bool) {
 		database.Init("create", ctx.EffectiveUser.Id, nil)
 		currentUsage["usage"] = float64(0)
+		currentUsage["last_cycle_starts_at"] = float64(time.Now().Unix())
 	}
 	langCode := I.LangCodePrefer(ctx.EffectiveUser.Id, ctx.EffectiveUser.LanguageCode)
 	subErr := utils.SubscribeCheck(b, ctx, ctx.EffectiveUser.Id, langCode)