app/http/endpoints/api/export/import.go

@@ -1,88 +0,0 @@
-package api
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strconv"
-	"time"
-
-	"github.com/TicketsBot/GoPanel/botcontext"
-	"github.com/TicketsBot/GoPanel/config"
-	"github.com/TicketsBot/GoPanel/s3"
-	"github.com/TicketsBot/GoPanel/utils"
-	"github.com/gin-gonic/gin"
-)
-
-//	func ImportHandler(ctx *gin.Context) {
-//		ctx.JSON(401, "This endpoint is disabled")
-//	}
-
-func PresignURL(ctx *gin.Context) {
-	guildId, userId := ctx.Keys["guildid"].(uint64), ctx.Keys["userid"].(uint64)
-
-	file_type := ctx.Query("file_type")
-
-	bucketName := ""
-
-	if file_type == "data" {
-		bucketName = config.Conf.S3Import.DataBucket
-	}
-
-	if file_type == "transcripts" {
-		bucketName = config.Conf.S3Import.TranscriptBucket
-	}
-
-	if bucketName == "" {
-		ctx.JSON(400, utils.ErrorStr("Invalid file type"))
-		return
-	}
-
-	// Get "file_size" query parameter
-	fileSize, err := strconv.ParseInt(ctx.Query("file_size"), 10, 64)
-	if err != nil {
-		ctx.JSON(400, utils.ErrorJson(err))
-		return
-	}
-
-	// Check if file is over 1GB
-	if fileSize > 1024*1024*1024 {
-		ctx.JSON(400, utils.ErrorStr("File size too large"))
-		return
-	}
-
-	botCtx, err := botcontext.ContextForGuild(guildId)
-	if err != nil {
-		ctx.JSON(500, utils.ErrorJson(err))
-		return
-	}
-
-	guild, err := botCtx.GetGuild(context.Background(), guildId)
-	if err != nil {
-		ctx.JSON(500, utils.ErrorJson(err))
-		return
-	}
-
-	if guild.OwnerId != userId {
-		ctx.JSON(403, utils.ErrorStr("Only the server owner can import transcripts"))
-		return
-	}
-
-	// Presign URL
-	url, err := s3.S3Client.PresignHeader(ctx, "PUT", bucketName, fmt.Sprintf("%s/%d.zip", file_type, guildId), time.Minute*1, url.Values{}, http.Header{
-		"Content-Type": []string{"application/x-zip-compressed"},
-	})
-	if err != nil {
-		ctx.JSON(500, utils.ErrorJson(err))
-		return
-	}
-
-	ctx.JSON(200, gin.H{
-		"url": url.String(),
-	})
-}
-
-func ImportHandler(ctx *gin.Context) {
-	ctx.JSON(401, "Imports are currently disabled - Please try again later (~24 hours)")
-}

app/http/endpoints/api/export/model.go

@@ -1 +0,0 @@
-package api

app/http/endpoints/api/export/validator/error.go

@@ -1,8 +0,0 @@
-package validator
-
-import "errors"
-
-var (
-	ErrValidationFailed    = errors.New("validation failed")
-	ErrMaximumSizeExceeded = errors.New("maximum size exceeded")
-)

app/http/endpoints/api/export/validator/guild_data.go

@@ -1,37 +0,0 @@
-package validator
-
-import (
-	"archive/zip"
-	"encoding/json"
-	"io"
-)
-
-func (v *Validator) ValidateGuildData(input io.ReaderAt, size int64) (*GuildData, error) {
-	reader, err := zip.NewReader(input, size)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := reader.Open("data.json")
-	if err != nil {
-		return nil, err
-	}
-
-	defer f.Close()
-
-	data, err := io.ReadAll(v.newLimitReader(f))
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err := v.validateSignature(reader, "data.json", data); err != nil {
-		return nil, err
-	}
-
-	var guildData GuildData
-	if err := json.Unmarshal(data, &guildData); err != nil {
-		return nil, err
-	}
-
-	return &guildData, nil
-}

app/http/endpoints/api/export/validator/guild_transcripts.go

@@ -1,97 +0,0 @@
-package validator
-
-import (
-	"archive/zip"
-	"io"
-	"regexp"
-	"strconv"
-)
-
-type GuildTranscriptsOutput struct {
-	GuildId uint64
-	// Ticket ID -> Transcript
-	Transcripts map[int][]byte
-}
-
-var transcriptFileRegex = regexp.MustCompile(`^transcripts/(\d+)\.json$`)
-
-func (v *Validator) ValidateGuildTranscripts(input io.ReaderAt, size int64) (*GuildTranscriptsOutput, error) {
-	reader, err := zip.NewReader(input, size)
-	if err != nil {
-		return nil, err
-	}
-
-	guildId, n, err := v.readGuildId(reader)
-	if err != nil {
-		return nil, err
-	}
-
-	transcripts := make(map[int][]byte)
-	for _, f := range reader.File {
-		matches := transcriptFileRegex.FindStringSubmatch(f.Name)
-		if len(matches) != 2 {
-			continue
-		}
-
-		ticketId, err := strconv.Atoi(matches[1])
-		if err != nil {
-			continue
-		}
-
-		file, err := f.Open()
-		if err != nil {
-			return nil, err
-		}
-
-		b, err := io.ReadAll(v.newLimitReader(file))
-		if err != nil {
-			return nil, err
-		}
-
-		n += int64(len(b))
-		if n > v.maxUncompressedSize {
-			return nil, ErrMaximumSizeExceeded
-		}
-
-		sigSize, err := v.validateTranscriptSignature(reader, f.Name, guildId, ticketId, b)
-		if err != nil {
-			return nil, err
-		}
-
-		n += sigSize
-		if n > v.maxUncompressedSize {
-			return nil, ErrMaximumSizeExceeded
-		}
-
-		transcripts[ticketId] = b
-	}
-
-	return &GuildTranscriptsOutput{
-		GuildId:     guildId,
-		Transcripts: transcripts,
-	}, nil
-}
-
-func (v *Validator) readGuildId(reader *zip.Reader) (uint64, int64, error) {
-	f, err := reader.Open("guild_id.txt")
-	if err != nil {
-		return 0, 0, err
-	}
-
-	b, err := io.ReadAll(v.newLimitReader(f))
-	if err != nil {
-		return 0, 0, err
-	}
-
-	guildId, err := strconv.ParseUint(string(b), 10, 64)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	sigSize, err := v.validateSignature(reader, "guild_id.txt", b)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return guildId, int64(len(b)) + sigSize, nil
-}

app/http/endpoints/api/export/validator/model.go

