First merge from develop to main (WIP) #7

Merged
sugar merged 199 commits from develop into main 2026-01-27 17:47:07 +00:00
Showing only changes of commit 2ed4a4da02 - Show all commits

View File

@@ -1,9 +1,11 @@
package user package user
import ( import (
"net/url"
"nixcn-cms/data" "nixcn-cms/data"
"nixcn-cms/internal/cryptography" "nixcn-cms/internal/cryptography"
"nixcn-cms/utils" "nixcn-cms/utils"
"unicode/utf8"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/google/uuid" "github.com/google/uuid"
@@ -42,22 +44,49 @@ func Update(c *gin.Context) {
// } // }
// userData.Email = ReqInfo.Email // userData.Email = ReqInfo.Email
// utils.HttpResponse(c, 400, "", "invilad user name")
// return
if ReqInfo.Username != "" {
if len(ReqInfo.Username) < 5 || len(ReqInfo.Username) >= 255 { if len(ReqInfo.Username) < 5 || len(ReqInfo.Username) >= 255 {
utils.HttpResponse(c, 400, "", "invilad user name") utils.HttpResponse(c, 400, "", "invalid request")
return return
} }
userData.Username = ReqInfo.Username userData.Username = ReqInfo.Username
}
if ReqInfo.Nickname != "" {
if utf8.RuneCountInString(ReqInfo.Nickname) > 24 {
utils.HttpResponse(c, 400, "", "invalid request")
return
}
userData.Nickname = ReqInfo.Nickname userData.Nickname = ReqInfo.Nickname
}
if ReqInfo.Subtitle != "" {
if utf8.RuneCountInString(ReqInfo.Subtitle) > 32 {
utils.HttpResponse(c, 400, "", "invalid request")
return
}
userData.Subtitle = ReqInfo.Subtitle userData.Subtitle = ReqInfo.Subtitle
}
if ReqInfo.Avatar != "" {
_, err := url.ParseRequestURI(ReqInfo.Avatar)
if err != nil {
utils.HttpResponse(c, 400, "", "invalid request")
return
}
userData.Avatar = ReqInfo.Avatar userData.Avatar = ReqInfo.Avatar
}
if ReqInfo.Bio != "" { if ReqInfo.Bio != "" {
if !cryptography.IsBase64Std(ReqInfo.Bio) { if !cryptography.IsBase64Std(ReqInfo.Bio) {
utils.HttpResponse(c, 400, "", "invalid base64") utils.HttpResponse(c, 400, "", "invalid request")
} return
} }
userData.Bio = ReqInfo.Bio userData.Bio = ReqInfo.Bio
}
// Update user info // Update user info
userData.UpdateByUserID(userId) userData.UpdateByUserID(userId)