Michcio/lost-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

server: pass in resolved meta table to shouldBlockInstance

Browse source 
This should make it more friendly to use in places where the meta table
has already been resolved for other reasons.
This commit is contained in:
Norm 2022-12-24 14:56:39 -05:00
parent c02a03168d
commit 6583d0c43d
Signed by untrusted user: norm
GPG key ID: 7123E30E441E80DE
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/backend/src/misc/should-block-instance.ts
View file

@ -6,11 +6,10 @@ import { Meta } from '@/models/entities/meta.js';
* Returns whether a specific host (punycoded) should be blocked. * Returns whether a specific host (punycoded) should be blocked.
* *
* @param host punycoded instance host * @param host punycoded instance host
* @param meta a Promise contatining the information from the meta table (optional) * @param meta a resolved Meta table
* @returns whether the given host should be blocked * @returns whether the given host should be blocked
*/ */
export async function shouldBlockInstance(host: Instance['host'], meta?: Meta): Promise<boolean> {
export async function shouldBlockInstance(host: Instance['host'], meta: Promise<Meta> = fetchMeta()): Promise<boolean> { const { blockedHosts } = meta ?? await fetchMeta();
const { blockedHosts } = await meta;
return blockedHosts.some(blockedHost => host === blockedHost || host.endsWith('.' + blockedHost)); return blockedHosts.some(blockedHost => host === blockedHost || host.endsWith('.' + blockedHost));
} }

2
packages/backend/src/misc/skipped-instances.ts
View file

@ -16,7 +16,7 @@ const deadThreshold = 7 * DAY;
*/ */
export async function skippedInstances(hosts: Array<Instance['host']>): Promise<Array<Instance['host']>> { export async function skippedInstances(hosts: Array<Instance['host']>): Promise<Array<Instance['host']>> {
// Resolve the boolean promises before filtering // Resolve the boolean promises before filtering
const meta = fetchMeta(); const meta = await fetchMeta();
const shouldSkip = await Promise.all(hosts.map(host => shouldBlockInstance(host, meta))); const shouldSkip = await Promise.all(hosts.map(host => shouldBlockInstance(host, meta)));
const skipped = hosts.filter((_, i) => shouldSkip[i]); const skipped = hosts.filter((_, i) => shouldSkip[i]);