gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-09-16 07:56:24 -07:00
Code Releases Activity

Don't override global banners in randomBanner if a board is requested

Browse source
This commit is contained in:
Eggbertx 2023-04-11 12:19:24 -07:00
parent 8eb173296c
commit 64956ecd2d
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/gochan/server.go
View file

@ -79,13 +79,14 @@ func initServer() {
func randomBanner(writer http.ResponseWriter, request *http.Request) {
writer.Header().Set("Content-Type", "application/json")
banners := config.GetBoardConfig("").Banners // get global banners
boardDir := request.FormValue("board")
boardCfg := config.GetBoardConfig(boardDir)
var banner *config.PageBanner
if len(boardCfg.Banners) > 1 {
banner = &boardCfg.Banners[rand.Intn(len(boardCfg.Banners)-1)]
} else if len(boardCfg.Banners) == 1 {
banner = &boardCfg.Banners[0]
if boardDir != "" {
banners = append(banners, config.GetBoardConfig(boardDir).Banners...)
}
var banner config.PageBanner
if len(banners) > 0 {
banner = banners[rand.Intn(len(banners))]
}
err := json.NewEncoder(writer).Encode(banner)
if err != nil {
@ -96,7 +97,7 @@ func randomBanner(writer http.ResponseWriter, request *http.Request) {
})
return
}
if banner != nil {
if banner.Filename != "" {
gcutil.LogAccess(request).Str("board", boardDir).Str("banner", banner.Filename).Send()
}
}