mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-01 00:38:32 +01:00 
			
		
		
		
	* Report the correct number of pushes on the feeds Since the number of commits in the Action table has been limited to 5 the number of commits reported on the feeds page is now incorrectly also limited to 5. The correct number is available as the Len and this PR changes this to report this. Fix #16804 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update templates/user/dashboard/feeds.tmpl Co-authored-by: techknowlogick <techknowlogick@gitea.io>
		
			
				
	
	
		
			193 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			193 lines
		
	
	
		
			5.2 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2019 The Gitea Authors. All rights reserved.
 | |
| // Use of this source code is governed by a MIT-style
 | |
| // license that can be found in the LICENSE file.
 | |
| 
 | |
| package repository
 | |
| 
 | |
| import (
 | |
| 	"fmt"
 | |
| 	"time"
 | |
| 
 | |
| 	"code.gitea.io/gitea/models"
 | |
| 	"code.gitea.io/gitea/modules/git"
 | |
| 	"code.gitea.io/gitea/modules/log"
 | |
| 	api "code.gitea.io/gitea/modules/structs"
 | |
| )
 | |
| 
 | |
| // PushCommit represents a commit in a push operation.
 | |
| type PushCommit struct {
 | |
| 	Sha1           string
 | |
| 	Message        string
 | |
| 	AuthorEmail    string
 | |
| 	AuthorName     string
 | |
| 	CommitterEmail string
 | |
| 	CommitterName  string
 | |
| 	Timestamp      time.Time
 | |
| }
 | |
| 
 | |
| // PushCommits represents list of commits in a push operation.
 | |
| type PushCommits struct {
 | |
| 	Commits    []*PushCommit
 | |
| 	HeadCommit *PushCommit
 | |
| 	CompareURL string
 | |
| 	Len        int
 | |
| 
 | |
| 	avatars    map[string]string
 | |
| 	emailUsers map[string]*models.User
 | |
| }
 | |
| 
 | |
| // NewPushCommits creates a new PushCommits object.
 | |
