aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--Zotlabs/Module/Sse_bs.php25
2 files changed, 22 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e690e28bc..9cfc53ebd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Hubzilla 5.4 (2021-03-xx)
- group_add() return group hash to save a lookup
- Do not poll feeds if feed contacts setting is disabled
- Deprecate sticky_kit library in favor of CSS position sticky solution
+ - Trigger endless scroll loading at the end of content instead of end of window height
- Implement experimental zap export compatibility
- Deprecate the [summary] tag in favor of a separate input field for the summary
- Adjust error reporting for PHP8
@@ -14,7 +15,7 @@ Hubzilla 5.4 (2021-03-xx)
- Introduce fetch_provider hook
- Implement ActivityStreams discovery in mod profile
- Implement ActivityStreams discovery in mod channel
- - Update OS folder and file permissions
+ - Streamline OS folder and file permissions
- Implement ThreadListener in mod activity_match
- Improve ThreadListener handling
- Use mail envelope instead of lock icon for direct messages
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 396e07001..3b39d5b49 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -181,7 +181,10 @@ class Sse_bs extends Controller {
$result['network']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['network']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['network']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -250,7 +253,10 @@ class Sse_bs extends Controller {
$result['dm']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['dm']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['dm']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -319,7 +325,10 @@ class Sse_bs extends Controller {
$result['home']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['home']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['home']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -400,7 +409,10 @@ class Sse_bs extends Controller {
$result['pubs']['offset'] = ((count($items) == $limit) ? intval($offset + $limit) : -1);
xchan_query($items);
foreach($items as $item) {
- $result['pubs']['notifications'][] = Enotify::format($item);
+ $parsed = Enotify::format($item);
+ if($parsed) {
+ $result['pubs']['notifications'][] = $parsed;
+ }
}
}
else {
@@ -592,7 +604,10 @@ class Sse_bs extends Controller {
if($r) {
xchan_query($r);
foreach($r as $rr) {
- $result['files']['notifications'][] = Enotify::format($rr);
+ $parsed = Enotify::format($rr);
+ if($parsed) {
+ $result['files']['notifications'][] = $parsed;
+ }
}
$result['files']['count'] = count($r);
}