OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Fix missing return values in streaming (#26233)

fixes/subdomain-block-4.1.6
Renaud Chaput 2023-07-28 19:11:58 +02:00 committed by Claire
parent 2eb1a5b7b6
commit 2fc6117d1b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
streaming/index.js
View File

@ -724,7 +724,7 @@ const startWorker = async (workerId) => {
}
// If the payload already contains the `filtered` property, it means
// that filtering has been applied on the ruby on rails side, as
// that filtering has been applied on the ruby on rails side, as
// such, we don't need to construct or apply the filters in streaming:
if (Object.prototype.hasOwnProperty.call(payload, "filtered")) {
transmit(event, payload);
@ -796,12 +796,12 @@ const startWorker = async (workerId) => {
const filter_results = Object.values(req.cachedFilters).reduce((results, cachedFilter) => {
// Check the filter hasn't expired before applying:
if (cachedFilter.expires_at !== null && cachedFilter.expires_at < now) {
return;
return results;
}
// Just in-case JSDOM fails to find textContent in searchableContent
if (!searchableTextContent) {
return;
return results;
}
const keyword_matches = searchableTextContent.match(cachedFilter.regexp);
@ -816,6 +816,8 @@ const startWorker = async (workerId) => {
status_matches: null
});
}
return results;
}, []);
// Send the payload + the FilterResults as the `filtered` property