Skip to content

Commit 70043c8

Browse files
committed
add extra user information when migrating release
1 parent f889967 commit 70043c8

File tree

5 files changed

+34
-12
lines changed

5 files changed

+34
-12
lines changed

models/release.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ type Release struct {
2626
PublisherID int64 `xorm:"INDEX"`
2727
Publisher *User `xorm:"-"`
2828
TagName string `xorm:"INDEX UNIQUE(n)"`
29+
OriginalAuthor string
30+
OriginalAuthorID int64 `xorm:"index"`
2931
LowerTagName string
3032
Target string
3133
Title string

modules/migrations/base/release.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ type Release struct {
2525
Body string
2626
Draft bool
2727
Prerelease bool
28+
PublisherID int64
29+
PublisherName string
30+
PublisherEmail string
2831
Assets []ReleaseAsset
2932
Created time.Time
3033
Published time.Time

modules/migrations/gitea.go

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -175,18 +175,20 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
175175
var rels = make([]*models.Release, 0, len(releases))
176176
for _, release := range releases {
177177
var rel = models.Release{
178-
RepoID: g.repo.ID,
179-
PublisherID: g.doer.ID,
180-
TagName: release.TagName,
181-
LowerTagName: strings.ToLower(release.TagName),
182-
Target: release.TargetCommitish,
183-
Title: release.Name,
184-
Sha1: release.TargetCommitish,
185-
Note: release.Body,
186-
IsDraft: release.Draft,
187-
IsPrerelease: release.Prerelease,
188-
IsTag: false,
189-
CreatedUnix: timeutil.TimeStamp(release.Created.Unix()),
178+
RepoID: g.repo.ID,
179+
PublisherID: g.doer.ID,
180+
TagName: release.TagName,
181+
LowerTagName: strings.ToLower(release.TagName),
182+
Target: release.TargetCommitish,
183+
Title: release.Name,
184+
Sha1: release.TargetCommitish,
185+
Note: release.Body,
186+
IsDraft: release.Draft,
187+
IsPrerelease: release.Prerelease,
188+
IsTag: false,
189+
CreatedUnix: timeutil.TimeStamp(release.Created.Unix()),
190+
OriginalAuthor: release.PublisherName,
191+
OriginalAuthorID: release.PublisherID,
190192
}
191193

192194
// calc NumCommits

modules/migrations/github.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease)
214214
name = *rel.Name
215215
}
216216

217+
var email string
218+
if rel.Author.Email != nil {
219+
email = *rel.Author.Email
220+
}
221+
217222
r := &base.Release{
218223
TagName: *rel.TagName,
219224
TargetCommitish: *rel.TargetCommitish,
@@ -222,6 +227,9 @@ func (g *GithubDownloaderV3) convertGithubRelease(rel *github.RepositoryRelease)
222227
Draft: *rel.Draft,
223228
Prerelease: *rel.Prerelease,
224229
Created: rel.CreatedAt.Time,
230+
PublisherID: *rel.Author.ID,
231+
PublisherName: *rel.Author.Login,
232+
PublisherEmail: email,
225233
Published: rel.PublishedAt.Time,
226234
}
227235

templates/repo/release/list.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,15 @@
5454
</h3>
5555
<p class="text grey">
5656
<span class="author">
57+
{{if .OriginalAuthor}}
58+
<i class="fa fa-github" aria-hidden="true"></i>
59+
{{.OriginalAuthor}}
60+
{{else if .Publisher}}
5761
<img class="img-10" src="{{.Publisher.RelAvatarLink}}">
5862
<a href="{{AppSubUrl}}/{{.Publisher.Name}}">{{.Publisher.Name}}</a>
63+
{{else}}
64+
Ghost
65+
{{end}}
5966
</span>
6067
{{if .CreatedUnix}}<span class="time">{{TimeSinceUnix .CreatedUnix $.Lang}}</span>{{end}}
6168
<span class="ahead">{{$.i18n.Tr "repo.release.ahead" .NumCommitsBehind .Target | Str2html}}</span>

0 commit comments

Comments
 (0)