Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use GetDisplayName() instead of DisplayName() to generate rss feeds (#31687)

Browse Source 
Fixes #31491 The RSS feed converted ignored the setting used in the
application.
This commit is contained in:
Stanislas Dolcini 2024-07-25 11:33:02 +02:00 committed by GitHub
parent 169031b7cf
commit d8f82cbc78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
routers/web/feed/convert.go
View File

@ -83,7 +83,7 @@ func feedActionsToFeedItems(ctx *context.Context, actions activities_model.Actio
link := &feeds.Link{Href: act.GetCommentHTMLURL(ctx)} link := &feeds.Link{Href: act.GetCommentHTMLURL(ctx)}
// title // title
title = act.ActUser.DisplayName() + " " title = act.ActUser.GetDisplayName() + " "
var titleExtra template.HTML var titleExtra template.HTML
switch act.OpType { switch act.OpType {
case activities_model.ActionCreateRepo: case activities_model.ActionCreateRepo:
@ -252,7 +252,7 @@ func feedActionsToFeedItems(ctx *context.Context, actions activities_model.Actio
Description: desc, Description: desc,
IsPermaLink: "false", IsPermaLink: "false",
Author: &feeds.Author{ Author: &feeds.Author{
Name: act.ActUser.DisplayName(), Name: act.ActUser.GetDisplayName(),
Email: act.ActUser.GetEmail(), Email: act.ActUser.GetEmail(),
}, },
Id: fmt.Sprintf("%v: %v", strconv.FormatInt(act.ID, 10), link.Href), Id: fmt.Sprintf("%v: %v", strconv.FormatInt(act.ID, 10), link.Href),
@ -313,7 +313,7 @@ func releasesToFeedItems(ctx *context.Context, releases []*repo_model.Release) (
Link: link, Link: link,
Created: rel.CreatedUnix.AsTime(), Created: rel.CreatedUnix.AsTime(),
Author: &feeds.Author{ Author: &feeds.Author{
Name: rel.Publisher.DisplayName(), Name: rel.Publisher.GetDisplayName(),
Email: rel.Publisher.GetEmail(), Email: rel.Publisher.GetEmail(),
}, },
Id: fmt.Sprintf("%v: %v", strconv.FormatInt(rel.ID, 10), link.Href), Id: fmt.Sprintf("%v: %v", strconv.FormatInt(rel.ID, 10), link.Href),