feat: vendor gitea 1.16.2

package/gitea/source/models/activities/action.go

@@ -186,15 +186,7 @@ func (a *Action) LoadActUser(ctx context.Context) {
 	if a.ActUser != nil {
 		return
 	}
-	var err error
-	a.ActUser, err = user_model.GetPossibleUserByID(ctx, a.ActUserID)
-	if err == nil {
-		return
-	} else if user_model.IsErrUserNotExist(err) {
-		a.ActUser = user_model.NewGhostUser()
-	} else {
-		log.Error("GetUserByID(%d): %v", a.ActUserID, err)
-	}
+	a.ActUserID, a.ActUser, _ = user_model.GetPossibleUserByID(ctx, a.ActUserID)
 }
 
 func (a *Action) LoadRepo(ctx context.Context) error {
@@ -444,6 +436,12 @@ type GetFeedsOptions struct {
 	DontCount       bool                   // do counting in GetFeeds
 }
 
+func (opts *GetFeedsOptions) ApplyPublicOnly(publicOnly bool) {
+	if publicOnly {
+		opts.IncludePrivate = false
+	}
+}
+
 // ActivityReadable return whether doer can read activities of user
 func ActivityReadable(user, doer *user_model.User) bool {
 	return !user.KeepActivityPrivate ||

package/gitea/source/models/activities/action_list.go

@@ -30,7 +30,7 @@ func (actions ActionList) getUserIDs() []int64 {
 
 func (actions ActionList) LoadActUsers(ctx context.Context) (map[int64]*user_model.User, error) {
 	if len(actions) == 0 {
-		return nil, nil
+		return nil, nil //nolint:nilnil // returns nil when there are no actions
 	}
 
 	userIDs := actions.getUserIDs()

package/gitea/source/models/activities/notification_list.go

@@ -113,7 +113,7 @@ func createOrUpdateIssueNotifications(ctx context.Context, issueID, commentID, n
 		}
 		toNotify.AddMultiple(issueParticipants...)
 
-		// dont notify user who cause notification
+		// don't notify user who cause notification
 		delete(toNotify, notificationAuthorID)
 		// explicit unwatch on issue
 		issueUnWatches, err := issues_model.GetIssueWatchersIDs(ctx, issueID, false)

package/gitea/source/models/activities/user_heatmap.go

@@ -5,9 +5,6 @@ package activities
 
 import (
 	"context"
-	"encoding/json"
-	"sort"
-	"time"
 
 	"code.gitea.io/gitea/models/db"
 	"code.gitea.io/gitea/models/organization"
@@ -22,27 +19,14 @@ type UserHeatmapData struct {
 	Contributions int64              `json:"contributions"`
 }
 
-type heatmapPushAction struct {
-	Content     string             `xorm:"content"`
-	CreatedUnix timeutil.TimeStamp `xorm:"created_unix"`
-}
-
-type heatmapPushActionContent struct {
-	Commits []*heatmapPushCommit `json:"Commits"`
-}
-
-type heatmapPushCommit struct {
-	Timestamp time.Time `json:"Timestamp"`
-}
-
-// GetUserHeatmapDataByUser returns an array of UserHeatmapData
+// GetUserHeatmapDataByUser returns an array of UserHeatmapData, it checks whether doer can access user's activity
 func GetUserHeatmapDataByUser(ctx context.Context, user, doer *user_model.User) ([]*UserHeatmapData, error) {
 	return getUserHeatmapData(ctx, user, nil, doer)
 }
 
-// GetUserHeatmapDataByUserTeam returns an array of UserHeatmapData
-func GetUserHeatmapDataByUserTeam(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
-	return getUserHeatmapData(ctx, user, team, doer)
+// GetUserHeatmapDataByOrgTeam returns an array of UserHeatmapData, it checks whether doer can access org's activity
+func GetUserHeatmapDataByOrgTeam(ctx context.Context, org *organization.Organization, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
+	return getUserHeatmapData(ctx, org.AsUser(), team, doer)
 }
 
 func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
@@ -78,84 +62,12 @@ func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organi
 		return nil, err
 	}
 
-	cutoff := timeutil.TimeStampNow() - (366+7)*86400
-	engine := db.GetEngine(ctx)
-
-	if err := engine.
+	return hdata, db.GetEngine(ctx).
 		Select(groupBy+" AS timestamp, count(user_id) as contributions").
 		Table("action").
 		Where(cond).
-		And("created_unix > ?", cutoff). // (366+7) days to include the first week for the heatmap
-		And("op_type != ?", ActionCommitRepo).
-		And("op_type != ?", ActionMirrorSyncPush).
+		And("created_unix > ?", timeutil.TimeStampNow()-(366+7)*86400). // (366+7) days to include the first week for the heatmap
 		GroupBy(groupByName).
 		OrderBy("timestamp").
-		Find(&hdata); err != nil {
-		return nil, err
-	}
-
-	pushActions := make([]*heatmapPushAction, 0)
-	if err := engine.
-		Table("action").
-		Where(cond).
-		And("created_unix > ?", cutoff).
-		And("(op_type = ? OR op_type = ?)", ActionCommitRepo, ActionMirrorSyncPush).
-		Cols("content", "created_unix").
-		Find(&pushActions); err != nil {
-		return nil, err
-	}
-
-	byTimestamp := make(map[timeutil.TimeStamp]*UserHeatmapData, len(hdata))
-	for _, item := range hdata {
-		byTimestamp[item.Timestamp] = item
-	}
-
-	for _, action := range pushActions {
-		payload := new(heatmapPushActionContent)
-		if err := json.Unmarshal([]byte(action.Content), payload); err != nil || len(payload.Commits) == 0 {
-			entry := heatmapEntryForTimestamp(byTimestamp, &hdata, action.CreatedUnix/900*900)
-			entry.Contributions++
-			continue
-		}
-
-		for _, commit := range payload.Commits {
-			if commit == nil {
-				continue
-			}
-
-			commitUnix := timeutil.TimeStamp(commit.Timestamp.Unix())
-			if commitUnix <= cutoff {
-				continue
-			}
-
-			entry := heatmapEntryForTimestamp(byTimestamp, &hdata, commitUnix/900*900)
-			entry.Contributions++
-		}
-	}
-
-	sort.Slice(hdata, func(i, j int) bool {
-		return hdata[i].Timestamp < hdata[j].Timestamp
-	})
-
-	return hdata, nil
-}
-
-func heatmapEntryForTimestamp(byTimestamp map[timeutil.TimeStamp]*UserHeatmapData, hdata *[]*UserHeatmapData, timestamp timeutil.TimeStamp) *UserHeatmapData {
-	if entry, ok := byTimestamp[timestamp]; ok {
-		return entry
-	}
-
-	entry := &UserHeatmapData{Timestamp: timestamp}
-	byTimestamp[timestamp] = entry
-	*hdata = append(*hdata, entry)
-	return entry
-}
-
-// GetTotalContributionsInHeatmap returns the total number of contributions in a heatmap
-func GetTotalContributionsInHeatmap(hdata []*UserHeatmapData) int64 {
-	var total int64
-	for _, v := range hdata {
-		total += v.Contributions
-	}
-	return total
+		Find(&hdata)
 }