Skip to content

Commit a4b40a2

Browse files
committed
move User2UserSettings to convert
1 parent 2a80654 commit a4b40a2

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

modules/convert/user.go

+15
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,18 @@ func toUser(user *models.User, signed, authed bool) *api.User {
6767
}
6868
return result
6969
}
70+
71+
// User2UserSettings return UserSettings based on a user
72+
func User2UserSettings(user *models.User) api.UserSettings {
73+
return api.UserSettings{
74+
FullName: user.FullName,
75+
Website: user.Website,
76+
Location: user.Location,
77+
Language: user.Language,
78+
Description: user.Description,
79+
Theme: user.Theme,
80+
HideEmail: user.KeepEmailPrivate,
81+
HideActivity: user.KeepActivityPrivate,
82+
DiffViewStyle: user.DiffViewStyle,
83+
}
84+
}

routers/api/v1/user/preferences.go

+3-16
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,11 @@ import (
99

1010
"code.gitea.io/gitea/models"
1111
"code.gitea.io/gitea/modules/context"
12+
"code.gitea.io/gitea/modules/convert"
1213
api "code.gitea.io/gitea/modules/structs"
1314
"code.gitea.io/gitea/modules/web"
1415
)
1516

16-
func user2UserSettings(user *models.User) api.UserSettings {
17-
return api.UserSettings{
18-
FullName: user.FullName,
19-
Website: user.Website,
20-
Location: user.Location,
21-
Language: user.Language,
22-
Description: user.Description,
23-
Theme: user.Theme,
24-
HideEmail: user.KeepEmailPrivate,
25-
HideActivity: user.KeepActivityPrivate,
26-
DiffViewStyle: user.DiffViewStyle,
27-
}
28-
}
29-
3017
// GetUserSettings returns user settings
3118
func GetUserSettings(ctx *context.APIContext) {
3219
// swagger:operation GET /user/preferences user getUserSettings
@@ -37,7 +24,7 @@ func GetUserSettings(ctx *context.APIContext) {
3724
// responses:
3825
// "200":
3926
// "$ref": "#/responses/UserSettings"
40-
ctx.JSON(http.StatusOK, user2UserSettings(ctx.User))
27+
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.User))
4128
}
4229

4330
// UpdateUserSettings returns user settings
@@ -92,5 +79,5 @@ func UpdateUserSettings(ctx *context.APIContext) {
9279
return
9380
}
9481

95-
ctx.JSON(http.StatusOK, user2UserSettings(ctx.User))
82+
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.User))
9683
}

0 commit comments

Comments
 (0)