fix

Author: wxiaoguang

routers/web/user/home.go

@@ -139,7 +139,7 @@ func Dashboard(ctx *context.Context) {
 
 	ctx.Data["Feeds"] = feeds
 
-	pager := context.NewPagination(int(count), setting.UI.FeedPagingNum, page, 5)
+	pager := context.NewPagination(count, setting.UI.FeedPagingNum, page, 5)
 	pager.AddParamFromRequest(ctx.Req)
 	ctx.Data["Page"] = pager
 

services/context/pagination.go

@@ -21,6 +21,7 @@ type Pagination struct {
 
 // NewPagination creates a new instance of the Pagination struct.
 // "pagingNum" is "page size" or "limit", "current" is "page"
+// total=-1 means only showing prev/next
 func NewPagination(total, pagingNum, current, numPages int) *Pagination {
 	p := &Pagination{}
 	p.Paginater = paginator.New(total, pagingNum, current, numPages)

services/feed/feed.go

@@ -6,7 +6,6 @@ package feed
 import (
 	"context"
 	"fmt"
-	"math"
 
 	activities_model "code.gitea.io/gitea/models/activities"
 	"code.gitea.io/gitea/models/db"
@@ -16,28 +15,17 @@ import (
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/util"
 )
 
 func userFeedCacheKey(userID int64) string {
 	return fmt.Sprintf("user_feed_%d", userID)
 }
 
-func GetFeedsForDashboard(ctx context.Context, opts activities_model.GetFeedsOptions) (activities_model.ActionList, int64, error) {
+func GetFeedsForDashboard(ctx context.Context, opts activities_model.GetFeedsOptions) (activities_model.ActionList, int, error) {
 	opts.DontCount = opts.RequestedTeam == nil && opts.Date == ""
 	results, cnt, err := activities_model.GetFeeds(ctx, opts)
-	if err != nil {
-		return nil, 0, err
-	}
-	if !setting.UI.User.DashboardActivitiesPagination {
-		return results, math.MaxInt32, nil
-	}
-
-	if opts.DontCount {
-		cnt, err = cache.GetInt64(userFeedCacheKey(opts.Actor.ID), func() (int64, error) {
-			return activities_model.CountUserFeeds(ctx, opts.Actor.ID)
-		})
-	}
-	return results, cnt, err
+	return results, util.Iif(opts.DontCount, -1, int(cnt)), err
 }
 
 // GetFeeds returns actions according to the provided options