Merge remote-tracking branch 'upstream/dev' into dev

1 files changed, 12 insertions, 1 deletions

diff --git a/Zotlabs/Module/Sse.php b/Zotlabs/Module/Sse.php
index 6f3df299f..3dab3d465 100644
--- a/Zotlabs/Module/Sse.php
+++ b/Zotlabs/Module/Sse.php
@@ -34,6 +34,7 @@ class Sse extends Controller {
 		self::$uid = local_channel();
 		self::$ob_hash = get_observer_hash();
 		self::$sse_id = false;
+		self::$vnotify = -1;
 
 		if(! self::$ob_hash) {
 			if(session_id()) {
@@ -45,7 +46,9 @@ class Sse extends Controller {
 			}
 		}
 
-		self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify');
+		if (self::$uid) {
+			self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify');
+		}
 
 		$sleep_seconds = 3;
 
@@ -94,6 +97,14 @@ class Sse extends Controller {
 				$result = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
 				$lock = XConfig::Get(self::$ob_hash, 'sse', 'lock');
 
+				// We do not have the local_channel in the addon.
+				// Reset pubs here if the app is not installed.
+				if (self::$uid && (!(self::$vnotify & VNOTIFY_PUBS) || !Apps::system_app_installed(self::$uid, 'Public Stream'))) {
+					$result['pubs']['count'] = 0;
+					$result['pubs']['notifications'] = [];
+					$result['pubs']['offset'] = -1;
+				}
+
 				if($result && !$lock) {
 					echo "event: notifications\n";
 					echo 'data: ' . json_encode($result);