TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

notifications: if we have to return early, make sure to set offset to -1 to prevent looping

Browse Source 
(cherry picked from commit f72b8ce30f)
This commit is contained in:
Mario
2021-05-28 10:02:05 +00:00
parent 92ea7fcfb1
commit e9088bd52e
1 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Zotlabs/Module/Sse_bs.php
View File

@@ -144,11 +144,15 @@ class Sse_bs extends Controller {
$result['network']['notifications'] = [];
$result['network']['count'] = 0;
if(! self::$uid)
if(! self::$uid) {
$result['network']['offset'] = -1;
return $result;
}
if(! (self::$vnotify & VNOTIFY_NETWORK))
if(! (self::$vnotify & VNOTIFY_NETWORK)) {
$result['network']['offset'] = -1;
return $result;
}
$limit = intval(self::$limit);
$offset = self::$offset;
@@ -216,11 +220,15 @@ class Sse_bs extends Controller {
$result['dm']['notifications'] = [];
$result['dm']['count'] = 0;
if(! self::$uid)
if(! self::$uid) {
$result['dm']['offset'] = -1;
return $result;
}
if(! (self::$vnotify & VNOTIFY_MAIL))
if(! (self::$vnotify & VNOTIFY_MAIL)) {
$result['dm']['offset'] = -1;
return $result;
}
$limit = intval(self::$limit);
$offset = self::$offset;
@@ -287,11 +295,15 @@ class Sse_bs extends Controller {
$result['home']['notifications'] = [];
$result['home']['count'] = 0;
if(! self::$uid)
if(! self::$uid) {
$result['home']['offset'] = -1;
return $result;
}
if(! (self::$vnotify & VNOTIFY_CHANNEL))
if(! (self::$vnotify & VNOTIFY_CHANNEL)) {
$result['home']['offset'] = -1;
return $result;
}
$limit = intval(self::$limit);
$offset = self::$offset;
@@ -359,15 +371,19 @@ class Sse_bs extends Controller {
$result['pubs']['notifications'] = [];
$result['pubs']['count'] = 0;
if(! (self::$vnotify & VNOTIFY_PUBS))
if(! (self::$vnotify & VNOTIFY_PUBS)) {
$result['pubs']['offset'] = -1;
return $result;
}
if((observer_prohibited(true))) {
$result['pubs']['offset'] = -1;
return $result;
}
if(! intval(get_config('system','open_pubstream',1))) {
if(! get_observer_hash()) {
$result['pubs']['offset'] = -1;
return $result;
}
}