Merge pull request #425 from alimy/pr-fixed-follow-page

fixed follow page incorrect results

Author: alimy

Diff for: CHANGELOG.md

@@ -8,6 +8,9 @@ TODO;
 ### Change
 - frontend: optimize to use fold/unfold action for post item display.
 
+### Fixed
+- fixed follow page incorrect results.
+
 ## 0.5.1
 ### Added
 - User/Profile page add setting option when page's user is self.

Diff for: internal/servants/web/followship.go

@@ -35,7 +35,7 @@ func (s *followshipSrv) ListFollowings(r *web.ListFollowingsReq) (*web.ListFollo
 		logrus.Errorf("Ds.GetUserByUsername err: %s", err)
 		return nil, web.ErrNoExistUsername
 	}
-	res, err := s.Ds.ListFollowings(he.ID, r.PageSize, r.Page-1)
+	res, err := s.Ds.ListFollowings(he.ID, r.PageSize, (r.Page-1)*r.PageSize)
 	if err != nil {
 		logrus.Errorf("Ds.ListFollowings err: %s", err)
 		return nil, web.ErrListFollowingsFailed
@@ -55,7 +55,7 @@ func (s *followshipSrv) ListFollows(r *web.ListFollowsReq) (*web.ListFollowsResp
 		logrus.Errorf("Ds.GetUserByUsername err: %s", err)
 		return nil, web.ErrNoExistUsername
 	}
-	res, err := s.Ds.ListFollows(he.ID, r.PageSize, r.Page-1)
+	res, err := s.Ds.ListFollows(he.ID, r.PageSize, (r.Page-1)*r.PageSize)
 	if err != nil {
 		logrus.Errorf("Ds.ListFollows err: %s", err)
 		return nil, web.ErrListFollowsFailed