nick12
/
hmn
forked from hmn/hmn
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fetch jam snippets by project id

This commit is contained in:
Asaf Gartner 2022-08-05 07:20:11 +03:00
parent efc7d76cb7
commit 87a146dfa8
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/website/jam.go
View File

@ -80,7 +80,7 @@ func JamIndex2022(c *RequestContext) ResponseData {
} }
showcaseItems = make([]templates.TimelineItem, 0, len(snippets)) showcaseItems = make([]templates.TimelineItem, 0, len(snippets))
for _, s := range snippets { for _, s := range snippets {
timelineItem := SnippetToTimelineItem(&s.Snippet, s.Asset, s.DiscordMessage, s.Tags, s.Owner, c.Theme) timelineItem := SnippetToTimelineItem(&s.Snippet, s.Asset, s.DiscordMessage, s.Projects, s.Owner, c.Theme, false)
if timelineItem.CanShowcase { if timelineItem.CanShowcase {
showcaseItems = append(showcaseItems, timelineItem) showcaseItems = append(showcaseItems, timelineItem)
} }
@ -110,15 +110,13 @@ func JamFeed2022(c *RequestContext) ResponseData {
return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch jam projects for current user")) return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch jam projects for current user"))
} }
jamProjectTags := make([]int, 0, len(jamProjects)) projectIds := make([]int, 0, len(jamProjects))
for _, jp := range jamProjects { for _, jp := range jamProjects {
if jp.Tag != nil { projectIds = append(projectIds, jp.Project.ID)
jamProjectTags = append(jamProjectTags, jp.Tag.ID)
}
} }
snippets, err := hmndata.FetchSnippets(c, c.Conn, c.CurrentUser, hmndata.SnippetQuery{ snippets, err := hmndata.FetchSnippets(c, c.Conn, c.CurrentUser, hmndata.SnippetQuery{
Tags: jamProjectTags, ProjectIDs: projectIds,
}) })
if err != nil { if err != nil {
return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch snippets for jam showcase")) return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch snippets for jam showcase"))
@ -127,9 +125,8 @@ func JamFeed2022(c *RequestContext) ResponseData {
timelineItems := make([]templates.TimelineItem, 0, len(snippets)) timelineItems := make([]templates.TimelineItem, 0, len(snippets))
for _, s := range snippets { for _, s := range snippets {
timelineItem := SnippetToTimelineItem(&s.Snippet, s.Asset, s.DiscordMessage, s.Tags, s.Owner, c.Theme) timelineItem := SnippetToTimelineItem(&s.Snippet, s.Asset, s.DiscordMessage, s.Projects, s.Owner, c.Theme, false)
timelineItem.SmallInfo = true timelineItem.SmallInfo = true
timelineItem.Tags = nil
timelineItems = append(timelineItems, timelineItem) timelineItems = append(timelineItems, timelineItem)
} }