Improve notifications to fix commit notification and support release notification

models/activities/notification.go

@@ -358,7 +358,7 @@ func (n *Notification) HTMLURL(ctx context.Context) string {
 	case NotificationSourceRepository:
 		return n.Repository.HTMLURL(ctx)
 	case NotificationSourceRelease:
-		return n.Release.HTMLURL()
+		return n.Release.HTMLURL(ctx)
 	}
 	return ""
 }

models/repo/release.go

@@ -140,8 +140,8 @@ func (r *Release) TarURL() string {
 }
 
 // HTMLURL the url for a release on the web UI. release must have attributes loaded
-func (r *Release) HTMLURL() string {
-	return r.Repo.HTMLURL() + "/releases/tag/" + util.PathEscapeSegments(r.TagName)
+func (r *Release) HTMLURL(ctx context.Context) string {
+	return r.Repo.HTMLURL(ctx) + "/releases/tag/" + util.PathEscapeSegments(r.TagName)
 }
 
 // APIUploadURL the api url to upload assets to a release. release must have attributes loaded

routers/web/feed/convert.go

@@ -289,7 +289,7 @@ func releasesToFeedItems(ctx *context.Context, releases []*repo_model.Release) (
 			title = rel.Title
 		}
 
-		link := &feeds.Link{Href: rel.HTMLURL()}
+		link := &feeds.Link{Href: rel.HTMLURL(ctx)}
 		rctx := renderhelper.NewRenderContextRepoComment(ctx, rel.Repo).WithUseAbsoluteLink(true)
 		content, err = markdown.RenderString(rctx,
 			rel.Note)

services/convert/notification.go

@@ -69,7 +69,7 @@ func ToNotificationThread(ctx context.Context, n *activities_model.Notification)
 			}
 		}
 	case activities_model.NotificationSourceCommit:
-		url := n.Repository.HTMLURL() + "/commit/" + url.PathEscape(n.CommitID)
+		url := n.Repository.HTMLURL(ctx) + "/commit/" + url.PathEscape(n.CommitID)
 		title, _ := git.SplitCommitTitleBody(n.Commit.CommitMessage, 255)
 		result.Subject = &api.NotificationSubject{
 			Type:    api.NotifySubjectCommit,
@@ -83,14 +83,14 @@ func ToNotificationThread(ctx context.Context, n *activities_model.Notification)
 			Title: n.Repository.FullName(),
 			// FIXME: this is a relative URL, rather useless and inconsistent, but keeping for backwards compat
 			URL:     n.Repository.Link(),
-			HTMLURL: n.Repository.HTMLURL(),
+			HTMLURL: n.Repository.HTMLURL(ctx),
 		}
 	case activities_model.NotificationSourceRelease:
 		result.Subject = &api.NotificationSubject{
 			Type:    api.NotifySubjectRelease,
 			Title:   n.Release.Title,
 			URL:     n.Release.Link(),
-			HTMLURL: n.Release.HTMLURL(),
+			HTMLURL: n.Release.HTMLURL(ctx),
 		}
 	}
 

services/convert/release.go

@@ -19,7 +19,7 @@ func ToAPIRelease(ctx context.Context, repo *repo_model.Repository, r *repo_mode
 		Title:        r.Title,
 		Note:         r.Note,
 		URL:          r.APIURL(),
-		HTMLURL:      r.HTMLURL(),
+		HTMLURL:      r.HTMLURL(ctx),
 		TarURL:       r.TarURL(),
 		ZipURL:       r.ZipURL(),
 		UploadURL:    r.APIUploadURL(),

services/mailer/mail_release.go

@@ -74,7 +74,7 @@ func mailNewRelease(ctx context.Context, lang string, tos []*user_model.User, re
 		"Release":  rel,
 		"Subject":  subject,
 		"Language": locale.Language(),
-		"Link":     rel.HTMLURL(),
+		"Link":     rel.HTMLURL(ctx),
 	}
 
 	var mailBody bytes.Buffer