From baed01f24753afb600a2984dcb9bcda0bb8502b6 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 22 Nov 2021 23:21:55 +0800 Subject: Remove unnecessary attributes of User struct (#17745) * Remove unnecessary functions of User struct * Move more database methods out of user struct * Move more database methods out of user struct * Fix template failure * Fix bug * Remove finished FIXME * remove unnecessary code --- routers/api/v1/user/follower.go | 8 ++++---- routers/api/v1/user/user.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'routers/api/v1/user') diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 5d66f3bcc3..edf3cea3ea 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -25,7 +25,7 @@ func responseAPIUsers(ctx *context.APIContext, users []*models.User) { } func listUserFollowers(ctx *context.APIContext, u *models.User) { - users, err := u.GetFollowers(utils.GetListOptions(ctx)) + users, err := models.GetUserFollowers(u, utils.GetListOptions(ctx)) if err != nil { ctx.Error(http.StatusInternalServerError, "GetUserFollowers", err) return @@ -91,9 +91,9 @@ func ListFollowers(ctx *context.APIContext) { } func listUserFollowing(ctx *context.APIContext, u *models.User) { - users, err := u.GetFollowing(utils.GetListOptions(ctx)) + users, err := models.GetUserFollowing(u, utils.GetListOptions(ctx)) if err != nil { - ctx.Error(http.StatusInternalServerError, "GetFollowing", err) + ctx.Error(http.StatusInternalServerError, "GetUserFollowing", err) return } @@ -157,7 +157,7 @@ func ListFollowing(ctx *context.APIContext) { } func checkUserFollowing(ctx *context.APIContext, u *models.User, followID int64) { - if u.IsFollowing(followID) { + if user_model.IsFollowing(u.ID, followID) { ctx.Status(http.StatusNoContent) } else { ctx.NotFound() diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index 535a49d766..8c57b1f099 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -103,7 +103,7 @@ func GetInfo(ctx *context.APIContext) { return } - if !u.IsVisibleToUser(ctx.User) { + if !models.IsUserVisibleToViewer(u, ctx.User) { // fake ErrUserNotExist error message to not leak information about existence ctx.NotFound("GetUserByName", models.ErrUserNotExist{Name: ctx.Params(":username")}) return -- cgit v1.2.3