From 215981dfde8313c2347b87592da2efb65a23eaf8 Mon Sep 17 00:00:00 2001 From: Athurg Gooth Date: Thu, 26 Oct 2023 20:21:44 +0800 Subject: [PATCH] chore: remote context.Context pointer (#2448) remote context.Context pointer --- api/v1/resource.go | 2 +- server/integration/telegram.go | 2 +- server/service/backup/backup.go | 2 +- store/system_setting.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/v1/resource.go b/api/v1/resource.go index 63825866..61ca18a7 100644 --- a/api/v1/resource.go +++ b/api/v1/resource.go @@ -187,7 +187,7 @@ func (s *APIV1Service) UploadResource(c echo.Context) error { } // This is the backend default max upload size limit. - maxUploadSetting := s.Store.GetSystemSettingValueWithDefault(&ctx, SystemSettingMaxUploadSizeMiBName.String(), "32") + maxUploadSetting := s.Store.GetSystemSettingValueWithDefault(ctx, SystemSettingMaxUploadSizeMiBName.String(), "32") var settingMaxUploadSizeBytes int if settingMaxUploadSizeMiB, err := strconv.Atoi(maxUploadSetting); err == nil { settingMaxUploadSizeBytes = settingMaxUploadSizeMiB * MebiByte diff --git a/server/integration/telegram.go b/server/integration/telegram.go index 56ea219f..902935b1 100644 --- a/server/integration/telegram.go +++ b/server/integration/telegram.go @@ -24,7 +24,7 @@ func NewTelegramHandler(store *store.Store) *TelegramHandler { } func (t *TelegramHandler) BotToken(ctx context.Context) string { - return t.store.GetSystemSettingValueWithDefault(&ctx, apiv1.SystemSettingTelegramBotTokenName.String(), "") + return t.store.GetSystemSettingValueWithDefault(ctx, apiv1.SystemSettingTelegramBotTokenName.String(), "") } const ( diff --git a/server/service/backup/backup.go b/server/service/backup/backup.go index 4747ab28..b11da7cf 100644 --- a/server/service/backup/backup.go +++ b/server/service/backup/backup.go @@ -25,7 +25,7 @@ func NewBackupRunner(store *store.Store) *BackupRunner { } func (r *BackupRunner) Run(ctx context.Context) { - intervalStr := r.Store.GetSystemSettingValueWithDefault(&ctx, apiv1.SystemSettingAutoBackupIntervalName.String(), "") + intervalStr := r.Store.GetSystemSettingValueWithDefault(ctx, apiv1.SystemSettingAutoBackupIntervalName.String(), "") if intervalStr == "" { log.Debug("no SystemSettingAutoBackupIntervalName setting, disable auto backup") return diff --git a/store/system_setting.go b/store/system_setting.go index 6d7b48c1..9ae3232c 100644 --- a/store/system_setting.go +++ b/store/system_setting.go @@ -51,8 +51,8 @@ func (s *Store) GetSystemSetting(ctx context.Context, find *FindSystemSetting) ( return systemSettingMessage, nil } -func (s *Store) GetSystemSettingValueWithDefault(ctx *context.Context, settingName string, defaultValue string) string { - if setting, err := s.GetSystemSetting(*ctx, &FindSystemSetting{ +func (s *Store) GetSystemSettingValueWithDefault(ctx context.Context, settingName string, defaultValue string) string { + if setting, err := s.GetSystemSetting(ctx, &FindSystemSetting{ Name: settingName, }); err == nil && setting != nil { return setting.Value