diff --git a/pkg/models/forum_recent.go b/pkg/models/forum_recent.go index 38febb4..63cf89c 100644 --- a/pkg/models/forum_recent.go +++ b/pkg/models/forum_recent.go @@ -38,6 +38,11 @@ func PaginateRecentPosts(user *User, categories []string, pager *Pagination) ([] wheres = append(wheres, "forums.explicit = false") } + // Circle membership. + if !user.IsInnerCircle() { + wheres = append(wheres, "forums.inner_circle is not true") + } + // Get the page of recent forum comment IDs of all time. type scanner struct { CommentID uint64 diff --git a/web/templates/photo/gallery.html b/web/templates/photo/gallery.html index 8c81fd1..b4fda1e 100644 --- a/web/templates/photo/gallery.html +++ b/web/templates/photo/gallery.html @@ -341,22 +341,24 @@ {{end}} - {{if and (.CurrentUser.IsInnerCircle) (not .User.InnerCircle) (ne .CurrentUser.Username .User.Username)}} -
- - Does {{.User.Username}} show a lot of nudity? Consider - inviting them to join the {{PrettyCircle}}. -
- {{else if (and .CurrentUser.IsInnerCircle .User.IsInnerCircle)}} -
- - {{.User.Username}} is a part of the {{PrettyCircle}}. - {{if .CurrentUser.IsAdmin}} - - Remove from circle? - + {{if not .IsSiteGallery}} + {{if and (.CurrentUser.IsInnerCircle) (not .User.InnerCircle) (ne .CurrentUser.Username .User.Username)}} +
+ + Does {{.User.Username}} show a lot of nudity? Consider + inviting them to join the {{PrettyCircle}}. +
+ {{else if (and .CurrentUser.IsInnerCircle .User.IsInnerCircle)}} +
+ + {{.User.Username}} is a part of the {{PrettyCircle}}. + {{if .CurrentUser.IsAdmin}} + + Remove from circle? + + {{end}} +
{{end}} -
{{end}} {{template "pager" .}}