diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..d965c42 --- /dev/null +++ b/.env.example @@ -0,0 +1,11 @@ +DAEMON= +RUN_FREQUENCY= +EXECUTION_TIMEOUT= +SENTRY_DSN= +JSON_LOGS= +LOG_LEVEL= +DISCORD_APPLICATION_ID= +DISCORD_TOKEN= +DISCORD_PROXY_HOST= +DATABASE_URI= +MAX_REMOVALS_THRESHOLD= \ No newline at end of file diff --git a/go.mod b/go.mod index dd12ff3..0f62ba4 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ module github.com/TicketsBot-cloud/discord-entitlements-db-sync go 1.22.0 +replace github.com/TicketsBot-cloud/gdl => ../gdl + require ( github.com/TicketsBot-cloud/common v0.0.0-20251026182733-99fa0dc31d90 github.com/TicketsBot-cloud/database v0.0.0-20251230153828-3a49abf50812 diff --git a/internal/daemon/daemon.go b/internal/daemon/daemon.go index 61bb92a..0a43a9a 100644 --- a/internal/daemon/daemon.go +++ b/internal/daemon/daemon.go @@ -66,7 +66,7 @@ func (d *Daemon) RunOnce(ctx context.Context) error { start := time.Now() defer func() { - duration := time.Now().Sub(start) + duration := time.Since(start) if duration > (d.config.ExecutionTimeout / 2.0) { d.logger.Warn("Execution took more than 50% of the timeout", zap.Duration("duration", duration)) } @@ -202,9 +202,9 @@ func (d *Daemon) nextPage(ctx context.Context, afterId uint64, entitlements []en d.logger.Debug("Fetching page of entitlements", zap.Uint64("after", afterId), zap.Int("limit", pageLimit), zap.Int("total", len(entitlements))) fetched, err := rest.ListEntitlements(ctx, d.config.Discord.Token, nil, d.config.Discord.ApplicationId, rest.EntitlementQueryOptions{ - After: utils.Ptr(afterId), - Limit: utils.Ptr(pageLimit), - ExcludedEnded: utils.Ptr(true), + After: utils.Ptr(afterId), + Limit: utils.Ptr(pageLimit), + ExcludeEnded: utils.Ptr(true), }) if err != nil { return nil, err