FoundKeyGang/FoundKey
FoundKeyGang/FoundKey
7
19
Fork 22
Code Issues 37 Pull requests 4 Releases Activity

Revert "server: fetch meta only once in skippedInstances"
All checks were successful
ci/woodpecker/push/lint-client Pipeline was successful
Details
ci/woodpecker/push/lint-foundkey-js Pipeline was successful
Details
ci/woodpecker/push/lint-backend Pipeline was successful
Details
ci/woodpecker/push/build Pipeline was successful
Details
ci/woodpecker/push/test Pipeline was successful
Details

Browse source 
This reverts commit 81d63720f2 since it
seems to cause a ReferenceError for some reason.

Ref: https://toot.site/@jeder/109447151582516733
This commit is contained in:
Norm 2022-12-03 02:13:18 -05:00
parent 5b6b2b214d
commit e446a11bb7
Signed by: norm
GPG key ID: 7123E30E441E80DE
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ import { db } from '@/db/postgre.js';
import { fetchMeta } from '@/misc/fetch-meta.js';
import { Instance } from '@/models/entities/instance.js';
import { DAY } from '@/const.js';
import { Meta } from '@/models/entities/meta.js';
// Threshold from last contact after which an instance will be considered
// "dead" and should no longer get activities delivered to it.
@ -27,11 +26,10 @@ function matchHost(host: Instance['host'], pattern: string): boolean {
* Returns whether a specific host (punycoded) should be blocked.
*
* @param host punycoded instance host
* @param meta a Promise contatining the information from the meta table (oprional)
* @returns whether the given host should be blocked
*/
export async function shouldBlockInstance(host: string, meta: Promise<Meta> = fetchMeta()): Promise<boolean> {
const { blockedHosts } = await meta;
export async function shouldBlockInstance(host: string): Promise<boolean> {
const { blockedHosts } = await fetchMeta();
return blockedHosts.some(blockedHost => matchHost(host, blockedHost));
}
@ -43,8 +41,7 @@ export async function shouldBlockInstance(host: string, meta: Promise<Meta> = fe
*/
export async function skippedInstances(hosts: Array<Instance['host']>): Promise<Array<Instance['host']>> {
// Resolve the boolean promises before filtering
const meta = fetchMeta();
const shouldSkip = await Promise.all(hosts.map(host => shouldBlockInstance(host, meta)));
const shouldSkip = await Promise.all(hosts.map(shouldBlockInstance));
const skipped = hosts.filter((_, i) => shouldSkip[i]);
// if possible return early and skip accessing the database