From 5cbae0fb81078a60c9fa507be9c725856d7ecb29 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 8 Jul 2024 20:35:08 +0000 Subject: improve handling of sse especially in relation with page reloads --- boot.php | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 52c222b0a..88482cf2d 100644 --- a/boot.php +++ b/boot.php @@ -1928,19 +1928,11 @@ function notice($s) { } } - $t = get_xconfig($hash, 'sse', 'timestamp', NULL_DATE); + $x = get_xconfig($hash, 'sse', 'notifications', []); - if (datetime_convert('UTC', 'UTC', $t) < datetime_convert('UTC', 'UTC', '- 30 seconds')) { - set_xconfig($hash, 'sse', 'notifications', []); - } - - $x = get_xconfig($hash, 'sse', 'notifications'); - - if ($x === false) - $x = []; - - if (isset($x['notice']) && in_array($s, $x['notice']['notifications'])) + if (isset($x['notice']) && in_array($s, $x['notice']['notifications'])) { return; + } if (App::$interactive) { $x['notice']['notifications'][] = $s; @@ -1988,19 +1980,11 @@ function info($s) { } } - $t = get_xconfig($hash, 'sse', 'timestamp', NULL_DATE); + $x = get_xconfig($hash, 'sse', 'notifications', []); - if (datetime_convert('UTC', 'UTC', $t) < datetime_convert('UTC', 'UTC', '- 30 seconds')) { - set_xconfig($hash, 'sse', 'notifications', []); - } - - $x = get_xconfig($hash, 'sse', 'notifications'); - - if ($x === false) - $x = []; - - if (isset($x['info']) && in_array($s, $x['info']['notifications'])) + if (isset($x['info']) && in_array($s, $x['info']['notifications'])) { return; + } if (App::$interactive) { $x['info']['notifications'][] = $s; -- cgit v1.2.3