LogalDeveloper/owncast
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/develop' into webv2

Browse Source
This commit is contained in:
Gabe Kangas
2022-05-25 22:57:14 -07:00
parent f041727f07 fd271b1f81
commit 715504eb69
148 changed files with 244 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/status.go
View File

@@ -3,6 +3,7 @@ package controllers
import (
"encoding/json"
"net/http"
"time"
"github.com/owncast/owncast/core"
"github.com/owncast/owncast/router/middleware"
@@ -15,6 +16,7 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
response := webStatusResponse{
Online: status.Online,
ViewerCount: status.ViewerCount,
ServerTime: time.Now(),
LastConnectTime: status.LastConnectTime,
LastDisconnectTime: status.LastDisconnectTime,
VersionNumber: status.VersionNumber,
@@ -30,9 +32,9 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
}
type webStatusResponse struct {
Online bool `json:"online"`
ViewerCount int `json:"viewerCount"`
Online bool `json:"online"`
ViewerCount int `json:"viewerCount"`
ServerTime time.Time `json:"serverTime"`
LastConnectTime *utils.NullTime `json:"lastConnectTime"`
LastDisconnectTime *utils.NullTime `json:"lastDisconnectTime"`