improve

Author: yp05327

models/user/user.go

@@ -353,6 +353,44 @@ func GetUserFollowing(ctx context.Context, u, viewer *User, listOptions db.ListO
 	return users, count, err
 }
 
+// GetUserFollowers returns range of user's followers.
+func GetUserFollowersCount(ctx context.Context, u, viewer *User, listOptions db.ListOptions) (int64, error) {
+	sess := db.GetEngine(ctx).
+		Select("`user`.*").
+		Join("LEFT", "follow", "`user`.id=follow.user_id").
+		Where("follow.follow_id=?", u.ID).
+		And("`user`.type=?", UserTypeIndividual).
+		And(isUserVisibleToViewerCond(viewer))
+
+	if listOptions.Page != 0 {
+		sess = db.SetSessionPagination(sess, &listOptions)
+		count, err := sess.Count()
+		return count, err
+	}
+
+	count, err := sess.Count()
+	return count, err
+}
+
+// GetUserFollowing returns range of user's following.
+func GetUserFollowingCount(ctx context.Context, u, viewer *User, listOptions db.ListOptions) (int64, error) {
+	sess := db.GetEngine(db.DefaultContext).
+		Select("`user`.*").
+		Join("LEFT", "follow", "`user`.id=follow.follow_id").
+		Where("follow.user_id=?", u.ID).
+		And("`user`.type IN (?, ?)", UserTypeIndividual, UserTypeOrganization).
+		And(isUserVisibleToViewerCond(viewer))
+
+	if listOptions.Page != 0 {
+		sess = db.SetSessionPagination(sess, &listOptions)
+		count, err := sess.Count()
+		return count, err
+	}
+
+	count, err := sess.Count()
+	return count, err
+}
+
 // NewGitSig generates and returns the signature of given user.
 func (u *User) NewGitSig() *git.Signature {
 	return &git.Signature{

services/convert/user.go

@@ -9,7 +9,6 @@ import (
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/perm"
 	user_model "code.gitea.io/gitea/models/user"
-	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
 )
 
@@ -66,22 +65,16 @@ func toUser(ctx context.Context, user, doer *user_model.User, accessMode perm.Ac
 		signed = true
 		authed = doer.ID == user.ID || doer.IsAdmin
 
-		_, followersCount, err := user_model.GetUserFollowers(ctx, user, doer, db.ListOptions{
-			Page:     1,
-			PageSize: setting.API.DefaultPagingNum,
-		})
+		count, err := user_model.GetUserFollowersCount(ctx, user, doer, db.ListOptions{ListAll: true})
 		if err != nil {
 			return nil
 		}
-		result.Followers = int(followersCount)
-		_, followingCount, err := user_model.GetUserFollowing(ctx, user, doer, db.ListOptions{
-			Page:     1,
-			PageSize: setting.API.DefaultPagingNum,
-		})
+		result.Followers = int(count)
+		count, err = user_model.GetUserFollowingCount(ctx, user, doer, db.ListOptions{ListAll: true})
 		if err != nil {
 			return nil
 		}
-		result.Following = int(followingCount)
+		result.Following = int(count)
 	} else if accessMode != perm.AccessModeNone {
 		signed = true
 	}