Skip expired Meows in live display and playlist API
This commit is contained in:
@@ -26,6 +26,12 @@ public class DisplayController : Controller
|
|||||||
return View("NotFound", devices);
|
return View("NotFound", devices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Skip expired Meows — expiry is enforced at playback time, not on the stored data
|
||||||
|
var now = DateTime.Now;
|
||||||
|
device.DeviceSlides = device.DeviceSlides
|
||||||
|
.Where(ds => ds.Slide.ExpiresAt == null || ds.Slide.ExpiresAt > now)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
return View(device);
|
return View(device);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +46,10 @@ public class DisplayController : Controller
|
|||||||
|
|
||||||
if (device == null) return NotFound();
|
if (device == null) return NotFound();
|
||||||
|
|
||||||
var playlist = device.DeviceSlides.Select(ds => new
|
var now = DateTime.Now;
|
||||||
|
var playlist = device.DeviceSlides
|
||||||
|
.Where(ds => ds.Slide.ExpiresAt == null || ds.Slide.ExpiresAt > now)
|
||||||
|
.Select(ds => new
|
||||||
{
|
{
|
||||||
id = ds.Slide.Id,
|
id = ds.Slide.Id,
|
||||||
name = ds.Slide.Name,
|
name = ds.Slide.Name,
|
||||||
|
|||||||
Reference in New Issue
Block a user