forked from treehouse/mastodon
Fix public/local timeline posts not being properly filtered (#20567)
* Fix streaming server using wrong property name for matching filters Late in the PR, the `filter_results` property has been renamed to `filtered`, but the change has not been reflected in the streaming server code. * Fix filter_action attribute being an integer instead of a stringmain
parent
3d3bd344cb
commit
cd5e98dbdb
|
@ -681,7 +681,7 @@ const startWorker = async (workerId) => {
|
||||||
queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));
|
queries.push(client.query('SELECT 1 FROM account_domain_blocks WHERE account_id = $1 AND domain = $2', [req.accountId, accountDomain]));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!unpackedPayload.filter_results && !req.cachedFilters) {
|
if (!unpackedPayload.filtered && !req.cachedFilters) {
|
||||||
queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND filter.expires_at IS NULL OR filter.expires_at > NOW()', [req.accountId]));
|
queries.push(client.query('SELECT filter.id AS id, filter.phrase AS title, filter.context AS context, filter.expires_at AS expires_at, filter.action AS filter_action, keyword.keyword AS keyword, keyword.whole_word AS whole_word FROM custom_filter_keywords keyword JOIN custom_filters filter ON keyword.custom_filter_id = filter.id WHERE filter.account_id = $1 AND filter.expires_at IS NULL OR filter.expires_at > NOW()', [req.accountId]));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -692,7 +692,7 @@ const startWorker = async (workerId) => {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!unpackedPayload.filter_results && !req.cachedFilters) {
|
if (!unpackedPayload.filtered && !req.cachedFilters) {
|
||||||
const filterRows = values[accountDomain ? 2 : 1].rows;
|
const filterRows = values[accountDomain ? 2 : 1].rows;
|
||||||
|
|
||||||
req.cachedFilters = filterRows.reduce((cache, row) => {
|
req.cachedFilters = filterRows.reduce((cache, row) => {
|
||||||
|
@ -707,7 +707,7 @@ const startWorker = async (workerId) => {
|
||||||
title: row.title,
|
title: row.title,
|
||||||
context: row.context,
|
context: row.context,
|
||||||
expires_at: row.expires_at,
|
expires_at: row.expires_at,
|
||||||
filter_action: row.filter_action,
|
filter_action: ['warn', 'hide'][row.filter_action],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -735,18 +735,18 @@ const startWorker = async (workerId) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check filters
|
// Check filters
|
||||||
if (req.cachedFilters && !unpackedPayload.filter_results) {
|
if (req.cachedFilters && !unpackedPayload.filtered) {
|
||||||
const status = unpackedPayload;
|
const status = unpackedPayload;
|
||||||
const searchContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
const searchContent = ([status.spoiler_text || '', status.content].concat((status.poll && status.poll.options) ? status.poll.options.map(option => option.title) : [])).concat(status.media_attachments.map(att => att.description)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n');
|
||||||
const searchIndex = JSDOM.fragment(searchContent).textContent;
|
const searchIndex = JSDOM.fragment(searchContent).textContent;
|
||||||
|
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
payload.filter_results = [];
|
payload.filtered = [];
|
||||||
Object.values(req.cachedFilters).forEach((cachedFilter) => {
|
Object.values(req.cachedFilters).forEach((cachedFilter) => {
|
||||||
if ((cachedFilter.expires_at === null || cachedFilter.expires_at > now)) {
|
if ((cachedFilter.expires_at === null || cachedFilter.expires_at > now)) {
|
||||||
const keyword_matches = searchIndex.match(cachedFilter.regexp);
|
const keyword_matches = searchIndex.match(cachedFilter.regexp);
|
||||||
if (keyword_matches) {
|
if (keyword_matches) {
|
||||||
payload.filter_results.push({
|
payload.filtered.push({
|
||||||
filter: cachedFilter.repr,
|
filter: cachedFilter.repr,
|
||||||
keyword_matches,
|
keyword_matches,
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue