LogalDeveloper/owncast
0
Fork 0
Code Activity

Make stream keys objects with comment instead of string slice

Browse Source
This commit is contained in:
Gabe Kangas
2022-11-23 16:39:55 -08:00
parent c9e3ccad45
commit c4dc802941
8 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
controllers/admin/config.go
View File

@@ -796,17 +796,18 @@ func SetStreamKeys(w http.ResponseWriter, r *http.Request) {
return
}
configValues, success := getValuesFromRequest(w, r)
if !success {
type streamKeysRequest struct {
Value []models.StreamKey `json:"value"`
}
decoder := json.NewDecoder(r.Body)
var streamKeys streamKeysRequest
if err := decoder.Decode(&streamKeys); err != nil {
controllers.WriteSimpleResponse(w, false, "unable to update stream keys with provided values")
return
}
streamKeyStrings := make([]string, 0)
for _, key := range configValues {
streamKeyStrings = append(streamKeyStrings, key.Value.(string))
}
if err := data.SetStreamKeys(streamKeyStrings); err != nil {
if err := data.SetStreamKeys(streamKeys.Value); err != nil {
controllers.WriteSimpleResponse(w, false, err.Error())
return
}

2
controllers/admin/serverConfig.go
View File

@@ -100,7 +100,7 @@ type serverConfigAdminResponse struct {
InstanceDetails webConfigResponse `json:"instanceDetails"`
FFmpegPath string `json:"ffmpegPath"`
AdminPassword string `json:"adminPassword"`
StreamKeys []string `json:"streamKeys"`
StreamKeys []models.StreamKey `json:"streamKeys"`
WebServerPort int `json:"webServerPort"`
WebServerIP string `json:"webServerIP"`
RTMPServerPort int `json:"rtmpServerPort"`