mirror of
https://github.com/go-gitea/gitea.git
synced 2024-11-04 08:17:24 -05:00
174213530d
The old code generates `structs.Repository.Permissions` with only `access.Permission.AccessMode`, however, it should check the units too, or the value could be incorrect. For example, `structs.Repository.Permissions.Push` could be false even the doer has write access to code unit. Should fix https://github.com/renovatebot/renovate/issues/14059#issuecomment-1047961128 (Not reported by it, I just found it when I was looking into this bug) --- Review tips: The major changes are - `modules/structs/repo.go` https://github.com/go-gitea/gitea/pull/25388/files#diff-870406f6857117f8b03611c43fca0ab9ed6d6e76a2d0069a7c1f17e8fa9092f7 - `services/convert/repository.go` https://github.com/go-gitea/gitea/pull/25388/files#diff-7736f6d2ae894c9edb7729a80ab89aa183b888a26a811a0c1fdebd18726a7101 And other changes are passive.
53 lines
1.4 KiB
Go
53 lines
1.4 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package convert
|
|
|
|
import (
|
|
"context"
|
|
|
|
activities_model "code.gitea.io/gitea/models/activities"
|
|
perm_model "code.gitea.io/gitea/models/perm"
|
|
access_model "code.gitea.io/gitea/models/perm/access"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/log"
|
|
api "code.gitea.io/gitea/modules/structs"
|
|
)
|
|
|
|
func ToActivity(ctx context.Context, ac *activities_model.Action, doer *user_model.User) *api.Activity {
|
|
p, err := access_model.GetUserRepoPermission(ctx, ac.Repo, doer)
|
|
if err != nil {
|
|
log.Error("GetUserRepoPermission[%d]: %v", ac.RepoID, err)
|
|
p.AccessMode = perm_model.AccessModeNone
|
|
}
|
|
|
|
result := &api.Activity{
|
|
ID: ac.ID,
|
|
UserID: ac.UserID,
|
|
OpType: ac.OpType.String(),
|
|
ActUserID: ac.ActUserID,
|
|
ActUser: ToUser(ctx, ac.ActUser, doer),
|
|
RepoID: ac.RepoID,
|
|
Repo: ToRepo(ctx, ac.Repo, p),
|
|
RefName: ac.RefName,
|
|
IsPrivate: ac.IsPrivate,
|
|
Content: ac.Content,
|
|
Created: ac.CreatedUnix.AsTime(),
|
|
}
|
|
|
|
if ac.Comment != nil {
|
|
result.CommentID = ac.CommentID
|
|
result.Comment = ToComment(ctx, ac.Comment)
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
func ToActivities(ctx context.Context, al activities_model.ActionList, doer *user_model.User) []*api.Activity {
|
|
result := make([]*api.Activity, 0, len(al))
|
|
for _, ac := range al {
|
|
result = append(result, ToActivity(ctx, ac, doer))
|
|
}
|
|
return result
|
|
}
|