aboutsummaryrefslogtreecommitdiffstats
path: root/modules/activitypub
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2023-10-24 04:54:59 +0200
committerGitHub <noreply@github.com>2023-10-24 02:54:59 +0000
commitce83609ff636f4c09d91ac53bee75a350bb571d6 (patch)
tree3ddbab3c0de4fe4249352eb52dbe35dc966e3f9e /modules/activitypub
parentdef907de7b3cda899846d55f99b0da2640a5274b (diff)
downloadgitea-ce83609ff636f4c09d91ac53bee75a350bb571d6.tar.gz
gitea-ce83609ff636f4c09d91ac53bee75a350bb571d6.zip
Upgrade to golangci-lint@v1.55.0 (#27756)
https://github.com/golangci/golangci-lint/releases/tag/v1.55.0
Diffstat (limited to 'modules/activitypub')
-rw-r--r--modules/activitypub/user_settings.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/activitypub/user_settings.go b/modules/activitypub/user_settings.go
index d196a3806e..7f939af352 100644
--- a/modules/activitypub/user_settings.go
+++ b/modules/activitypub/user_settings.go
@@ -29,11 +29,10 @@ func GetKeyPair(ctx context.Context, user *user_model.User) (pub, priv string, e
return pub, priv, err
}
return pub, priv, err
- } else {
- priv = settings[user_model.UserActivityPubPrivPem].SettingValue
- pub = settings[user_model.UserActivityPubPubPem].SettingValue
- return pub, priv, err
}
+ priv = settings[user_model.UserActivityPubPrivPem].SettingValue
+ pub = settings[user_model.UserActivityPubPubPem].SettingValue
+ return pub, priv, err
}
// GetPublicKey function returns a user's public key