Fix collection rendering in Chorus mode

This commit is contained in:
Matt Baer 2021-06-09 10:04:28 -04:00
parent e42ba392c6
commit c05f7056c4
2 changed files with 9 additions and 1 deletions

View File

@ -582,6 +582,9 @@ type CollectionPage struct {
PinnedPosts *[]PublicPost PinnedPosts *[]PublicPost
IsAdmin bool IsAdmin bool
CanInvite bool CanInvite bool
// Helper field for Chorus mode
CollAlias string
} }
func NewCollectionObj(c *Collection) *CollectionObj { func NewCollectionObj(c *Collection) *CollectionObj {
@ -818,6 +821,7 @@ func handleViewCollection(app *App, w http.ResponseWriter, r *http.Request) erro
StaticPage: pageForReq(app, r), StaticPage: pageForReq(app, r),
IsCustomDomain: cr.isCustomDomain, IsCustomDomain: cr.isCustomDomain,
IsWelcome: r.FormValue("greeting") != "", IsWelcome: r.FormValue("greeting") != "",
CollAlias: c.Alias,
} }
displayPage.IsAdmin = u != nil && u.IsAdmin() displayPage.IsAdmin = u != nil && u.IsAdmin()
displayPage.CanInvite = canUserInvite(app.cfg, displayPage.IsAdmin) displayPage.CanInvite = canUserInvite(app.cfg, displayPage.IsAdmin)

View File

@ -144,6 +144,9 @@ type (
IsAdmin bool IsAdmin bool
CanInvite bool CanInvite bool
Silenced bool Silenced bool
// Helper field for Chorus mode
CollAlias string
} }
RawPost struct { RawPost struct {
@ -1536,6 +1539,7 @@ Are you sure it was ever here?`,
IsCustomDomain: cr.isCustomDomain, IsCustomDomain: cr.isCustomDomain,
IsFound: postFound, IsFound: postFound,
Silenced: silenced, Silenced: silenced,
CollAlias: c.Alias,
} }
tp.IsAdmin = u != nil && u.IsAdmin() tp.IsAdmin = u != nil && u.IsAdmin()
tp.CanInvite = canUserInvite(app.cfg, tp.IsAdmin) tp.CanInvite = canUserInvite(app.cfg, tp.IsAdmin)
@ -1551,7 +1555,7 @@ Are you sure it was ever here?`,
postTmpl = "chorus-collection-post" postTmpl = "chorus-collection-post"
} }
if err := templates[postTmpl].ExecuteTemplate(w, "post", tp); err != nil { if err := templates[postTmpl].ExecuteTemplate(w, "post", tp); err != nil {
log.Error("Error in collection-post template: %v", err) log.Error("Error in %s template: %v", postTmpl, err)
} }
} }