summaryrefslogtreecommitdiffstats
path: root/routers/web/user
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2023-07-04 20:36:08 +0200
committerGitHub <noreply@github.com>2023-07-04 18:36:08 +0000
commit88f835192d1a554d233b0ec4daa33276b7eb2910 (patch)
tree438140c295791e64a3b78dcfeae57701bcf296c3 /routers/web/user
parent00dbba7f4266032a2b91b760e7c611950ffad096 (diff)
downloadgitea-88f835192d1a554d233b0ec4daa33276b7eb2910.tar.gz
gitea-88f835192d1a554d233b0ec4daa33276b7eb2910.zip
Replace `interface{}` with `any` (#25686)
Result of running `perl -p -i -e 's#interface\{\}#any#g' **/*` and `make fmt`. Basically the same [as golang did](https://github.com/golang/go/commit/2580d0e08d5e9f979b943758d3c49877fb2324cb).
Diffstat (limited to 'routers/web/user')
-rw-r--r--routers/web/user/home.go2
-rw-r--r--routers/web/user/search.go4
-rw-r--r--routers/web/user/setting/account.go2
-rw-r--r--routers/web/user/setting/applications.go2
-rw-r--r--routers/web/user/setting/keys.go2
-rw-r--r--routers/web/user/setting/oauth2_common.go4
-rw-r--r--routers/web/user/setting/security/openid.go2
-rw-r--r--routers/web/user/setting/security/security.go2
-rw-r--r--routers/web/user/setting/security/webauthn.go2
-rw-r--r--routers/web/user/setting/webhooks.go2
-rw-r--r--routers/web/user/task.go8
11 files changed, 16 insertions, 16 deletions
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index 2513fc9a98..1b0f651b07 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -97,7 +97,7 @@ func Dashboard(ctx *context.Context) {
uid = ctxUser.ID
}
- ctx.PageData["dashboardRepoList"] = map[string]interface{}{
+ ctx.PageData["dashboardRepoList"] = map[string]any{
"searchLimit": setting.UI.User.RepoPagingNum,
"uid": uid,
}
diff --git a/routers/web/user/search.go b/routers/web/user/search.go
index bdc4116e37..fa2e52dd41 100644
--- a/routers/web/user/search.go
+++ b/routers/web/user/search.go
@@ -28,7 +28,7 @@ func Search(ctx *context.Context) {
ListOptions: listOptions,
})
if err != nil {
- ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+ ctx.JSON(http.StatusInternalServerError, map[string]any{
"ok": false,
"error": err.Error(),
})
@@ -37,7 +37,7 @@ func Search(ctx *context.Context) {
ctx.SetTotalCountHeader(maxResults)
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"ok": true,
"data": convert.ToUsers(ctx, ctx.Doer, users),
})
diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go
index a67c2398fb..532f0d8e39 100644
--- a/routers/web/user/setting/account.go
+++ b/routers/web/user/setting/account.go
@@ -227,7 +227,7 @@ func DeleteEmail(ctx *context.Context) {
log.Trace("Email address deleted: %s", ctx.Doer.Name)
ctx.Flash.Success(ctx.Tr("settings.email_deletion_success"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/account",
})
}
diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go
index f9e9ca5e52..8120937696 100644
--- a/routers/web/user/setting/applications.go
+++ b/routers/web/user/setting/applications.go
@@ -83,7 +83,7 @@ func DeleteApplication(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("settings.delete_token_success"))
}
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/applications",
})
}
diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go
index 6debf95bbc..d9412cae7c 100644
--- a/routers/web/user/setting/keys.go
+++ b/routers/web/user/setting/keys.go
@@ -256,7 +256,7 @@ func DeleteKey(ctx *context.Context) {
ctx.Flash.Warning("Function not implemented")
ctx.Redirect(setting.AppSubURL + "/user/settings/keys")
}
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/keys",
})
}
diff --git a/routers/web/user/setting/oauth2_common.go b/routers/web/user/setting/oauth2_common.go
index 5de0f0e22f..923ce4b436 100644
--- a/routers/web/user/setting/oauth2_common.go
+++ b/routers/web/user/setting/oauth2_common.go
@@ -138,7 +138,7 @@ func (oa *OAuth2CommonHandlers) DeleteApp(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("settings.remove_oauth2_application_success"))
- ctx.JSON(http.StatusOK, map[string]interface{}{"redirect": oa.BasePathList})
+ ctx.JSON(http.StatusOK, map[string]any{"redirect": oa.BasePathList})
}
// RevokeGrant revokes the grant
@@ -149,5 +149,5 @@ func (oa *OAuth2CommonHandlers) RevokeGrant(ctx *context.Context) {
}
ctx.Flash.Success(ctx.Tr("settings.revoke_oauth2_grant_success"))
- ctx.JSON(http.StatusOK, map[string]interface{}{"redirect": oa.BasePathList})
+ ctx.JSON(http.StatusOK, map[string]any{"redirect": oa.BasePathList})
}
diff --git a/routers/web/user/setting/security/openid.go b/routers/web/user/setting/security/openid.go
index 08fcb6b623..f4133f3916 100644
--- a/routers/web/user/setting/security/openid.go
+++ b/routers/web/user/setting/security/openid.go
@@ -112,7 +112,7 @@ func DeleteOpenID(ctx *context.Context) {
log.Trace("OpenID address deleted: %s", ctx.Doer.Name)
ctx.Flash.Success(ctx.Tr("settings.openid_deletion_success"))
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/security",
})
}
diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go
index 6e6e7efb0b..cc5f817a9d 100644
--- a/routers/web/user/setting/security/security.go
+++ b/routers/web/user/setting/security/security.go
@@ -48,7 +48,7 @@ func DeleteAccountLink(ctx *context.Context) {
}
}
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/security",
})
}
diff --git a/routers/web/user/setting/security/webauthn.go b/routers/web/user/setting/security/webauthn.go
index 826562f157..89ac184a47 100644
--- a/routers/web/user/setting/security/webauthn.go
+++ b/routers/web/user/setting/security/webauthn.go
@@ -116,7 +116,7 @@ func WebauthnDelete(ctx *context.Context) {
ctx.ServerError("GetWebAuthnCredentialByID", err)
return
}
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/security",
})
}
diff --git a/routers/web/user/setting/webhooks.go b/routers/web/user/setting/webhooks.go
index 9b0b0c9611..db03d7b1ed 100644
--- a/routers/web/user/setting/webhooks.go
+++ b/routers/web/user/setting/webhooks.go
@@ -42,7 +42,7 @@ func DeleteWebhook(ctx *context.Context) {
ctx.Flash.Success(ctx.Tr("repo.settings.webhook_deletion_success"))
}
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"redirect": setting.AppSubURL + "/user/settings/hooks",
})
}
diff --git a/routers/web/user/task.go b/routers/web/user/task.go
index 3818682403..d92bf64af0 100644
--- a/routers/web/user/task.go
+++ b/routers/web/user/task.go
@@ -17,12 +17,12 @@ func TaskStatus(ctx *context.Context) {
task, opts, err := admin_model.GetMigratingTaskByID(ctx.ParamsInt64("task"), ctx.Doer.ID)
if err != nil {
if admin_model.IsErrTaskDoesNotExist(err) {
- ctx.JSON(http.StatusNotFound, map[string]interface{}{
+ ctx.JSON(http.StatusNotFound, map[string]any{
"error": "task `" + strconv.FormatInt(ctx.ParamsInt64("task"), 10) + "` does not exist",
})
return
}
- ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+ ctx.JSON(http.StatusInternalServerError, map[string]any{
"err": err,
})
return
@@ -36,13 +36,13 @@ func TaskStatus(ctx *context.Context) {
if err := json.Unmarshal([]byte(message), &translatableMessage); err != nil {
translatableMessage = admin_model.TranslatableMessage{
Format: "migrate.migrating_failed.error",
- Args: []interface{}{task.Message},
+ Args: []any{task.Message},
}
}
message = ctx.Tr(translatableMessage.Format, translatableMessage.Args...)
}
- ctx.JSON(http.StatusOK, map[string]interface{}{
+ ctx.JSON(http.StatusOK, map[string]any{
"status": task.Status,
"message": message,
"repo-id": task.RepoID,