From 172c39f78181a3e4ef6c1f4eeaebe8ed97880058 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Wed, 15 Jun 2022 08:47:32 +0200 Subject: [PATCH] use const for key values --- modules/activitypub/user_settings.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/activitypub/user_settings.go b/modules/activitypub/user_settings.go index 553ea535f9a0..3289d45c53f6 100644 --- a/modules/activitypub/user_settings.go +++ b/modules/activitypub/user_settings.go @@ -8,25 +8,30 @@ import ( user_model "code.gitea.io/gitea/models/user" ) +const ( + userActivitypubPrivpem = "activitypub_privpem" + userActivitypubPubpem = "activitypub_pubpem" +) + // GetKeyPair function func GetKeyPair(user *user_model.User) (pub, priv string, err error) { var settings map[string]*user_model.Setting - if settings, err = user_model.GetUserSettings(user.ID, []string{"activitypub_privpem", "activitypub_pubpem"}); err != nil { + if settings, err = user_model.GetUserSettings(user.ID, []string{userActivitypubPrivpem, userActivitypubPubpem}); err != nil { return } else if len(settings) == 0 { if priv, pub, err = GenerateKeyPair(); err != nil { return } - if err = user_model.SetUserSetting(user.ID, "activitypub_privpem", priv); err != nil { + if err = user_model.SetUserSetting(user.ID, userActivitypubPrivpem, priv); err != nil { return } - if err = user_model.SetUserSetting(user.ID, "activitypub_pubpem", pub); err != nil { + if err = user_model.SetUserSetting(user.ID, userActivitypubPubpem, pub); err != nil { return } return } else { - priv = settings["activitypub_privpem"].SettingValue - pub = settings["activitypub_pubpem"].SettingValue + priv = settings[userActivitypubPrivpem].SettingValue + pub = settings[userActivitypubPubpem].SettingValue return } }