fix bug when get pull request and ref original author on code comments

Author: lunny

modules/migrations/gitea.go

@@ -774,7 +774,8 @@ func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
 		// get pr
 		pr, ok := g.prCache[issueID]
 		if !ok {
-			pr, err := models.GetPullRequestByID(issueID)
+			var err error
+			pr, err = models.GetPullRequestByIssueID(issueID)
 			if err != nil {
 				return err
 			}
@@ -794,14 +795,16 @@ func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error {
 			patch := gitdiff.CutDiffAroundLine(patchBuf, int64((&models.Comment{Line: line}).UnsignedLine()), line < 0, setting.UI.CodeCommentLines)
 
 			var c = models.Comment{
-				Type:      models.CommentTypeCode,
-				PosterID:  comment.PosterID,
-				IssueID:   issueID,
-				Content:   comment.Content,
-				Line:      line,
-				TreePath:  comment.TreePath,
-				CommitSHA: comment.CommitID,
-				Patch:     patch,
+				Type:        models.CommentTypeCode,
+				PosterID:    comment.PosterID,
+				IssueID:     issueID,
+				Content:     comment.Content,
+				Line:        line,
+				TreePath:    comment.TreePath,
+				CommitSHA:   comment.CommitID,
+				Patch:       patch,
+				CreatedUnix: timeutil.TimeStamp(comment.CreatedAt.Unix()),
+				UpdatedUnix: timeutil.TimeStamp(comment.UpdatedAt.Unix()),
 			}
 
 			if userid > 0 {

templates/repo/diff/comments.tmpl

@@ -2,12 +2,22 @@
 
 {{ $createdStr:= TimeSinceUnix .CreatedUnix $.root.Lang }}
 <div class="comment" id="{{.HashTag}}">
-	<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
-		<img src="{{.Poster.RelAvatarLink}}">
-	</a>
+	{{if .OriginalAuthor }}
+		<span class="avatar"><img src="/img/avatar_default.png"></span>
+	{{else}}
+		<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
+			<img src="{{.Poster.RelAvatarLink}}">
+		</a>
+	{{end}}
 	<div class="content">
 		<div class="ui top attached header">
-			<span class="text grey"><a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span>
+			<span class="text grey">
+				{{if .OriginalAuthor }}
+					<span class="text black"><i class="fa {{MigrationIcon $.root.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}</span> <span class="text migrate">{{if $.root.Repository.OriginalURL}} ({{$.root.i18n.Tr "repo.migrated_from" $.root.Repository.OriginalURL $.root.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
+				{{else}}
+					<a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>{{.Poster.GetDisplayName}}</a> {{$.root.i18n.Tr "repo.issues.commented_at" .HashTag $createdStr | Safe}}
+				{{end}}
+			</span>
 			<div class="ui right actions">
 			{{if and .Review}}
 				{{if eq .Review.Type 0}}