diff --git a/server/handlers/admin.go b/server/handlers/admin.go index a93ede6..c8ab446 100644 --- a/server/handlers/admin.go +++ b/server/handlers/admin.go @@ -70,7 +70,7 @@ func Users(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" scopes := []func(db *gorm.DB) *gorm.DB{} @@ -87,7 +87,7 @@ func Users(ctx *gin.Context) { scopes = append(scopes, db.WhereRole(dbModel.RoleRoot)) } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "createdAt": if desc { scopes = append(scopes, db.OrderByCreatedAtDesc) @@ -101,7 +101,7 @@ func Users(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("username")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return } @@ -149,13 +149,13 @@ func GetRoomUsers(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" scopes := []func(db *gorm.DB) *gorm.DB{ db.PreloadRoomUserRelation(db.WhereRoomID(id)), } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "createdAt": if desc { scopes = append(scopes, db.OrderByCreatedAtDesc) @@ -169,7 +169,7 @@ func GetRoomUsers(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("username")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return } @@ -304,7 +304,7 @@ func Rooms(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" scopes := []func(db *gorm.DB) *gorm.DB{} @@ -317,7 +317,7 @@ func Rooms(ctx *gin.Context) { scopes = append(scopes, db.WhereStatus(dbModel.RoomStatusBanned)) } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "createdAt": if desc { scopes = append(scopes, db.OrderByCreatedAtDesc) @@ -331,7 +331,7 @@ func Rooms(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("name")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return } @@ -369,7 +369,7 @@ func GetUserRooms(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" scopes := []func(db *gorm.DB) *gorm.DB{ db.WhereCreatorID(id), @@ -384,7 +384,7 @@ func GetUserRooms(ctx *gin.Context) { scopes = append(scopes, db.WhereStatus(dbModel.RoomStatusBanned)) } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "createdAt": if desc { scopes = append(scopes, db.OrderByCreatedAtDesc) @@ -398,7 +398,7 @@ func GetUserRooms(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("name")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return } diff --git a/server/handlers/room.go b/server/handlers/room.go index 46f4abd..7e7d4ac 100644 --- a/server/handlers/room.go +++ b/server/handlers/room.go @@ -89,14 +89,14 @@ func RoomList(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" scopes := []func(db *gorm.DB) *gorm.DB{ db.WhereRoomSettingWithoutHidden(), db.WhereStatus(dbModel.RoomStatusActive), } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "createdAt": if desc { scopes = append(scopes, db.OrderByCreatedAtDesc) @@ -110,7 +110,7 @@ func RoomList(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("name")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return } @@ -282,7 +282,7 @@ func RoomUsers(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" preloadScopes := []func(db *gorm.DB) *gorm.DB{db.WhereRoomID(room.ID)} scopes := []func(db *gorm.DB) *gorm.DB{} @@ -296,7 +296,7 @@ func RoomUsers(ctx *gin.Context) { preloadScopes = append(preloadScopes, db.WhereRoomUserStatus(dbModel.RoomUserStatusActive)) } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "join": if desc { preloadScopes = append(preloadScopes, db.OrderByCreatedAtDesc) @@ -310,7 +310,7 @@ func RoomUsers(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("username")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return } diff --git a/server/handlers/user.go b/server/handlers/user.go index 7e50284..daa0419 100644 --- a/server/handlers/user.go +++ b/server/handlers/user.go @@ -43,7 +43,7 @@ func UserRooms(ctx *gin.Context) { return } - var desc = ctx.DefaultQuery("sort", "desc") == "desc" + var desc = ctx.DefaultQuery("order", "desc") == "desc" scopes := []func(db *gorm.DB) *gorm.DB{ db.WhereCreatorID(user.ID), @@ -58,7 +58,7 @@ func UserRooms(ctx *gin.Context) { scopes = append(scopes, db.WhereStatus(dbModel.RoomStatusBanned)) } - switch ctx.DefaultQuery("order", "name") { + switch ctx.DefaultQuery("sort", "name") { case "createdAt": if desc { scopes = append(scopes, db.OrderByCreatedAtDesc) @@ -72,7 +72,7 @@ func UserRooms(ctx *gin.Context) { scopes = append(scopes, db.OrderByAsc("name")) } default: - ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support order")) + ctx.AbortWithStatusJSON(http.StatusBadRequest, model.NewApiErrorStringResp("not support sort")) return }