@@ -1,83 +0,0 @@
-package validator
-
-import (
-	"time"
-
-	"github.com/TicketsBot/database"
-)
-
-type TicketUnion[T any] struct {
-	TicketId int `json:"ticket_id"`
-	Data     T   `json:"data"`
-}
-
-type GuildData struct {
-	GuildId                    uint64                                    `json:"guild_id,string"`
-	ActiveLanguage             *string                                   `json:"active_language"`
-	ArchiveChannel             *uint64                                   `json:"archive_channel,string"`
-	ArchiveMessages            []TicketUnion[database.ArchiveMessage]    `json:"archive_messages"`
-	AutocloseSettings          *database.AutoCloseSettings               `json:"autoclose_settings"`
-	AutocloseExcluded          []int                                     `json:"autoclose_excluded"` // ticket IDs
-	GuildBlacklistedUsers      []uint64                                  `json:"guild_blacklisted_users"`
-	ChannelCategory            *uint64                                   `json:"channel_category,string"`
-	ClaimSettings              *database.ClaimSettings                   `json:"claim_settings"`
-	CloseConfirmationEnabled   bool                                      `json:"close_confirmation_enabled"`
-	CloseReasons               []TicketUnion[database.CloseMetadata]     `json:"close_reasons"`
-	CustomColors               map[int16]int                             `json:"custom_colors"`
-	EmbedFields                []database.EmbedField                     `json:"embed_fields"`
-	Embeds                     []database.CustomEmbed                    `json:"embeds"`
-	ExitSurveyResponses        []TicketUnion[ExitSurveyResponse]         `json:"exit_survey_responses"`
-	FeedbackEnabled            bool                                      `json:"feedback_enabled"`
-	FirstResponseTimes         []FirstResponseTime                       `json:"first_response_times"`
-	FormInputs                 []database.FormInput                      `json:"form_inputs"`
-	Forms                      []database.Form                           `json:"forms"`
-	GuildIsGloballyBlacklisted bool                                      `json:"guild_is_globally_blacklisted"`
-	GuildMetadata              database.GuildMetadata                    `json:"guild_metadata"`
-	MultiPanels                []database.MultiPanel                     `json:"multi_panels"`
-	MultiPanelTargets          map[int][]int                             `json:"multi_panel_targets"` // multi_panel_id -> [panel_ids]
-	NamingScheme               *database.NamingScheme                    `json:"naming_scheme"`
-	OnCallUsers                []uint64                                  `json:"on_call_users"`
-	PanelAccessControlRules    map[int][]database.PanelAccessControlRule `json:"panel_access_control_rules"` // panel_id -> rules
-	PanelMentionUser           map[int]bool                              `json:"panel_mention_user"`
-	PanelRoleMentions          map[int][]uint64                          `json:"panel_role_mentions"`
-	Panels                     []database.Panel                          `json:"panels"`
-	PanelTeams                 map[int][]int                             `json:"panel_teams"`  // panel_id -> [team_ids]
-	Participants               map[int][]uint64                          `json:"participants"` // ticket_id -> [user_ids]
-	UserPermissions            []Permission                              `json:"user_permissions"`
-	GuildBlacklistedRoles      []uint64                                  `json:"guild_blacklisted_roles"`
-	RolePermissions            []Permission                              `json:"role_permissions"`
-	ServiceRatings             []TicketUnion[int16]                      `json:"service_ratings"`
-	Settings                   database.Settings                         `json:"settings"`
-	SupportTeamUsers           map[int][]uint64                          `json:"support_team_users"` // team_id -> [user_ids]
-	SupportTeamRoles           map[int][]uint64                          `json:"support_team_roles"` // team_id -> [role_ids]
-	SupportTeams               []database.SupportTeam                    `json:"support_teams"`
-	Tags                       []database.Tag                            `json:"tags"`
-	TicketClaims               []TicketUnion[uint64]                     `json:"ticket_claims"`
-	TicketLastMessages         []TicketUnion[database.TicketLastMessage] `json:"ticket_last_messages"`
-	TicketLimit                *int                                      `json:"ticket_limit"`
-	TicketAdditionalMembers    map[int][]uint64                          `json:"ticket_additional_members"` // ticket_id -> [user_ids]
-	TicketPermissions          database.TicketPermissions                `json:"ticket_permissions"`
-	Tickets                    []database.Ticket                         `json:"tickets"`
-	UsersCanClose              bool                                      `json:"users_can_close"`
-	WelcomeMessage             *string                                   `json:"welcome_message"`
-}
-
-// Shims
-
-type FirstResponseTime struct {
-	TicketId     int           `json:"ticket_id"`
-	UserId       uint64        `json:"user_id,string"`
-	ResponseTime time.Duration `json:"response_time"`
-}
-
-type Permission struct {
-	Snowflake uint64 `json:"snowflake,string"`
-	IsSupport bool   `json:"is_support"`
-	IsAdmin   bool   `json:"is_admin"`
-}
-
-type ExitSurveyResponse struct {
-	FormId     *int    `json:"form_id"`
-	QuestionId *int    `json:"question_id"`
-	Response   *string `json:"response"`
-}

app/http/endpoints/api/export/validator/signatures.go

@@ -1,52 +0,0 @@
-package validator
-
-import (
-	"archive/zip"
-	"crypto/ed25519"
-	"encoding/base64"
-	"io"
-	"strconv"
-)
-
-func (v *Validator) validateSignature(zipReader *zip.Reader, fileName string, data []byte) (int64, error) {
-	f, err := zipReader.Open(fileName + ".sig")
-	if err != nil {
-		return 0, err
-	}
-
-	signature, err := io.ReadAll(v.newLimitReader(f))
-	if err != nil {
-		return 0, err
-	}
-
-	decoded, err := base64.RawURLEncoding.DecodeString(string(signature))
-	if err != nil {
-		return 0, err
-	}
-
-	if !ed25519.Verify(v.publicKey, data, decoded) {
-		return 0, ErrValidationFailed
-	}
-
-	return int64(len(signature)), nil
-}
-
-func (v *Validator) validateTranscriptSignature(
-	zipReader *zip.Reader,
-	fileName string,
-	guildId uint64,
-	ticketId int,
-	data []byte,
-) (int64, error) {
-	guildIdStr := strconv.FormatUint(guildId, 10)
-	ticketIdStr := strconv.Itoa(ticketId)
-
-	sigData := make([]byte, 0, len(guildIdStr)+len(ticketIdStr)+len(data)+2)
-	sigData = append(sigData, guildIdStr...)
-	sigData = append(sigData, '|')
-	sigData = append(sigData, ticketIdStr...)
-	sigData = append(sigData, '|')
-	sigData = append(sigData, data...)
-
-	return v.validateSignature(zipReader, fileName, sigData)
-}

app/http/endpoints/api/export/validator/validator.go

@@ -1,45 +0,0 @@
-package validator
-
-import (
-	"crypto/ed25519"
-	"io"
-)
-
-type Validator struct {
-	publicKey ed25519.PublicKey
-
-	maxUncompressedSize   int64
-	maxIndividualFileSize int64
-}
-
-type Option func(*Validator)
-
-func NewValidator(publicKey ed25519.PublicKey, options ...Option) *Validator {
-	v := &Validator{
-		publicKey:             publicKey,
-		maxUncompressedSize:   250 * 1024 * 1024,
-		maxIndividualFileSize: 1 * 1024 * 1024,
-	}
-
-	for _, option := range options {
-		option(v)
-	}
-
-	return v
-}
-
-func WithMaxUncompressedSize(size int64) Option {
-	return func(v *Validator) {
-		v.maxUncompressedSize = size
-	}
-}
-
-func WithMaxIndividualFileSize(size int64) Option {
-	return func(v *Validator) {
-		v.maxIndividualFileSize = size
-	}
-}
-
-func (v *Validator) newLimitReader(r io.Reader) io.Reader {
-	return io.LimitReader(r, v.maxIndividualFileSize)
-}

