LogalDeveloper/owncast
0
Fork 0
Code Activity

Consolidate the ping and status request APIs

Browse Source
This commit is contained in:
Gabe Kangas
2021-06-10 22:07:56 -07:00
parent ba4a4b0b13
commit b96cd2e93e
3 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
controllers/status.go
View File

@@ -15,27 +15,31 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
status := core.GetStatus()
response := webStatusResponse{
Online: status.Online,
ViewerCount: status.ViewerCount,
LastConnectTime: status.LastConnectTime,
Online: status.Online,
ViewerCount: status.ViewerCount,
LastConnectTime: status.LastConnectTime,
LastDisconnectTime: status.LastDisconnectTime,
VersionNumber: status.VersionNumber,
StreamTitle: status.StreamTitle,
VersionNumber: status.VersionNumber,
StreamTitle: status.StreamTitle,
}
w.Header().Set("Content-Type", "application/json")
if err := json.NewEncoder(w).Encode(response); err != nil {
InternalErrorHandler(w, err)
}
// Mark the user who requested this status as an active viewer
id := utils.GenerateClientIDFromRequest(r)
core.SetViewerIdActive(id)
}
type webStatusResponse struct {
Online bool `json:"online"`
ViewerCount int `json:"viewerCount"`
Online bool `json:"online"`
ViewerCount int `json:"viewerCount"`
LastConnectTime utils.NullTime `json:"lastConnectTime"`
LastDisconnectTime utils.NullTime `json:"lastDisconnectTime"`
VersionNumber string `json:"versionNumber"`
StreamTitle string `json:"streamTitle"`
}
}