diff options
| author | 6543 <6543@obermui.de> | 2020-10-17 06:23:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 00:23:08 -0400 |
| commit | d453533beb197d25b25530dc5f0e3c3c0742d8d1 (patch) | |
| tree | 6d66e1163333344d91af63e9ab50a82367470b8f /modules/convert/git_commit.go | |
| parent | 131278ff222f1a8580f20e6bbdff405341403042 (diff) | |
| download | gitea-d453533beb197d25b25530dc5f0e3c3c0742d8d1.tar.gz gitea-d453533beb197d25b25530dc5f0e3c3c0742d8d1.zip | |
[Refactor] Move APIFormat functions into convert package (#12856)
* USER APIFormat -> ToUser
* Migrate more and mark APIFormat deprecated
* models.Comment APIFormat() -> convert.ToComment
* models.Release APIFormat() -> convert.ToRelease
* models.Attachments APIFormat() -> convert.ToReleaseAttachments
* models.CommitStatus APIFormat() -> convert.ToCommitStatus
* finish migration to convert.ToUser
* Move Test
* Imprufe Test
* fix test
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'modules/convert/git_commit.go')
| -rw-r--r-- | modules/convert/git_commit.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/convert/git_commit.go b/modules/convert/git_commit.go index 86d6dae961..87dfb51e70 100644 --- a/modules/convert/git_commit.go +++ b/modules/convert/git_commit.go @@ -86,13 +86,13 @@ func ToCommit(repo *models.Repository, commit *git.Commit, userCache map[string] } if ok { - apiAuthor = cacheAuthor.APIFormat() + apiAuthor = ToUser(cacheAuthor, false, false) } else { author, err := models.GetUserByEmail(commit.Author.Email) if err != nil && !models.IsErrUserNotExist(err) { return nil, err } else if err == nil { - apiAuthor = author.APIFormat() + apiAuthor = ToUser(author, false, false) if userCache != nil { userCache[commit.Author.Email] = author } @@ -108,13 +108,13 @@ func ToCommit(repo *models.Repository, commit *git.Commit, userCache map[string] } if ok { - apiCommitter = cacheCommitter.APIFormat() + apiCommitter = ToUser(cacheCommitter, false, false) } else { committer, err := models.GetUserByEmail(commit.Committer.Email) if err != nil && !models.IsErrUserNotExist(err) { return nil, err } else if err == nil { - apiCommitter = committer.APIFormat() + apiCommitter = ToUser(committer, false, false) if userCache != nil { userCache[commit.Committer.Email] = committer } |