diff --git a/controllers/admin/serverConfig.go b/controllers/admin/serverConfig.go index bf854064a..328edf6e5 100644 --- a/controllers/admin/serverConfig.go +++ b/controllers/admin/serverConfig.go @@ -8,6 +8,7 @@ import ( "github.com/owncast/owncast/core/data" "github.com/owncast/owncast/core/transcoder" "github.com/owncast/owncast/models" + "github.com/owncast/owncast/router/middleware" "github.com/owncast/owncast/utils" log "github.com/sirupsen/logrus" ) @@ -17,7 +18,7 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) { ffmpeg := utils.ValidatedFfmpegPath(data.GetFfMpegPath()) usernameBlocklist := data.GetForbiddenUsernameList() - var videoQualityVariants = make([]models.StreamOutputVariant, 0) + videoQualityVariants := make([]models.StreamOutputVariant, 0) for _, variant := range data.GetStreamOutputVariants() { videoQualityVariants = append(videoQualityVariants, models.StreamOutputVariant{ Name: variant.GetName(), @@ -66,6 +67,8 @@ func GetServerConfig(w http.ResponseWriter, r *http.Request) { } w.Header().Set("Content-Type", "application/json") + middleware.DisableCache(w) + if err := json.NewEncoder(w).Encode(response); err != nil { log.Errorln(err) } diff --git a/controllers/admin/status.go b/controllers/admin/status.go index e02f1fbd0..ae56f5ad1 100644 --- a/controllers/admin/status.go +++ b/controllers/admin/status.go @@ -7,6 +7,7 @@ import ( "github.com/owncast/owncast/core" "github.com/owncast/owncast/core/data" "github.com/owncast/owncast/models" + "github.com/owncast/owncast/router/middleware" log "github.com/sirupsen/logrus" ) @@ -28,6 +29,8 @@ func Status(w http.ResponseWriter, r *http.Request) { } w.Header().Set("Content-Type", "application/json") + middleware.DisableCache(w) + err := json.NewEncoder(w).Encode(response) if err != nil { log.Errorln(err) diff --git a/controllers/chat.go b/controllers/chat.go index 31f789b0a..dbe5d9dc2 100644 --- a/controllers/chat.go +++ b/controllers/chat.go @@ -37,8 +37,6 @@ func GetChatMessages(w http.ResponseWriter, r *http.Request) { // RegisterAnonymousChatUser will register a new user. func RegisterAnonymousChatUser(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Content-Type", "application/json") - if r.Method != POST { WriteSimpleResponse(w, false, r.Method+" not supported") return @@ -72,5 +70,8 @@ func RegisterAnonymousChatUser(w http.ResponseWriter, r *http.Request) { DisplayName: newUser.DisplayName, } + w.Header().Set("Content-Type", "application/json") + middleware.DisableCache(w) + WriteResponse(w, response) } diff --git a/controllers/config.go b/controllers/config.go index 3179bda56..9e5c232df 100644 --- a/controllers/config.go +++ b/controllers/config.go @@ -30,6 +30,7 @@ type webConfigResponse struct { // GetWebConfig gets the status of the server. func GetWebConfig(w http.ResponseWriter, r *http.Request) { middleware.EnableCors(w) + middleware.DisableCache(w) w.Header().Set("Content-Type", "application/json") pageContent := utils.RenderPageContentMarkdown(data.GetExtraPageBodyContent()) diff --git a/controllers/status.go b/controllers/status.go index eb8f23621..9b90525bc 100644 --- a/controllers/status.go +++ b/controllers/status.go @@ -24,6 +24,8 @@ func GetStatus(w http.ResponseWriter, r *http.Request) { } w.Header().Set("Content-Type", "application/json") + middleware.DisableCache(w) + if err := json.NewEncoder(w).Encode(response); err != nil { InternalErrorHandler(w, err) }