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

fixed follow page incorrect results
rocboss · Oct 31, 2023 · 224f39d · 224f39d
2 parents 6a66a29 a93cc01
commit 224f39d
Show file tree

Hide file tree

Showing 26 changed files with 37 additions and 25 deletions.
diff --git a/CHANGELOG.md b/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 --git a/internal/servants/web/followship.go b/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

diff --git a/web/dist/assets/404-ee20e4ba.js → web/dist/assets/404-3870dbb4.js b/web/dist/assets/404-ee20e4ba.js → web/dist/assets/404-3870dbb4.js
diff --git a/web/dist/assets/Anouncement-0447e517.js → web/dist/assets/Anouncement-ffc6370f.js b/web/dist/assets/Anouncement-0447e517.js → web/dist/assets/Anouncement-ffc6370f.js
diff --git a/web/dist/assets/Collection-108636d5.js → web/dist/assets/Collection-c204e163.js b/web/dist/assets/Collection-108636d5.js → web/dist/assets/Collection-c204e163.js