Restore the global ticket limit

bot/command/impl/statistics/statsuser.go

@@ -65,6 +65,7 @@ func (StatsUserCommand) Execute(ctx registry.CommandContext, userId uint64) {
 		var isBlacklisted bool
 		var totalTickets int
 		var openTickets int
+		var ticketLimit uint8
 
 		group, _ := errgroup.WithContext(ctx)
 
@@ -97,6 +98,19 @@ func (StatsUserCommand) Execute(ctx registry.CommandContext, userId uint64) {
 			return err
 		})
 
+		group.Go(func() (err error) {
+			span := sentry.StartSpan(span.Context(), "TicketLimit")
+			defer span.Finish()
+
+			settings, err := dbclient.Client.Settings.Get(ctx, ctx.GuildId())
+			if err != nil {
+				return err
+			}
+
+			ticketLimit = settings.TicketLimit
+			return nil
+		})
+
 		if err := group.Wait(); err != nil {
 			ctx.HandleError(err)
 			return
@@ -109,7 +123,7 @@ func (StatsUserCommand) Execute(ctx registry.CommandContext, userId uint64) {
 			fmt.Sprintf("**Permission Level**: Regular"),
 			fmt.Sprintf("**Is Blacklisted**: %s", strconv.FormatBool(isBlacklisted)),
 			fmt.Sprintf("**Total Tickets**: %d", totalTickets),
-			fmt.Sprintf("**Open Tickets**: %d", openTickets),
+			fmt.Sprintf("**Open Tickets**: %s", formatOpenTickets(openTickets, ticketLimit)),
 		}
 
 		var topSection []component.Component
@@ -390,3 +404,11 @@ func (StatsUserCommand) Execute(ctx registry.CommandContext, userId uint64) {
 		span.Finish()
 	}
 }
+
+func formatOpenTickets(openTickets int, ticketLimit uint8) string {
+	if ticketLimit == 0 {
+		return strconv.Itoa(openTickets)
+	}
+
+	return fmt.Sprintf("%d / %d", openTickets, ticketLimit)
+}

bot/logic/open.go

