diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts
index 522ff82b..8466a374 100644
--- a/src/api/util/utility/EmbedHandlers.ts
+++ b/src/api/util/utility/EmbedHandlers.ts
@@ -17,13 +17,13 @@
*/
import { Config, Embed, EmbedType } from "@fosscord/util";
-import fetch, { Response } from "node-fetch";
+import fetch, { RequestInit } from "node-fetch";
import * as cheerio from "cheerio";
import probe from "probe-image-size";
import crypto from "crypto";
import { yellow } from "picocolors";
-export const DEFAULT_FETCH_OPTIONS: any = {
+export const DEFAULT_FETCH_OPTIONS: RequestInit = {
redirect: "follow",
follow: 1,
headers: {
@@ -50,7 +50,7 @@ export const getProxyUrl = (
// Imagor
if (imagorServerUrl) {
- let path = `${width}x${height}/${url.host}${url.pathname}`;
+ const path = `${width}x${height}/${url.host}${url.pathname}`;
const hash = crypto
.createHmac("sha1", secret)
@@ -92,8 +92,8 @@ export const getMetaDescriptions = (text: string) => {
image: getMeta($, "og:image") || getMeta($, "twitter:image"),
image_fallback: $(`image`).attr("src"),
video_fallback: $(`video`).attr("src"),
- width: parseInt(getMeta($, "og:image:width")!) || 0,
- height: parseInt(getMeta($, "og:image:height")!) || 0,
+ width: parseInt(getMeta($, "og:image:width") || "0"),
+ height: parseInt(getMeta($, "og:image:height") || "0"),
url: getMeta($, "og:url"),
youtube_embed: getMeta($, "og:video:secure_url"),
};
@@ -192,8 +192,8 @@ export const EmbedHandlers: {
proxy_url: metas.image
? getProxyUrl(
new URL(metas.image),
- metas.width!,
- metas.height!,
+ metas.width,
+ metas.height,
)
: undefined,
},
@@ -239,9 +239,9 @@ export const EmbedHandlers: {
const text = json.data.text;
const created_at = new Date(json.data.created_at);
const metrics = json.data.public_metrics;
- let media = json.includes.media?.filter(
- (x: any) => x.type == "photo",
- ) as any[]; // TODO: video
+ const media = json.includes.media?.filter(
+ (x: { type: string }) => x.type == "photo",
+ );
const embed: Embed = {
type: EmbedType.rich,
@@ -334,7 +334,7 @@ export const EmbedHandlers: {
width: 640,
height: 640,
proxy_url: metas.image
- ? getProxyUrl(new URL(metas.image!), 640, 640)
+ ? getProxyUrl(new URL(metas.image), 640, 640)
: undefined,
url: metas.image,
},
@@ -365,9 +365,9 @@ export const EmbedHandlers: {
url: url.href,
proxy_url: metas.image
? getProxyUrl(
- new URL(metas.image!),
- metas.width!,
- metas.height!,
+ new URL(metas.image),
+ metas.width,
+ metas.height,
)
: undefined,
},
@@ -395,7 +395,7 @@ export const EmbedHandlers: {
height: 215,
url: metas.image,
proxy_url: metas.image
- ? getProxyUrl(new URL(metas.image!), 460, 215)
+ ? getProxyUrl(new URL(metas.image), 460, 215)
: undefined,
},
provider: {
@@ -436,7 +436,7 @@ export const EmbedHandlers: {
// TODO: does this adjust with aspect ratio?
width: metas.width,
height: metas.height,
- url: metas.youtube_embed!,
+ url: metas.youtube_embed,
},
url: url.href,
type: EmbedType.video,
@@ -447,9 +447,9 @@ export const EmbedHandlers: {
url: metas.image,
proxy_url: metas.image
? getProxyUrl(
- new URL(metas.image!),
- metas.width!,
- metas.height!,
+ new URL(metas.image),
+ metas.width,
+ metas.height,
)
: undefined,
},
diff --git a/src/api/util/utility/RandomInviteID.ts b/src/api/util/utility/RandomInviteID.ts
index e95b4d1d..7ce54ad2 100644
--- a/src/api/util/utility/RandomInviteID.ts
+++ b/src/api/util/utility/RandomInviteID.ts
@@ -24,7 +24,7 @@ import crypto from "crypto";
export function random(length = 6) {
// Declare all characters
- let chars =
+ const chars =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
// Pick characers randomly
@@ -38,14 +38,14 @@ export function random(length = 6) {
export function snowflakeBasedInvite() {
// Declare all characters
- let chars =
+ const chars =
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
- let base = BigInt(chars.length);
+ const base = BigInt(chars.length);
let snowflake = Snowflake.generateWorkerProcess();
// snowflakes hold ~10.75 characters worth of entropy;
// safe to generate a 8-char invite out of them
- let str = "";
+ const str = "";
for (let i = 0; i < 10; i++) {
str.concat(chars.charAt(Number(snowflake % base)));
snowflake = snowflake / base;
diff --git a/src/api/util/utility/captcha.ts b/src/api/util/utility/captcha.ts
index 2d31f891..bd05582f 100644
--- a/src/api/util/utility/captcha.ts
+++ b/src/api/util/utility/captcha.ts
@@ -47,7 +47,10 @@ export async function verifyCaptcha(response: string, ip?: string) {
const { security } = Config.get();
const { service, secret, sitekey } = security.captcha;
- if (!service) throw new Error("Cannot verify captcha without service");
+ if (!service || !secret || !sitekey)
+ throw new Error(
+ "CAPTCHA is not configured correctly. https://docs.fosscord.com/setup/server/security/captcha/",
+ );
const res = await fetch(verifyEndpoints[service], {
method: "POST",
@@ -56,9 +59,9 @@ export async function verifyCaptcha(response: string, ip?: string) {
},
body:
`response=${encodeURIComponent(response)}` +
- `&secret=${encodeURIComponent(secret!)}` +
- `&sitekey=${encodeURIComponent(sitekey!)}` +
- (ip ? `&remoteip=${encodeURIComponent(ip!)}` : ""),
+ `&secret=${encodeURIComponent(secret)}` +
+ `&sitekey=${encodeURIComponent(sitekey)}` +
+ (ip ? `&remoteip=${encodeURIComponent(ip)}` : ""),
});
return (await res.json()) as hcaptchaResponse | recaptchaResponse;
diff --git a/src/api/util/utility/ipAddress.ts b/src/api/util/utility/ipAddress.ts
index 785844ce..71a48682 100644
--- a/src/api/util/utility/ipAddress.ts
+++ b/src/api/util/utility/ipAddress.ts
@@ -85,7 +85,7 @@ export async function IPAnalysis(ip: string): Promise<typeof exampleData> {
return (
await fetch(`https://api.ipdata.co/${ip}?api-key=${ipdataApiKey}`)
- ).json() as any; // TODO: types
+ ).json();
}
export function isProxy(data: typeof exampleData) {
@@ -97,14 +97,21 @@ export function isProxy(data: typeof exampleData) {
}
export function getIpAdress(req: Request): string {
+ // TODO: express can do this (trustProxies: true)?
+
return (
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
req.headers[Config.get().security.forwadedFor] ||
req.socket.remoteAddress
);
}
-export function distanceBetweenLocations(loc1: any, loc2: any): number {
+type Location = { latitude: number; longitude: number };
+export function distanceBetweenLocations(
+ loc1: Location,
+ loc2: Location,
+): number {
return distanceBetweenCoords(
loc1.latitude,
loc1.longitude,
diff --git a/src/api/util/utility/passwordStrength.ts b/src/api/util/utility/passwordStrength.ts
index c4dcd509..b293b856 100644
--- a/src/api/util/utility/passwordStrength.ts
+++ b/src/api/util/utility/passwordStrength.ts
@@ -23,7 +23,7 @@ const reNUMBER = /[0-9]/g;
const reUPPERCASELETTER = /[A-Z]/g;
const reSYMBOLS = /[A-Z,a-z,0-9]/g;
-const blocklist: string[] = []; // TODO: update ones passwordblocklist is stored in db
+// const blocklist: string[] = []; // TODO: update ones passwordblocklist is stored in db
/*
* https://en.wikipedia.org/wiki/Password_policy
* password must meet following criteria, to be perfect:
@@ -38,7 +38,7 @@ const blocklist: string[] = []; // TODO: update ones passwordblocklist is stored
export function checkPassword(password: string): number {
const { minLength, minNumbers, minUpperCase, minSymbols } =
Config.get().register.password;
- var strength = 0;
+ let strength = 0;
// checks for total password len
if (password.length >= minLength - 1) {
@@ -68,13 +68,13 @@ export function checkPassword(password: string): number {
strength = 0;
}
- let entropyMap: { [key: string]: number } = {};
+ const entropyMap: { [key: string]: number } = {};
for (let i = 0; i < password.length; i++) {
if (entropyMap[password[i]]) entropyMap[password[i]]++;
else entropyMap[password[i]] = 1;
}
- let entropies = Object.values(entropyMap);
+ const entropies = Object.values(entropyMap);
entropies.map((x) => x / entropyMap.length);
strength +=
|
