From c0d56780399ff239736ed4bdb3c2708935ca1c42 Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Wed, 16 Nov 2022 19:48:16 -0500 Subject: [PATCH] backend: fix lints in various misc modules Mostly adding return types and also fixing a type error. --- packages/backend/src/misc/cache.ts | 5 +++-- packages/backend/src/misc/captcha.ts | 4 ++-- packages/backend/src/misc/check-word-mute.ts | 1 + packages/backend/src/misc/convert-host.ts | 4 ++-- packages/backend/src/misc/detect-url-mime.ts | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts index 51e20bebf..e472acd38 100644 --- a/packages/backend/src/misc/cache.ts +++ b/packages/backend/src/misc/cache.ts @@ -29,7 +29,7 @@ export class Cache { return cached.value; } - public delete(key: string | null) { + public delete(key: string | null): void { this.cache.delete(key); } @@ -46,8 +46,9 @@ export class Cache { const value = await this.fetcher(key); // don't cache undefined - if (value !== undefined) + if (value !== undefined) { this.set(key, value); + } return value; } diff --git a/packages/backend/src/misc/captcha.ts b/packages/backend/src/misc/captcha.ts index 1431a4d80..4f0e757e7 100644 --- a/packages/backend/src/misc/captcha.ts +++ b/packages/backend/src/misc/captcha.ts @@ -3,7 +3,7 @@ import fetch from 'node-fetch'; import config from '@/config/index.js'; import { getAgentByUrl } from './fetch.js'; -export async function verifyRecaptcha(secret: string, response: string) { +export async function verifyRecaptcha(secret: string, response: string): Promise { const result = await getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(e => { throw new Error(`recaptcha-request-failed: ${e.message}`); }); @@ -14,7 +14,7 @@ export async function verifyRecaptcha(secret: string, response: string) { } } -export async function verifyHcaptcha(secret: string, response: string) { +export async function verifyHcaptcha(secret: string, response: string): Promise { const result = await getCaptchaResponse('https://hcaptcha.com/siteverify', secret, response).catch(e => { throw new Error(`hcaptcha-request-failed: ${e.message}`); }); diff --git a/packages/backend/src/misc/check-word-mute.ts b/packages/backend/src/misc/check-word-mute.ts index d7662820a..c49e95ace 100644 --- a/packages/backend/src/misc/check-word-mute.ts +++ b/packages/backend/src/misc/check-word-mute.ts @@ -5,6 +5,7 @@ import { User } from '@/models/entities/user.js'; type NoteLike = { userId: Note['userId']; text: Note['text']; + cw: Note['cw']; }; type UserLike = { diff --git a/packages/backend/src/misc/convert-host.ts b/packages/backend/src/misc/convert-host.ts index aa771af14..705edaedd 100644 --- a/packages/backend/src/misc/convert-host.ts +++ b/packages/backend/src/misc/convert-host.ts @@ -11,12 +11,12 @@ export function isSelfHost(host: string | null): boolean { return toPuny(config.host) === toPuny(host); } -export function extractDbHost(uri: string) { +export function extractDbHost(uri: string): string { const url = new URL(uri); return toPuny(url.hostname); } -export function toPuny(host: string) { +export function toPuny(host: string): string { return toASCII(host.toLowerCase()); } diff --git a/packages/backend/src/misc/detect-url-mime.ts b/packages/backend/src/misc/detect-url-mime.ts index cd143cf2f..bb4049c2e 100644 --- a/packages/backend/src/misc/detect-url-mime.ts +++ b/packages/backend/src/misc/detect-url-mime.ts @@ -2,7 +2,7 @@ import { createTemp } from './create-temp.js'; import { downloadUrl } from './download-url.js'; import { detectType } from './get-file-info.js'; -export async function detectUrlMime(url: string) { +export async function detectUrlMime(url: string): Promise { const [path, cleanup] = await createTemp(); try {