| func NewPushCommits() *PushCommits {
 | |
| 	return &PushCommits{
 | |
| 		avatars:    make(map[string]string),
 | |
| 		emailUsers: make(map[string]*models.User),
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // toAPIPayloadCommit converts a single PushCommit to an api.PayloadCommit object.
 | |
| func (pc *PushCommits) toAPIPayloadCommit(repoPath, repoLink string, commit *PushCommit) (*api.PayloadCommit, error) {
 | |
| 	var err error
 | |
| 	authorUsername := ""
 | |
| 	author, ok := pc.emailUsers[commit.AuthorEmail]
 | |
| 	if !ok {
 | |
| 		author, err = models.GetUserByEmail(commit.AuthorEmail)
 | |
| 		if err == nil {
 | |
| 			authorUsername = author.Name
 | |
| 			pc.emailUsers[commit.AuthorEmail] = author
 | |
| 		}
 | |
| 	} else {
 | |
| 		authorUsername = author.Name
 | |
| 	}
 | |
| 
 | |
| 	committerUsername := ""
 | |
| 	committer, ok := pc.emailUsers[commit.CommitterEmail]
 | |
| 	if !ok {
 | |
| 		committer, err = models.GetUserByEmail(commit.CommitterEmail)
 | |
| 		if err == nil {
 | |
| 			// TODO: check errors other than email not found.
 | |
| 			committerUsername = committer.Name
 | |
| 			pc.emailUsers[commit.CommitterEmail] = committer
 | |
| 		}
 | |
| 	} else {
 | |
| 		committerUsername = committer.Name
 | |
| 	}
 | |
| 
 | |
| 	fileStatus, err := git.GetCommitFileStatus(repoPath, commit.Sha1)
 | |
| 	if err != nil {
 | |
| 		return nil, fmt.Errorf("FileStatus [commit_sha1: %s]: %v", commit.Sha1, err)
 | |
| 	}
 | |
| 
 | |
| 	return &api.PayloadCommit{
 | |
| 		ID:      commit.Sha1,
 | |
| 		Message: commit.Message,
 | |
| 		URL:     fmt.Sprintf("%s/commit/%s", repoLink, commit.Sha1),
 | |
| 		Author: &api.PayloadUser{
 | |
| 			Name:     commit.AuthorName,
 | |
| 			Email:    commit.AuthorEmail,
 | |
| 			UserName: authorUsername,
 | |
| 		},
 | |
| 		Committer: &api.PayloadUser{
 | |
| 			Name:     commit.CommitterName,
 | |
| 			Email:    commit.CommitterEmail,
 | |
| 			UserName: committerUsername,
 | |
| 		},
 | |
| 		Added:     fileStatus.Added,
 | |
| 		Removed:   fileStatus.Removed,
 | |
| 		Modified:  fileStatus.Modified,
 | |
| 		Timestamp: commit.Timestamp,
 | |
| 	}, nil
 | |
| }
 | |
| 
 | |
| // ToAPIPayloadCommits converts a PushCommits object to api.PayloadCommit format.
 | |
| // It returns all converted commits and, if provided, the head commit or an error otherwise.
 | |
| func (pc *PushCommits) ToAPIPayloadCommits(repoPath, repoLink string) ([]*api.PayloadCommit, *api.PayloadCommit, error) {
 | |
| 	commits := make([]*api.PayloadCommit, len(pc.Commits))
 | |
| 	var headCommit *api.PayloadCommit
 | |
| 
 | |
| 	if pc.emailUsers == nil {
 | |
| 		pc.emailUsers = make(map[string]*models.User)
 | |
| 	}
 | |
| 	for i, commit := range pc.Commits {
 | |
| 		apiCommit, err := pc.toAPIPayloadCommit(repoPath, repoLink, commit)
 | |
| 		if err != nil {
 | |
| 			return nil, nil, err
 | |
| 		}
 | |
| 
 | |
| 		commits[i] = apiCommit
 | |
| 		if pc.HeadCommit != nil && pc.HeadCommit.Sha1 == commits[i].ID {
 | |
| 			headCommit = apiCommit
 | |
| 		}
 | |
| 	}
 | |
| 	if pc.HeadCommit != nil && headCommit == nil {
 | |
| 		var err error
 | |
| 		headCommit, err = pc.toAPIPayloadCommit(repoPath, repoLink, pc.HeadCommit)
 | |
| 		if err != nil {
 | |
| 			return nil, nil, err
 | |
| 		}
 | |
| 	}
 | |
| 	return commits, headCommit, nil
 | |
| }
 | |
| 
 | |
| // AvatarLink tries to match user in database with e-mail
 | |
| // in order to show custom avatar, and falls back to general avatar link.
 | |
| func (pc *PushCommits) AvatarLink(email string) string {
 | |
| 	if pc.avatars == nil {
 | |
| 		pc.avatars = make(map[string]string)
 | |
| 	}
 | |
| 	avatar, ok := pc.avatars[email]
 | |
| 	if ok {
 | |
| 		return avatar
 | |
| 	}
 | |
| 
 | |
| 	size := models.DefaultAvatarPixelSize * models.AvatarRenderedSizeFactor
 | |
| 
 | |
| 	u, ok := pc.emailUsers[email]
 | |
| 	if !ok {
 | |
| 		var err error
 | |
| 		u, err = models.GetUserByEmail(email)
 | |
| 		if err != nil {
 | |
| 			pc.avatars[email] = models.SizedAvatarLink(email, size)
 | |
| 			if !models.IsErrUserNotExist(err) {
 | |
| 				log.Error("GetUserByEmail: %v", err)
 | |
| 				return ""
 | |
| 			}
 | |
| 		} else {
 | |
| 			pc.emailUsers[email] = u
 | |
| 		}
 | |
| 	}
 | |
| 	if u != nil {
 | |
| 		pc.avatars[email] = u.RealSizedAvatarLink(size)
 | |
| 	}
 | |
| 
 | |
| 	return pc.avatars[email]
 | |
| }
 | |
| 
 | |
| // CommitToPushCommit transforms a git.Commit to PushCommit type.
 | |
| func CommitToPushCommit(commit *git.Commit) *PushCommit {
 | |
| 	return &PushCommit{
 | |
| 		Sha1:           commit.ID.String(),
 | |
| 		Message:        commit.Message(),
 | |
| 		AuthorEmail:    commit.Author.Email,
 | |
| 		AuthorName:     commit.Author.Name,
 | |
| 		CommitterEmail: commit.Committer.Email,
 | |
| 		CommitterName:  commit.Committer.Name,
 | |
| 		Timestamp:      commit.Author.When,
 | |
| 	}
 | |
| }
 | |
| 
 | |
| // GitToPushCommits transforms a list of git.Commits to PushCommits type.
 | |
| func GitToPushCommits(gitCommits []*git.Commit) *PushCommits {
 | |
| 	commits := make([]*PushCommit, 0, len(gitCommits))
 | |
| 	for _, commit := range gitCommits {
 | |
| 		commits = append(commits, CommitToPushCommit(commit))
 | |
| 	}
 | |
| 	return &PushCommits{
 | |
| 		Commits:    commits,
 | |
| 		HeadCommit: nil,
 | |
| 		CompareURL: "",
 | |
| 		Len:        len(commits),
 | |
| 		avatars:    make(map[string]string),
 | |
| 		emailUsers: make(map[string]*models.User),
 | |
| 	}
 | |
| }
 |