aboutsummaryrefslogtreecommitdiff
path: root/view/streams-json-v2.php
diff options
context:
space:
mode:
authorMaZderMind2018-05-12 11:26:14 +0200
committerMaZderMind2018-05-12 11:26:14 +0200
commit59f7c88ac3c8454eb0812dcb044e2854d9241001 (patch)
tree8688ac2112062252ed77961ed9289065c929041d /view/streams-json-v2.php
parent2cf00ac475500f007bce90cf81d8d582208650c9 (diff)
parent622b1f030c5c931704b7e997918dad2dcfd48551 (diff)
Merge branch 'feature/talkinfo-in-json'
Diffstat (limited to 'view/streams-json-v2.php')
-rw-r--r--view/streams-json-v2.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/view/streams-json-v2.php b/view/streams-json-v2.php
index 114e73e..591e309 100644
--- a/view/streams-json-v2.php
+++ b/view/streams-json-v2.php
@@ -2,9 +2,11 @@
header('Content-Type: application/json');
+$basetime = time();
$struct = [];
foreach (Conferences::getActiveConferences() as $conference)
{
+ $now = $conference->getSchedule()->getScheduleDisplayTime($basetime);
$overview = $conference->getOverview();
$groupstruct = array();
@@ -91,6 +93,10 @@ foreach (Conferences::getActiveConferences() as $conference)
'link' => forceslash(baseurl()).$room->getLink(),
'display' => $room->getDisplay(),
'stream' => $room->getStream(),
+ 'talks' => [
+ 'current' => $room->getCurrentTalk($now),
+ 'next' => $room->getNextTalk($now),
+ ],
'streams' => $streams,
);
}