mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 19:38:23 +00:00 
			
		
		
		
	Co-authored-by: Loïc Dachary <loic@dachary.org>
(cherry picked from commit b536b65189)
Conflicts:
        models/action_test.go
	  The GetFeeds function does not have a Context argument in 1.16.
	models/action.go
	  The SQL statement is essentially the same in 1.16 but
	  structured differently. The Join() was copied and the
   	  created_unix field prefixed with `action`.
	models/action_list.go
	  in 1.16 the loadRepoOwner method did not exist and
	  it was done in the RetrieveFeeds method of web/feed/profile.go.
          The safeguard to skip when act.Repo == nil was moved there.
			
			
This commit is contained in:
		| @@ -337,7 +337,7 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) { | ||||
|  | ||||
| 	actions := make([]*Action, 0, setting.UI.FeedPagingNum) | ||||
|  | ||||
| 	if err := db.GetEngine(db.DefaultContext).Limit(setting.UI.FeedPagingNum).Desc("created_unix").Where(cond).Find(&actions); err != nil { | ||||
| 	if err := db.GetEngine(db.DefaultContext).Limit(setting.UI.FeedPagingNum).Desc("`action`.created_unix").Where(cond).Join("INNER", "repository", "`repository`.id = `action`.repo_id").Find(&actions); err != nil { | ||||
| 		return nil, fmt.Errorf("Find: %v", err) | ||||
| 	} | ||||
|  | ||||
| @@ -401,7 +401,7 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) { | ||||
| 		cond = cond.And(builder.Eq{"act_user_id": opts.RequestedUser.ID}) | ||||
| 	} | ||||
| 	if !opts.IncludePrivate { | ||||
| 		cond = cond.And(builder.Eq{"is_private": false}) | ||||
| 		cond = cond.And(builder.Eq{"`action`.is_private": false}) | ||||
| 	} | ||||
| 	if !opts.IncludeDeleted { | ||||
| 		cond = cond.And(builder.Eq{"is_deleted": false}) | ||||
| @@ -414,8 +414,8 @@ func activityQueryCondition(opts GetFeedsOptions) (builder.Cond, error) { | ||||
| 		} else { | ||||
| 			dateHigh := dateLow.Add(86399000000000) // 23h59m59s | ||||
|  | ||||
| 			cond = cond.And(builder.Gte{"created_unix": dateLow.Unix()}) | ||||
| 			cond = cond.And(builder.Lte{"created_unix": dateHigh.Unix()}) | ||||
| 			cond = cond.And(builder.Gte{"`action`.created_unix": dateLow.Unix()}) | ||||
| 			cond = cond.And(builder.Lte{"`action`.created_unix": dateHigh.Unix()}) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
|   | ||||
| @@ -129,3 +129,20 @@ func TestNotifyWatchers(t *testing.T) { | ||||
| 		OpType:    action.OpType, | ||||
| 	}) | ||||
| } | ||||
|  | ||||
| func TestGetFeedsCorrupted(t *testing.T) { | ||||
| 	assert.NoError(t, unittest.PrepareTestDatabase()) | ||||
| 	user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}).(*user_model.User) | ||||
| 	unittest.AssertExistsAndLoadBean(t, &Action{ | ||||
| 		ID:     8, | ||||
| 		RepoID: 1700, | ||||
| 	}) | ||||
|  | ||||
| 	actions, err := GetFeeds(GetFeedsOptions{ | ||||
| 		RequestedUser:  user, | ||||
| 		Actor:          user, | ||||
| 		IncludePrivate: true, | ||||
| 	}) | ||||
| 	assert.NoError(t, err) | ||||
| 	assert.Len(t, actions, 0) | ||||
| } | ||||
|   | ||||
| @@ -56,3 +56,11 @@ | ||||
|   repo_id: 8 | ||||
|   is_private: false | ||||
|   created_unix: 1603011540 # grouped with id:7 | ||||
|  | ||||
| - id: 8 | ||||
|   user_id: 1 | ||||
|   op_type: 12 # close issue | ||||
|   act_user_id: 1 | ||||
|   repo_id: 1700 # dangling intentional | ||||
|   is_private: false | ||||
|   created_unix: 1603011541 | ||||
|   | ||||
| @@ -175,8 +175,10 @@ func init() { | ||||
|  | ||||
| 	checkForActionConsistency := func(t assert.TestingT, bean interface{}) { | ||||
| 		action := reflectionWrap(bean) | ||||
| 		repoRow := AssertExistsAndLoadMap(t, "repository", builder.Eq{"id": action.int("RepoID")}) | ||||
| 		assert.Equal(t, parseBool(repoRow["is_private"]), action.bool("IsPrivate"), "action: %+v", action) | ||||
| 		if action.int("RepoID") != 1700 { // dangling intentional | ||||
| 			repoRow := AssertExistsAndLoadMap(t, "repository", builder.Eq{"id": action.int("RepoID")}) | ||||
| 			assert.Equal(t, parseBool(repoRow["is_private"]), action.bool("IsPrivate"), "action: %+v", action) | ||||
| 		} | ||||
| 	} | ||||
|  | ||||
| 	consistencyCheckMap["user"] = checkForUserConsistency | ||||
|   | ||||
| @@ -34,6 +34,9 @@ func RetrieveFeeds(ctx *context.Context, options models.GetFeedsOptions) []*mode | ||||
| 	} | ||||
|  | ||||
| 	for _, act := range actions { | ||||
| 		if act.Repo == nil { | ||||
| 			continue | ||||
| 		} | ||||
| 		repoOwner, ok := userCache[act.Repo.OwnerID] | ||||
| 		if !ok { | ||||
| 			repoOwner, err = user_model.GetUserByID(act.Repo.OwnerID) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user