app/http/endpoints/api/panel/validation.go

@@ -4,10 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
 	"github.com/TicketsBot/GoPanel/app"
 	"github.com/TicketsBot/GoPanel/app/http/validation"
 	"github.com/TicketsBot/GoPanel/app/http/validation/defaults"
@@ -19,6 +15,9 @@ import (
 	"github.com/rxdn/gdl/objects/channel"
 	"github.com/rxdn/gdl/objects/guild"
 	"github.com/rxdn/gdl/objects/interaction/component"
+	"regexp"
+	"strings"
+	"time"
 )
 
 func ApplyPanelDefaults(data *panelBody) {
@@ -359,18 +358,6 @@ func validateAccessControlList(ctx PanelValidationContext) validation.Validation
 
 func validateEmbed(e *types.CustomEmbed) error {
 	if e == nil || e.Title != nil || e.Description != nil || len(e.Fields) > 0 || e.ImageUrl != nil || e.ThumbnailUrl != nil {
-		if e.ImageUrl != nil && (len(*e.ImageUrl) > 255 || !urlRegex.MatchString(*e.ImageUrl)) {
-			if *e.ImageUrl != "%avatar_url%" {
-				return validation.NewInvalidInputError("Invalid URL")
-			}
-		}
-
-		if e.ThumbnailUrl != nil && (len(*e.ThumbnailUrl) > 255 || !urlRegex.MatchString(*e.ThumbnailUrl)) {
-			if *e.ThumbnailUrl != "%avatar_url%" {
-				return validation.NewInvalidInputError("Invalid URL")
-			}
-		}
-
 		return nil
 	}
 

app/http/endpoints/api/transcripts/get.go

@@ -3,12 +3,11 @@ package api
 import (
 	"context"
 	"errors"
-	"strconv"
-
-	"github.com/TicketsBot-cloud/archiverclient"
 	dbclient "github.com/TicketsBot/GoPanel/database"
 	"github.com/TicketsBot/GoPanel/utils"
+	"github.com/TicketsBot/archiverclient"
 	"github.com/gin-gonic/gin"
+	"strconv"
 )
 
 func GetTranscriptHandler(ctx *gin.Context) {

app/http/endpoints/api/transcripts/render.go

@@ -2,13 +2,12 @@ package api
 
 import (
 	"errors"
-	"strconv"
-
-	"github.com/TicketsBot-cloud/archiverclient"
 	"github.com/TicketsBot/GoPanel/chatreplica"
 	dbclient "github.com/TicketsBot/GoPanel/database"
 	"github.com/TicketsBot/GoPanel/utils"
+	"github.com/TicketsBot/archiverclient"
 	"github.com/gin-gonic/gin"
+	"strconv"
 )
 
 func GetTranscriptRenderHandler(ctx *gin.Context) {

app/http/server.go

@@ -1,12 +1,9 @@
 package http
 
 import (
-	"time"
-
 	"github.com/TicketsBot/GoPanel/app/http/endpoints/api"
 	"github.com/TicketsBot/GoPanel/app/http/endpoints/api/admin/botstaff"
 	api_blacklist "github.com/TicketsBot/GoPanel/app/http/endpoints/api/blacklist"
-	api_import "github.com/TicketsBot/GoPanel/app/http/endpoints/api/export"
 	api_forms "github.com/TicketsBot/GoPanel/app/http/endpoints/api/forms"
 	api_integrations "github.com/TicketsBot/GoPanel/app/http/endpoints/api/integrations"
 	api_panels "github.com/TicketsBot/GoPanel/app/http/endpoints/api/panel"
@@ -27,6 +24,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/penglongli/gin-metrics/ginmetrics"
 	"go.uber.org/zap"
+	"time"
 )
 
 func StartServer(logger *zap.Logger, sm *livechat.SocketManager) {
@@ -122,9 +120,6 @@ func StartServer(logger *zap.Logger, sm *livechat.SocketManager) {
 		guildAuthApiSupport.GET("/settings", api_settings.GetSettingsHandler)
 		guildAuthApiAdmin.POST("/settings", api_settings.UpdateSettingsHandler)
 
-		guildAuthApiAdmin.POST("/import", api_import.ImportHandler)
-		guildAuthApiAdmin.GET("/import/presign", api_import.PresignURL)
-
 		guildAuthApiSupport.GET("/blacklist", api_blacklist.GetBlacklistHandler)
 		guildAuthApiSupport.POST("/blacklist", api_blacklist.AddBlacklistHandler)
 		guildAuthApiSupport.DELETE("/blacklist/user/:user", api_blacklist.RemoveUserBlacklistHandler)

cmd/api/main.go

@@ -2,20 +2,15 @@ package main
 
 import (
 	"fmt"
-	"net/http"
-	"net/http/pprof"
-
-	"github.com/TicketsBot-cloud/archiverclient"
 	app "github.com/TicketsBot/GoPanel/app/http"
 	"github.com/TicketsBot/GoPanel/app/http/endpoints/api/ticket/livechat"
 	"github.com/TicketsBot/GoPanel/config"
 	"github.com/TicketsBot/GoPanel/database"
-	"github.com/TicketsBot/GoPanel/log"
 	"github.com/TicketsBot/GoPanel/redis"
 	"github.com/TicketsBot/GoPanel/rpc"
 	"github.com/TicketsBot/GoPanel/rpc/cache"
-	"github.com/TicketsBot/GoPanel/s3"
 	"github.com/TicketsBot/GoPanel/utils"
+	"github.com/TicketsBot/archiverclient"
 	"github.com/TicketsBot/common/chatrelay"
 	"github.com/TicketsBot/common/model"
 	"github.com/TicketsBot/common/observability"
@@ -26,12 +21,10 @@ import (
 	"github.com/rxdn/gdl/rest/request"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-
+	"net/http"
-	_ "github.com/joho/godotenv/autoload"
+	"net/http/pprof"
 )
 
-var Logger *zap.Logger
-
 func main() {
 	startPprof()
 
@@ -75,17 +68,12 @@ func main() {
 		panic(fmt.Errorf("failed to initialise zap logger: %w", err))
 	}
 
-	log.Logger = logger
-
 	logger.Info("Connecting to database")
 	database.ConnectToDatabase()
 
 	logger.Info("Connecting to cache")
 	cache.Instance = cache.NewCache()
 
-	logger.Info("Connecting to import S3")
-	s3.ConnectS3(config.Conf.S3Import.Endpoint, config.Conf.S3Import.AccessKey, config.Conf.S3Import.SecretKey)
-
 	logger.Info("Initialising microservice clients")
 	utils.ArchiverClient = archiverclient.NewArchiverClient(archiverclient.NewProxyRetriever(config.Conf.Bot.ObjectStore), []byte(config.Conf.Bot.AesKey))
 	utils.SecureProxyClient = secureproxy.NewSecureProxy(config.Conf.SecureProxyUrl)

config/config.go

@@ -1,11 +1,10 @@
 package config
 
 import (
-	"os"
-
 	"github.com/BurntSushi/toml"
 	"github.com/caarlos0/env/v11"
 	"go.uber.org/zap/zapcore"
+	"os"
 )
 
 type Config struct {
@@ -57,13 +56,6 @@ type Config struct {
 		Uri string `env:"URI,required"`
 	} `envPrefix:"CACHE_"`
 	SecureProxyUrl string `env:"SECURE_PROXY_URL"`
-	S3Import       struct {
-		Endpoint         string `env:"ENDPOINT,required"`
-		AccessKey        string `env:"ACCESS_KEY,required"`
-		SecretKey        string `env:"SECRET_KEY,required"`
-		TranscriptBucket string `env:"TRANSCRIPT_BUCKET,required"`
-		DataBucket       string `env:"DATA_BUCKET,required"`
-	} `envPrefix:"S3_IMPORT_"`
 }
 
 // TODO: Don't use a global variable

database/database.go

@@ -2,8 +2,6 @@ package database
 
 import (
 	"context"
-
-	database2 "github.com/TicketsBot-cloud/database"
 	"github.com/TicketsBot/GoPanel/config"
 	"github.com/TicketsBot/database"
 	"github.com/jackc/pgconn"
@@ -15,7 +13,6 @@ import (
 )
 
 var Client *database.Database
-var Client2 *database2.Database
 
 func ConnectToDatabase() {
 	config, err := pgxpool.ParseConfig(config.Conf.Database.Uri)
@@ -40,5 +37,4 @@ func ConnectToDatabase() {
 	}
 
 	Client = database.NewDatabase(pool)
-	Client2 = database2.NewDatabase(pool)
 }

frontend/public/_headers

@@ -1,5 +1,5 @@
 /*
-  Content-Security-Policy: default-src 'none'; script-src 'self' 'unsafe-eval' https://static.cloudflareinsights.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com; img-src 'self' https://cdn.discordapp.com https://media.discordapp.net https://image-cdn.ticketsbot.cloud; font-src https://fonts.googleapis.com https://fonts.gstatic.com https://use.fontawesome.com; connect-src https://s3.uk.io.cloud.ovh.net https://api.ticketsbot.cloud https://import-api.ticketsbot.cloud wss://api.ticketsbot.cloud https://cloudflareinsights.com/cdn-cgi/rum; media-src https://cdn.discordapp.com https://media.discordapp.net; frame-src 'self'
+  Content-Security-Policy: default-src 'none'; script-src 'self' 'unsafe-eval' https://static.cloudflareinsights.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com https://use.fontawesome.com; img-src 'self' https://cdn.discordapp.com https://media.discordapp.net https://image-cdn.ticketsbot.cloud; font-src https://fonts.googleapis.com https://fonts.gstatic.com https://use.fontawesome.com; connect-src https://api.ticketsbot.cloud wss://api.ticketsbot.cloud https://cloudflareinsights.com/cdn-cgi/rum; media-src https://cdn.discordapp.com https://media.discordapp.net; frame-src 'self'
 
 /manage/*/transcripts/view/*
   ! Content-Security-Policy

frontend/src/components/manage/ImportModal.svelte

@@ -1,163 +0,0 @@
-<div class="modal" transition:fade>
-  <div class="modal-wrapper">
-    <Card footer={true} footerRight={true} fill={false}>
-      <span slot="title">Import Data</span>
-
-      <div slot="body" class="body-wrapper">
-        Please upload your exported data file to import settings and transcripts.
-
-        
-        <form>
-          <div class="row">
-            <div class="label-wrapper">
-              <label for="import_data" class="form-label"> Data Export .zip</label>
-            </div>
-            <input type="file" id="import_data" style="display: block; width: 100%;" accept=".zip" />
-          </div>
-          <div class="row">
-            <div class="label-wrapper">
-              <label for="import_data" class="form-label"> Transcripts Export .zip</label>
-            </div>
-            <input type="file" id="import_transcripts" style="display: block; width: 100%;" accept=".zip" />
-          </div>
-        </form>
-        {#if queryLoading}
-          <div>
-            <br />
-            <br />
-            <p style="text-align: center;">We are currently loading your data in, please do not navigate away from this page.</p>
-          </div>
-        {/if}
-      </div>
-
-      <div slot="footer" class="footer-wrapper">
-        <Button danger={true} on:click={dispatchClose}>Cancel</Button>
-        <div style="">
-          <Button on:click={dispatchConfirm} disabled={queryLoading}>Confirm</Button>
-        </div>
-      </div>
-    </Card>
-  </div>
-</div>
-
-<div class="modal-backdrop" transition:fade></div>
-
-<svelte:window on:keydown={handleKeydown}/>
-
-<script>
-    import {createEventDispatcher} from 'svelte';
-    import {fade} from 'svelte/transition'
-    import Card from "../Card.svelte";
-    import Button from "../Button.svelte";
-
-    import Textarea from '../form/Textarea.svelte';
-    
-    import {setDefaultHeaders} from '../../includes/Auth.svelte'
-    import {notifyError, notifySuccess} from "../../js/util";
-    import axios from "axios";
-    import {API_URL} from "../../js/constants";
-    setDefaultHeaders();
-
-    export let guildId;
-
-    let publicKey = "";
-
-    let queryLoading = false;
-
-    const dispatch = createEventDispatcher();
-
-    function dispatchClose() {
-        dispatch('close', {});
-    }
-
-    async function dispatchConfirm() {
-      let dataFileInput = document.getElementById('import_data');
-
-      let transcriptFileInput = document.getElementById('import_transcripts');
-
-      if(dataFileInput.files.length === 0 && transcriptFileInput.files.length === 0) {
-        notifyError('Please select a file to import, at least one of data or transcripts must be provided');
-        return;
-      }
-
-
-        const frmData = new FormData();
-        if (dataFileInput.files.length > 0) {
-          frmData.append('data_file', dataFileInput.files[0]);
-        }
-        if (transcriptFileInput.files.length > 0) {
-          frmData.append('transcripts_file', transcriptFileInput.files[0]);
-        }
-
-        queryLoading = true;
-        const res = await axios.post(`${API_URL}/api/${guildId}/import`, frmData, {
-          headers: {
-            'Content-Type': 'multipart/form-data'
-          }
-        });
-        if (res.status !== 200) {
-            notifyError(`Failed to import settings: ${res.data.error}`);
-            queryLoading = false;
-            return;
-        }
-        queryLoading = false;
-
-        dispatchClose();
-        notifySuccess('Imported settings successfully - Your transcripts will be processed separately and may take some time to appear.');
-    }
-
-    function handleKeydown(e) {
-        if (e.key === "Escape") {
-            dispatchClose();
-        }
-    }
-</script>
-
-<style>
-    .modal {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 501;
-
-        display: flex;
-        justify-content: center;
-        align-items: center;
-    }
-
-    .modal-wrapper {
-        display: flex;
-        width: 40%;
-    }
-
-    @media only screen and (max-width: 1280px) {
-        .modal-wrapper {
-            width: 96%;
-        }
-    }
-
-    .modal-backdrop {
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        z-index: 500;
-        background-color: #000;
-        opacity: .5;
-    }
-
-    .body-wrapper {
-        display: flex;
-        flex-direction: column;
-        gap: 4px;
-    }
-
-    .footer-wrapper {
-        display: flex;
-        flex-direction: row;
-        gap: 12px;
-    }
-</style>

frontend/src/components/manage/PanelCreationForm.svelte

@@ -58,7 +58,7 @@
                            bind:value={data.naming_scheme}
                            placeholder="ticket-%id%"
                            tooltipText="Click here for the full placeholder list"
-                           tooltipLink="https://docs.ticketsbot.cloud/dashboard/settings/placeholders#custom-naming-scheme-placeholders" />
+                           tooltipLink="https://docs.ticketsbot.cloud" />
                 {/if}
             </div>
             <div class="incomplete-row">

frontend/src/includes/ManageSidebar.svelte

@@ -1,6 +1,3 @@
-{#if importModal}
-  <ImportModal guildId={guildId} on:close={() => importModal = false}/>
-{/if}
 <section class="sidebar">
     <header>
         <img src="{iconUrl}" class="guild-icon" alt="Guild icon" width="50" height="50" on:error={handleIconLoadError} />
@@ -22,7 +19,6 @@
                 <ManageSidebarLink {currentRoute} title="Forms" icon="fa-poll-h" href="/manage/{guildId}/forms" />
                 <ManageSidebarLink {currentRoute} title="Staff Teams" icon="fa-users" href="/manage/{guildId}/teams" />
                 <ManageSidebarLink {currentRoute} title="Integrations" icon="fa-robot" href="/manage/{guildId}/integrations" />
-                <ManageSidebarLink {currentRoute} title="Import" icon="fa-file-import" href="/manage/{guildId}/import" />
             {/if}
 
             <ManageSidebarLink {currentRoute} title="Tickets" icon="fa-ticket-alt" href="/manage/{guildId}/tickets" />
@@ -97,17 +93,12 @@
     import {notifyError, withLoadingScreen} from "../js/util";
     import {getIconUrl, getDefaultIcon} from "../js/icons";
     import ManageSidebarLink from "./ManageSidebarLink.svelte";
-    import ManageSidebarButton from "./ManageSidebarButton.svelte";
     import SubNavigation from "./SubNavigation.svelte";
     import SubNavigationLink from "./SubNavigationLink.svelte";
 
-    import ImportModal from "../components/manage/ImportModal.svelte";
-
     export let currentRoute;
     export let permissionLevel;
 
-    let importModal = false;
-
     $: isAdmin = permissionLevel >= 2;
 
     let guildId = currentRoute.namedParams.id;

frontend/src/includes/ManageSidebarButton.svelte

@@ -1,46 +0,0 @@
-<li>
-    <div style="width: 100%">
-        <button on:click isTrigger="1" class="btn" target="{newWindow === true ? '_blank' : '_self'}" style="width: 100%">
-            {#if icon}
-                <i class="fas {icon}"/>
-            {/if}
-
-            <span>{title}</span>
-        </button>
-
-    </div>
-</li>
-
-<style>
-    button {
-        display: flex;
-
-        justify-content: center;
-        align-items: center;
-
-        text-align: center;
-
-        color: white;
-        background: var(--primary-gradient);
-        border: none;
-        /*border-color: var(--primary);*/
-        /*border-width: 2px;*/
-        border-radius: .25rem;
-        margin: 0;
-
-        cursor: pointer;
-        transition: background-color 150ms ease-in-out, border-color 150ms ease-in-out;
-    }
-
-    i {
-        width: 20px;
-        text-align: center;
-    }
-</style>
-
-<script>
-    export let title;
-    export let icon;
-    export let newWindow;
-
-</script>

frontend/src/includes/Navbar.svelte

@@ -20,7 +20,6 @@
           <NavElement icon="fas fa-poll-h" link="/manage/{guildId}/forms" on:click={closeDropdown}>Forms</NavElement>
           <NavElement icon="fas fa-users" link="/manage/{guildId}/teams" on:click={closeDropdown}>Staff Teams</NavElement>
           <NavElement icon="fas fa-robot" link="/manage/{guildId}/integrations" on:click={closeDropdown}>Integrations</NavElement>
-          <NavElement icon="fas fa-file-import" link="/manage/{guildId}/import" on:click={closeDropdown}>Import</NavElement>
         {/if}
 
         <NavElement icon="fas fa-ticket-alt" link="/manage/{guildId}/tickets" on:click={closeDropdown}>Tickets</NavElement>

frontend/src/js/constants.js

@@ -1,4 +1,3 @@
-export const IMPORT_URL = env.IMPORT_URL || "https://import-api.ticketsbot.cloud"
 export const API_URL = env.API_URL || "https://api.ticketsbot.cloud"
 export const PLACEHOLDER_DOCS_URL = "https://docs.ticketsbot.cloud/setup/placeholders.html"
 

frontend/src/routes.js

@@ -35,7 +35,6 @@ import CreateMultiPanel from "./views/panels/CreateMultiPanel.svelte";
 import EditPanel from "./views/panels/EditPanel.svelte";
 import EditMultiPanel from "./views/panels/EditMultiPanel.svelte";
 import SelectServers from "./views/premium/SelectServers.svelte";
-import Import from './views/Import.svelte'
 
 import LegalLayout from "./layouts/LegalLayout.svelte"
 import PrivacyPolicy from "./views/legal/PrivacyPolicy.svelte"
@@ -132,7 +131,6 @@ export const routes = [
             },
             {name: 'blacklist', component: Blacklist, layout: ManageLayout},
             {name: 'tags', component: Tags, layout: ManageLayout},
-            {name: 'import', component: Import, layout: ManageLayout},
             {name: 'teams', component: Teams, layout: ManageLayout},
             {name: 'forms', component: Forms, layout: ManageLayout},
             {name: 'staffoverride', component: StaffOverride, layout: ManageLayout},

frontend/src/views/Blacklist.svelte

@@ -61,8 +61,8 @@
                 <span slot="title">Blacklist</span>
                 <div slot="body" class="body-wrapper">
                     <div class="row" style="gap: 10px">
-                        <Button icon="fas fa-ban" on:click={() => blacklistRoleModal = true}>Blacklist New Role</Button>
                         <Button icon="fas fa-ban" on:click={() => blacklistUserModal = true}>Blacklist New User</Button>
+                        <Button icon="fas fa-ban" on:click={() => blacklistRoleModal = true}>Blacklist New Role</Button>
                     </div>
 
                     <hr/>

frontend/src/views/Import.svelte

@@ -1,278 +0,0 @@
-<div class="content">
-    <Card footer={false}>
-        <span slot="title">Import Settings, Tickets & Transcripts</span>
-        <div slot="body" class="body-wrapper">
-            <div class="section">
-                <h3 class="section-title">Import Items</h3>
-
-                <form>
-                    <div class="row">
-                        <div class="col-4">
-                            <label class="form-label" for="import_data">
-                                Data Export File (.zip)
-                            </label>
-                            <div class="col-1">
-                                <input
-                                    type="file"
-                                    id="import_data"
-                                    style="display: block; width: 90%;"
-                                    accept=".zip"
-                                />
-                            </div>
-                        </div>
-                        <div class="col-4">
-                            <label class="form-label" for="import_transcripts">
-                                Transcripts Export File (.zip)
-                            </label>
-                            <div class="col-1">
-                                <input
-                                    type="file"
-                                    id="import_transcripts"
-                                    style="display: block; width: 90%;"
-                                    accept=".zip"
-                                />
-                            </div>
-                        </div>
-                    </div>
-                    <br />
-                    <div class="row">
-                        <div class="col-6">
-                            <Button on:click={dispatchConfirm} icon={queryLoading ? "fa-solid fa-spinner fa-spin-pulse" : ""} disabled={queryLoading}>Confirm</Button>
-                        </div>
-                    </div>
-                    <div class="row">
-                        {#if queryLoading}
-                        <div>
-                            <br />
-                            <br />
-                            <p style="text-align: center;"><i class="fa-solid fa-spinner fa-spin-pulse"></i> We are currently loading your data in, please do not navigate away from this page.</p>
-                        </div>
-                        {/if}
-                    </div>
-                </form>
-            </div>
-
-            {#if dataReturned}
-            <div class="section">
-                <h2 class="section-title">Import Files Uploaded</h2>
-                <div class="row">
-                    <p style="text-align: center;">Your Data & Transcripts have been placed in a queue and may take a few days to appear.</p>
-                </div>
-            </div>
-            {/if}
-        </div>
-    </Card>
-</div>
-<script>
-    import { createEventDispatcher } from "svelte";
-    import { fade } from "svelte/transition";
-    import Card from "../components/Card.svelte";
-    import Button from "../components/Button.svelte";
-
-    import Textarea from "../components/form/Textarea.svelte";
-
-    import { setDefaultHeaders } from "../includes/Auth.svelte";
-    import { notify, notifyError, notifySuccess } from "../js/util";
-    import axios from "axios";
-    import { API_URL } from "../js/constants";
-    setDefaultHeaders();
-
-    export let currentRoute;
-    let guildId = currentRoute.namedParams.id
-
-    let dataReturned = false;
-
-    let queryLoading = false;
-
-    const dispatch = createEventDispatcher();
-
-    function dispatchClose() {
-        dispatch("close", {});
-    }
-
-
-    async function dispatchConfirm() {
-        let dataFileInput = document.getElementById("import_data");
-        let transcriptFileInput = document.getElementById("import_transcripts");
-
-        if (
-            dataFileInput.files.length === 0 &&
-            transcriptFileInput.files.length === 0
-        ) {
-            notifyError(
-                "Please select a file to import, at least one of data or transcripts must be provided",
-            );
-            return;
-        }
-
-        const frmData = new FormData();
-        if (dataFileInput.files.length > 0) {
-            frmData.append("data_file", dataFileInput.files[0]);
-        }
-
-        queryLoading = true;
-        setTimeout(() => {
-            if (queryLoading) {
-                notify(
-                    "Uploading...",
-                    "Your files are still uploading, please wait whilst they are processed.",
-                );
-            }
-        }, 60 * 1000);
-
-        if (transcriptFileInput.files.length > 0) {
-            const presignTranscriptRes = await axios.get(`${API_URL}/api/${guildId}/import/presign?file_size=${transcriptFileInput.files[0].size}&file_type=transcripts`);
-            if (presignTranscriptRes.status !== 200) {
-                notifyError(`Failed to upload transcripts: ${presignTranscriptRes.data.error}`);
-                queryLoading = false;
-                return;
-            }
-            
-            await fetch(presignTranscriptRes.data.url, {
-                method: "PUT",
-                body: transcriptFileInput.files[0],
-                headers: {
-                    "Content-Type": transcriptFileInput.files[0].type,
-                },
-            }).then((res) => {
-                if (res.status !== 200) {
-                    notifyError(`Failed to upload transcripts: ${res.data.error}`);
-                    queryLoading = false;
-                    return;
-                }
-
-                dataReturned = true;
-                notifySuccess("Transcripts uploaded successfully - They has now been placed in a queue and will be processed over the next few days.");
-            });
-        }
-
-        if (dataFileInput.files.length > 0) {
-            const presignDataRes = await axios.get(`${API_URL}/api/${guildId}/import/presign?file_size=${dataFileInput.files[0].size}&file_type=data`);
-            if (presignDataRes.status !== 200) {
-                notifyError(`Failed to upload data: ${presignDataRes.data.error}`);
-                queryLoading = false;
-                return;
-            }
-            
-            await fetch(presignDataRes.data.url, {
-                method: "PUT",
-                body: dataFileInput.files[0],
-                headers: {
-                    "Content-Type": dataFileInput.files[0].type,
-                },
-            }).then((res) => {
-                if (res.status !== 200) {
-                    notifyError(`Failed to upload data: ${res.data.error}`);
-                    queryLoading = false;
-                    return;
-                }
-
-                dataReturned = true;
-                notifySuccess("Data uploaded successfully - It has now been placed in a queue and will be processed over the next few days.");
-            });
-        }
-
-        queryLoading = false;
-
-        dispatchClose();
-    }
-
-    function handleKeydown(e) {
-        if (e.key === "Escape") {
-            dispatchClose();
-        }
-    }
-    
-</script>
-<style>
-    .content {
-        display: flex;
-        width: 100%;
-        height: 100%;
-    }
-
-    .body-wrapper {
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-        height: 100%;
-        padding: 1%;
-    }
-
-    .section {
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-        height: 100%;
-    }
-
-    .section:not(:first-child) {
-        margin-top: 2%;
-    }
-
-    .section-title {
-        font-size: 36px;
-        font-weight: bolder !important;
-    }
-
-    h3 {
-        font-size: 28px;
-        margin-bottom: 4px;
-    }
-
-    .row {
-        display: flex;
-        flex-direction: row;
-        width: 100%;
-        height: 100%;
-    }
-
-    ul {
-        margin: 0;
-        padding: 0;
-    }
-
-    li {
-        list-style-type: none;
-    }
-
-    .manage {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        width: 100%;
-        height: 100%;
-        margin-top: 12px;
-    }
-
-    .col {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        width: 49%;
-        height: 100%;
-    }
-
-    table.nice > tbody > tr:first-child {
-        border-top: 1px solid #dee2e6;
-    }
-
-    .user-select {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        width: 100%;
-        height: 100%;
-        margin-bottom: 1%;
-    }
-
-    @media only screen and (max-width: 950px) {
-        .manage {
-            flex-direction: column;
-        }
-
-        .col {
-            width: 100%;
-        }
-    }
-</style>

go.mod

@@ -1,15 +1,14 @@
 module github.com/TicketsBot/GoPanel
 
-go 1.22.6
+go 1.22.0
 
-// replace github.com/TicketsBot-cloud/database => ../database
+toolchain go1.22.4
 
 require (
 	github.com/BurntSushi/toml v1.2.1
-	github.com/TicketsBot-cloud/archiverclient v0.0.0-20250206203822-d4f91573ad70
+	github.com/TicketsBot/archiverclient v0.0.0-20241012221057-16a920bfb454
-	github.com/TicketsBot-cloud/database v0.0.0-20250215204312-d433be0833c9
 	github.com/TicketsBot/common v0.0.0-20241117150316-ff54c97b45c1
-	github.com/TicketsBot/database v0.0.0-20250205194156-c8239ae6eb4e
+	github.com/TicketsBot/database v0.0.0-20241116234225-cdf216a9ffca
 	github.com/TicketsBot/logarchiver v0.0.0-20241012220745-5f3ba17a5138
 	github.com/TicketsBot/worker v0.0.0-20241117155137-89dec1fd9a11
 	github.com/apex/log v1.1.2
@@ -25,27 +24,22 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/jackc/pgconn v1.14.3
-	github.com/jackc/pgtype v1.14.4
+	github.com/jackc/pgtype v1.14.0
 	github.com/jackc/pgx/v4 v4.18.3
-	github.com/joho/godotenv v1.5.1
-	github.com/minio/minio-go/v7 v7.0.85
 	github.com/penglongli/gin-metrics v0.1.10
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.20.5
+	github.com/prometheus/client_golang v1.14.0
 	github.com/rxdn/gdl v0.0.0-20241201120412-8fd61c53dd96
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
 	github.com/weppos/publicsuffix-go v0.20.0
 	go.uber.org/zap v1.24.0
-	golang.org/x/sync v0.11.0
+	golang.org/x/sync v0.9.0
 )
 
-require github.com/TicketsBot/archiverclient v0.0.0-20241012221057-16a920bfb454 // indirect
-
 require (
 	github.com/ClickHouse/ch-go v0.52.1 // indirect
 	github.com/ClickHouse/clickhouse-go/v2 v2.10.0 // indirect
-	github.com/TicketsBot-cloud/common v0.0.0-20250208140430-b5da1dd487b3 // indirect
 	github.com/TicketsBot/analytics-client v0.0.0-20240724103359-30f5dac821e6 // indirect
 	github.com/TicketsBot/ttlcache v1.6.1-0.20200405150101-acc18e37b261 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
@@ -56,13 +50,13 @@ require (
 	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/caarlos0/env v3.5.0+incompatible // indirect
 	github.com/caarlos0/env/v10 v10.0.0 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/elliotchance/orderedmap v1.2.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-errors/errors v1.4.2 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
@@ -71,7 +65,8 @@ require (
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-redsync/redsync/v4 v4.12.1 // indirect
-	github.com/goccy/go-json v0.10.4 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
@@ -82,7 +77,7 @@ require (
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
 	github.com/jackc/pgx v3.6.2+incompatible // indirect
 	github.com/jackc/pgx/v5 v5.6.0 // indirect
 	github.com/jackc/puddle v1.3.0 // indirect
@@ -90,27 +85,28 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.5.6 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/juju/ratelimit v1.0.2 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
-	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/minio-go/v7 v7.0.73 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c // indirect
 	github.com/paulmach/orb v0.9.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/procfs v0.8.0 // indirect
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/rs/xid v1.6.0 // indirect
+	github.com/rs/xid v1.5.0 // indirect
 	github.com/schollz/progressbar/v3 v3.8.2 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
@@ -122,12 +118,12 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.33.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
-	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/net v0.26.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
+	golang.org/x/term v0.25.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

@@ -41,20 +41,14 @@ github.com/ClickHouse/clickhouse-go/v2 v2.10.0 h1:0w/A50D5MfsRUYBaV6rLKwZ4LXWKLZ
 github.com/ClickHouse/clickhouse-go/v2 v2.10.0/go.mod h1:teXfZNM90iQ99Jnuht+dxQXCuhDZ8nvvMoTJOFrcmcg=
 github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/ReneKroon/ttlcache v1.6.0/go.mod h1:DG6nbhXKUQhrExfwwLuZUdH7UnRDDRA1IW+nBuCssvs=
-github.com/TicketsBot-cloud/archiverclient v0.0.0-20250206203822-d4f91573ad70 h1:bkTKXS4RRLTOC2UbqRnYObI7uGfyW64mo7dYxx8HN+w=
-github.com/TicketsBot-cloud/archiverclient v0.0.0-20250206203822-d4f91573ad70/go.mod h1:BtS3JYHIuRStuUm909E7IDAwg7aAuiS5CNfIH5Y+Ayw=
-github.com/TicketsBot-cloud/common v0.0.0-20250208140430-b5da1dd487b3 h1:2rpwH5o8negd0BCqWG8xv9r0jh/fYK3P/V3WJ+yFDKs=
-github.com/TicketsBot-cloud/common v0.0.0-20250208140430-b5da1dd487b3/go.mod h1:gn88nKOiWkAgFhhTyuuo+sPFAQEVdTK+P/VXAxOBKNw=
-github.com/TicketsBot-cloud/database v0.0.0-20250215204312-d433be0833c9 h1:ByFdW+kTUS2AorJbGiHap1tkQWNBcCbmDjHvTMe8vK8=
-github.com/TicketsBot-cloud/database v0.0.0-20250215204312-d433be0833c9/go.mod h1:LPDEn9e5wccH7rq/pUlVcL3UhyLnnwdM2dhj0tp/ljo=
 github.com/TicketsBot/analytics-client v0.0.0-20240724103359-30f5dac821e6 h1:JigBTrKv/wRkCnz0G9m/EsqmG5DU6pFWBtrXNhcvK3E=
 github.com/TicketsBot/analytics-client v0.0.0-20240724103359-30f5dac821e6/go.mod h1:9Z9qP/yovb6DUe1KlzgN2wicc+8ey6MMoxfynFbMyRg=
 github.com/TicketsBot/archiverclient v0.0.0-20241012221057-16a920bfb454 h1:u77mqvmLdljjircnvgikSWNOSyc2uSLLybPOQP8moK8=
 github.com/TicketsBot/archiverclient v0.0.0-20241012221057-16a920bfb454/go.mod h1:ZJ+b5JzRBQqywD7/oTsqJSB34VwzQ8eExHslaGRLOVQ=
 github.com/TicketsBot/common v0.0.0-20241117150316-ff54c97b45c1 h1:FqC1KGOsmB+ikvbmDkyNQU6bGUWyfYq8Ip9r4KxTveY=
 github.com/TicketsBot/common v0.0.0-20241117150316-ff54c97b45c1/go.mod h1:N7zwetwx8B3RK/ZajWwMroJSyv2ZJ+bIOZWv/z8DhaM=
-github.com/TicketsBot/database v0.0.0-20250205194156-c8239ae6eb4e h1:3cYv3r/wSbTSp2Rmtk9jx3D7qpBQx6QMnOjIQbbND3w=
+github.com/TicketsBot/database v0.0.0-20241116234225-cdf216a9ffca h1:dWFpbKflrHgkoNOI6e44GMMCwt8YWD614SmsCzwUAZY=
-github.com/TicketsBot/database v0.0.0-20250205194156-c8239ae6eb4e/go.mod h1:mpVkDO8tnnWn1pMGEphVg6YSeGIhDwLAN43lBTkpGmU=
+github.com/TicketsBot/database v0.0.0-20241116234225-cdf216a9ffca/go.mod h1:mpVkDO8tnnWn1pMGEphVg6YSeGIhDwLAN43lBTkpGmU=
 github.com/TicketsBot/logarchiver v0.0.0-20241012220745-5f3ba17a5138 h1:wsR5ESeaQKo122qsmzPcblxlJdE0GIQbp2B/7/uX+TA=
 github.com/TicketsBot/logarchiver v0.0.0-20241012220745-5f3ba17a5138/go.mod h1:4Rq0CgSCgXVW6uEyEUvWzxOmFp+L57rFfCjPDFPHFiw=
 github.com/TicketsBot/ttlcache v1.6.1-0.20200405150101-acc18e37b261 h1:NHD5GB6cjlkpZFjC76Yli2S63/J2nhr8MuE6KlYJpQM=
@@ -99,8 +93,8 @@ github.com/caarlos0/env/v11 v11.2.2/go.mod h1:JBfcdeQiBoI3Zh1QRAWfe+tpiNTmDtcCj/
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
@@ -132,8 +126,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/getsentry/sentry-go v0.24.0 h1:02b7qEmJ56EHGe9KFgjArjU/vG/aywm7Efgu+iPc01Y=
 github.com/getsentry/sentry-go v0.24.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
@@ -157,9 +151,11 @@ github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -190,8 +186,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
-github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
@@ -311,23 +307,20 @@ github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX
 github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
 github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
 github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
-github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
+github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
 github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
-github.com/jackc/pgtype v1.14.4 h1:fKuNiCumbKTAIxQwXfB/nsrnkEI6bPJrrSiMKgbJ2j8=
-github.com/jackc/pgtype v1.14.4/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA=
 github.com/jackc/pgx v3.6.2+incompatible h1:2zP5OD7kiyR3xzRYMhOcXVvkDZsImVXfj+yIyTQf3/o=
 github.com/jackc/pgx v3.6.2+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
 github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA=
 github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
 github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY=
@@ -342,8 +335,6 @@ github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFr
 github.com/jedib0t/go-pretty/v6 v6.5.6 h1:nKXVLqPfAwY7sWcYXdNZZZ2fjqDpAtj9UeWupgfUxSg=
 github.com/jedib0t/go-pretty/v6 v6.5.6/go.mod h1:5LQIxa52oJ/DlDSLv0HEkWOFMDGoWkJb9ss5KqPpJBg=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -363,28 +354,26 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.10.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
-github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -404,11 +393,13 @@ github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
-github.com/minio/minio-go/v7 v7.0.85 h1:9psTLS/NTvC3MWoyjhjXpwcKoNbkongaCSF3PNpSuXo=
+github.com/minio/minio-go/v7 v7.0.73 h1:qr2vi96Qm7kZ4v7LLebjte+MQh621fFWnv93p12htEo=
-github.com/minio/minio-go/v7 v7.0.85/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY=
+github.com/minio/minio-go/v7 v7.0.73/go.mod h1:qydcVzV8Hqtj1VtEocfxbmVFa2siu6HGa+LDEPogjD8=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
 github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -419,8 +410,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -461,27 +450,28 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
 github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
 github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
+github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
+github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
-github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
-github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
 github.com/redis/go-redis/v9 v9.4.0 h1:Yzoz33UZw9I/mFhx4MNrB6Fk+XHO1VukNcCa1+lwyKk=
 github.com/redis/go-redis/v9 v9.4.0/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/redis/rueidis v1.0.19 h1:s65oWtotzlIFN8eMPhyYwxlwLR1lUdhza2KtWprKYSo=
@@ -493,8 +483,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
-github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
-github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/rxdn/gdl v0.0.0-20241201120412-8fd61c53dd96 h1:CIEWvDLeku/Wf+FepJeL3V8pRjtTXf2EkOZ5KDVbih0=
@@ -532,6 +522,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
@@ -562,7 +553,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.mongodb.org/mongo-driver v1.11.1/go.mod h1:s7p5vEtfbeR1gYi6pnj3c3/urpbLv2T5Sfd6Rp2HBB8=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -610,12 +600,9 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
-golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
+golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
-golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
-golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -648,8 +635,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -686,18 +671,17 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
-golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -709,10 +693,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -761,25 +743,19 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
-golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
-golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -788,11 +764,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -845,8 +818,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

log/logger.go

@@ -1,5 +0,0 @@
-package log
-
-import "go.uber.org/zap"
-
-var Logger *zap.Logger

s3/s3.go

@@ -1,23 +0,0 @@
-package s3
-
-import (
-	"log"
-
-	"github.com/minio/minio-go/v7"
-	"github.com/minio/minio-go/v7/pkg/credentials"
-)
-
-var S3Client *minio.Client
-
-func ConnectS3(endpoint, accessKey, secretKey string) {
-	// Initialize minio client object.
-	minioClient, err := minio.New(endpoint, &minio.Options{
-		Creds:  credentials.NewStaticV4(accessKey, secretKey, ""),
-		Secure: true,
-	})
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	S3Client = minioClient
-}

utils/archiverclient.go

@@ -1,5 +1,5 @@
 package utils
 
-import "github.com/TicketsBot-cloud/archiverclient"
+import "github.com/TicketsBot/archiverclient"
 
 var ArchiverClient *archiverclient.ArchiverClient

utils/requestutils.go

@@ -2,14 +2,10 @@ package utils
 
 import (
 	"fmt"
-
-	"github.com/TicketsBot/GoPanel/log"
 	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
 )
 
 func ErrorJson(err error) map[string]any {
-	log.Logger.Error("An error occurred", zap.Error(err))
 	return ErrorStr(err.Error())
 }
 

utils/types/customembed.go

@@ -12,8 +12,8 @@ type CustomEmbed struct {
 	Url          *string        `json:"url" validate:"omitempty,url,max=255"`
 	Colour       Colour         `json:"colour" validate:"gte=0,lte=16777215"`
 	Author       Author         `json:"author" validate:"dive"`
-	ImageUrl     *string        `json:"image_url" validate:"omitempty,max=255"`
+	ImageUrl     *string        `json:"image_url" validate:"omitempty,url,max=255"`
-	ThumbnailUrl *string        `json:"thumbnail_url" validate:"omitempty,max=255"`
+	ThumbnailUrl *string        `json:"thumbnail_url" validate:"omitempty,url,max=255"`
 	Footer       Footer         `json:"footer" validate:"dive"`
 	Timestamp    *DateTimeLocal `json:"timestamp" validate:"omitempty"`
 	Fields       []Field        `json:"fields" validate:"dive,max=25"`