@@ -80,14 +80,7 @@ func OpenTicket(ctx context.Context, cmd registry.InteractionContext, panel *dat
 	// Check ticket limit before ratelimit token to prevent 1 person from stopping everyone opening tickets
 	violatesTicketLimit, limit := getTicketLimit(ctx, cmd, panel)
 	if violatesTicketLimit {
-		// Notify the user
-		ticketsPluralised := "ticket"
-		if limit > 1 {
-			ticketsPluralised += "s"
-		}
-
-		// TODO: Use translation of tickets
-		cmd.Reply(customisation.Red, i18n.Error, i18n.MessageTicketLimitReached, limit, ticketsPluralised)
+		replyTicketLimitReached(cmd, limit)
 		return database.Ticket{}, fmt.Errorf("ticket limit reached")
 	}
 
@@ -774,7 +767,29 @@ func refreshCachedChannels(ctx context.Context, worker *worker.Context, guildId
 	return worker.Cache.ReplaceChannels(ctx, guildId, channels)
 }
 
-// has hit ticket limit, ticket limit
+// TODO: Use translation of tickets
+func replyTicketLimitReached(cmd registry.CommandContext, limit int) {
+	ticketsPluralised := "ticket"
+	if limit > 1 {
+		ticketsPluralised += "s"
+	}
+
+	cmd.Reply(customisation.Red, i18n.Error, i18n.MessageTicketLimitReached, limit, ticketsPluralised)
+}
+
+// Both limits apply independently; a limit of 0 disables that check.
+func ticketLimitVerdict(panelLimit, guildLimit uint8, panelOpenCount, guildOpenCount int) (bool, int) {
+	if panelLimit > 0 && panelOpenCount >= int(panelLimit) {
+		return true, int(panelLimit)
+	}
+
+	if guildLimit > 0 && guildOpenCount >= int(guildLimit) {
+		return true, int(guildLimit)
+	}
+
+	return false, int(guildLimit)
+}
+
 func getTicketLimit(ctx context.Context, cmd registry.CommandContext, panel *database.Panel) (bool, int) {
 	isStaff, err := cmd.UserPermissionLevel(ctx)
 	if err != nil {
@@ -786,32 +801,45 @@ func getTicketLimit(ctx context.Context, cmd registry.CommandContext, panel *dat
 		return false, 50
 	}
 
-	var openTicketCount int
-	var ticketLimit uint8
+	var panelLimit uint8
+	if panel != nil && panel.TicketLimit != nil {
+		panelLimit = *panel.TicketLimit
+	}
+
+	var guildLimit uint8
+	var guildOpenCount, panelOpenCount int
 
 	group, _ := errgroup.WithContext(ctx)
 
-	if panel != nil && panel.TicketLimit != nil && *panel.TicketLimit > 0 {
-		ticketLimit = *panel.TicketLimit
+	group.Go(func() error {
+		settings, err := dbclient.Client.Settings.Get(ctx, cmd.GuildId())
+		if err != nil {
+			return err
+		}
+
+		guildLimit = settings.TicketLimit
+		return nil
+	})
+
+	group.Go(func() (err error) {
+		guildOpenCount, err = dbclient.Client.Tickets.GetOpenCountByUser(ctx, cmd.GuildId(), cmd.UserId())
+		return
+	})
+
+	if panelLimit > 0 {
 		group.Go(func() (err error) {
-			openTicketCount, err = dbclient.Client.Tickets.GetOpenCountByUserAndPanel(
+			panelOpenCount, err = dbclient.Client.Tickets.GetOpenCountByUserAndPanel(
 				ctx, cmd.GuildId(), cmd.UserId(), panel.PanelId)
 			return
 		})
-	} else {
-		ticketLimit = 5
-		group.Go(func() (err error) {
-			openTicketCount, err = dbclient.Client.Tickets.GetOpenCountByUser(ctx, cmd.GuildId(), cmd.UserId())
-			return
-		})
 	}
 
 	if err := group.Wait(); err != nil {
 		sentry.ErrorWithContext(err, cmd.ToErrorContext())
 		return true, 1
 	}
 
-	return openTicketCount >= int(ticketLimit), int(ticketLimit)
+	return ticketLimitVerdict(panelLimit, guildLimit, panelOpenCount, guildOpenCount)
 }
 
 func createWebhook(ctx context.Context, c registry.CommandContext, ticketId int, guildId, channelId uint64) error {

bot/logic/reopen.go

@@ -49,33 +49,39 @@ func ReopenTicket(ctx context.Context, cmd registry.CommandContext, ticketId int
 			}
 		}
 
-		var ticketLimit uint8
-		var openTicketCount int
+		var panelLimit uint8
+		if panel != nil && panel.TicketLimit != nil {
+			panelLimit = *panel.TicketLimit
+		}
+
+		settings, err := dbclient.Client.Settings.Get(ctx, cmd.GuildId())
+		if err != nil {
+			cmd.HandleError(err)
+			return
+		}
+
+		guildLimit := settings.TicketLimit
 
-		if panel != nil && panel.TicketLimit != nil && *panel.TicketLimit > 0 {
-			ticketLimit = *panel.TicketLimit
-			openTicketCount, err = dbclient.Client.Tickets.GetOpenCountByUserAndPanel(ctx, cmd.GuildId(), cmd.UserId(), panel.PanelId)
+		var panelOpenCount, guildOpenCount int
+
+		if panelLimit > 0 {
+			panelOpenCount, err = dbclient.Client.Tickets.GetOpenCountByUserAndPanel(ctx, cmd.GuildId(), cmd.UserId(), panel.PanelId)
 			if err != nil {
 				cmd.HandleError(err)
 				return
 			}
-		} else {
-			ticketLimit = 5
-			openTicketCount, err = dbclient.Client.Tickets.GetOpenCountByUser(ctx, cmd.GuildId(), cmd.UserId())
+		}
+
+		if guildLimit > 0 {
+			guildOpenCount, err = dbclient.Client.Tickets.GetOpenCountByUser(ctx, cmd.GuildId(), cmd.UserId())
 			if err != nil {
 				cmd.HandleError(err)
 				return
 			}
 		}
 
-		if openTicketCount >= int(ticketLimit) {
-			// TODO: Use translation of tickets
-			ticketsPluralised := "ticket"
-			if ticketLimit > 1 {
-				ticketsPluralised += "s"
-			}
-
-			cmd.Reply(customisation.Red, i18n.Error, i18n.MessageTicketLimitReached, ticketLimit, ticketsPluralised)
+		if violates, limit := ticketLimitVerdict(panelLimit, guildLimit, panelOpenCount, guildOpenCount); violates {
+			replyTicketLimitReached(cmd, limit)
 			return
 		}
 	}

bot/logic/welcomemessage.go

@@ -531,13 +531,29 @@ var substitutions = map[string]PlaceholderSubstitutionFunc{
 		return strconv.Itoa(tickets)
 	},
 	"ticket_limit": func(ctx context.Context, _ *worker.Context, ticket database.Ticket) string {
+		var panelLimit uint8
 		if ticket.PanelId != nil {
 			panel, err := dbclient.Client.Panel.GetById(ctx, *ticket.PanelId)
-			if err == nil && panel.TicketLimit != nil && *panel.TicketLimit > 0 {
-				return strconv.Itoa(int(*panel.TicketLimit))
+			if err == nil && panel.TicketLimit != nil {
+				panelLimit = *panel.TicketLimit
 			}
 		}
-		return "5"
+
+		guildLimit := database.DefaultTicketLimit
+		if settings, err := dbclient.Client.Settings.Get(ctx, ticket.GuildId); err == nil {
+			guildLimit = settings.TicketLimit
+		}
+
+		effective := guildLimit
+		if panelLimit > 0 && (effective == 0 || panelLimit < effective) {
+			effective = panelLimit
+		}
+
+		if effective == 0 {
+			return "unlimited"
+		}
+
+		return strconv.Itoa(int(effective))
 	},
 	"rating_count": func(ctx context.Context, _ *worker.Context, ticket database.Ticket) string {
 		ctx, cancel := context.WithTimeout(context.Background(), substitutionTimeout)

go.mod

@@ -1,22 +1,22 @@
 module github.com/TicketsBot-cloud/worker
 
-go 1.25.0
+go 1.26.0
 
 // replace github.com/TicketsBot-cloud/database => ../database
 
 // replace github.com/TicketsBot-cloud/common => ../common
 
-//replace github.com/TicketsBot-cloud/gdl => ../gdl
+// replace github.com/TicketsBot-cloud/gdl => ../gdl
 
-//replace github.com/TicketsBot-cloud/archiverclient => ../archiverclient
+// replace github.com/TicketsBot-cloud/archiverclient => ../archiverclient
 
-//replace github.com/TicketsBot-cloud/logarchiver => ../logarchiver
+// replace github.com/TicketsBot-cloud/logarchiver => ../logarchiver
 
 require (
 	cloud.google.com/go/profiler v0.4.2
 	github.com/TicketsBot-cloud/archiverclient v0.0.0-20251015181023-f0b66a074704
-	github.com/TicketsBot-cloud/common v0.0.0-20260827064609-69131fc7bd3e
-	github.com/TicketsBot-cloud/database v0.0.0-20260827064551-53077b598c5f
+	github.com/TicketsBot-cloud/common v0.0.0-20260905165836-38e4090764a4
+	github.com/TicketsBot-cloud/database v0.0.0-20260909063631-6804baaaa52b
 	github.com/TicketsBot-cloud/gdl v0.0.0-20260426095953-999472e6e538
 	github.com/caarlos0/env/v10 v10.0.0
 	github.com/elliotchance/orderedmap v1.8.0
@@ -37,9 +37,9 @@ require (
 	go.uber.org/atomic v1.11.0
 	go.uber.org/zap v1.28.0
 	golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
-	golang.org/x/net v0.57.0
-	golang.org/x/sync v0.22.0
-	golang.org/x/tools v0.48.0
+	golang.org/x/net v0.58.0
+	golang.org/x/sync v0.23.0
+	golang.org/x/tools v0.49.0
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0
 )
 
@@ -128,12 +128,12 @@ require (
 	go.opentelemetry.io/otel/trace v1.36.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.17.0 // indirect
-	golang.org/x/crypto v0.55.0 // indirect
-	golang.org/x/mod v0.38.0 // indirect
+	golang.org/x/crypto v0.57.0 // indirect
+	golang.org/x/mod v0.41.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
-	golang.org/x/sys v0.47.0 // indirect
-	golang.org/x/term v0.45.0 // indirect
-	golang.org/x/text v0.41.0 // indirect
+	golang.org/x/sys v0.48.0 // indirect
+	golang.org/x/term v0.46.0 // indirect
+	golang.org/x/text v0.42.0 // indirect
 	golang.org/x/time v0.11.0 // indirect
 	google.golang.org/api v0.232.0 // indirect
 	google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect