mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix missing return values in streaming (#26233)

pull/2339/head
Renaud Chaput 2023-07-28 19:11:58 +02:00 committed by GitHub
parent 446821a0dc
commit 3554c52795
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -714,7 +714,7 @@ const startServer = async () => {
}
// 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);
@ -786,12 +786,12 @@ const startServer = async () => {
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);
@ -806,6 +806,8 @@ const startServer = async () => {
status_matches: null
});
}
return results;
}, []);
// Send the payload + the FilterResults as the `filtered` property