Merge branch 'mergeUser' of github.com:Baihhh/community into mergeUser

goplus · Feb 26, 2024 · afd62ed · afd62ed
2 parents 942de5d + c8a6f31
commit afd62ed
Show file tree

Hide file tree

Showing 4 changed files with 305 additions and 262 deletions.
diff --git a/cmd/gopcomm/community_yap.gox b/cmd/gopcomm/community_yap.gox
@@ -264,34 +264,33 @@ get "/delete", ctx => {
 }
 
 get "/medias", ctx => {
- format := ctx.param("format")
- uid := ctx.param("uid")
- page := ctx.param("page")
- limit := ctx.param("limit")
- limitInt, err := strconv.Atoi(limit)
- if err != nil {
- limitInt = limitConst
- }
- pageInt, err := strconv.Atoi(page)
- if err != nil {
- pageInt = 1
- }
- files, total, err := community.ListMediaByUserId(todo, uid, format, pageInt, limitInt)
- if err != nil {
- ctx.json {
- "code":  0,
- "total": total,
- "err":  err.Error(),
- }
- } else {
- ctx.json {
- "code": 200,
- "total": total,
- "items": files,
- }
- }
+ format := ctx.param("format")
+ uid := ctx.param("uid")
+ page := ctx.param("page")
+ pageInt, err := strconv.Atoi(page)
+ if err != nil {
+ pageInt = 1
+ }
+ limit := ctx.param("limit")
+ limitInt, err := strconv.Atoi(limit)
+ if err != nil {
+ limitInt = limitConst
+ }
+ files, count, err := community.ListMediaByUserId(todo, uid, format,pageInt,limitInt)
+ if err != nil {
+ ctx.json {
+ "code": 0,
+ "total": count,
+ "err": err.Error(),
+ }
+ } else {
+ ctx.json {
+ "code": 200,
+ "total": count,
+ "items": files,
+ }
+ }
 }
-
 get "/delMedia", ctx => {
  id := ctx.param("id")
  token, err := core.GetToken(ctx)