prettier formatted /api

api/.vscode/api-snippets.code-snippets

@@ -19,11 +19,7 @@
 	"Route": {
 		"scope": "typescript",
 		"prefix": "route",
-		"body": [
+		"body": ["router.get(\"$1\", route({}), (req: Request, res: Response) => {", "\t$2", "});"],
-			"router.get(\"$1\", route({}), (req: Request, res: Response) => {",
-			"\t$2",
-			"});"
-		],
 		"description": "An API endpoint"
-	},
+	}
 }

api/src/routes/channels/#channel_id/messages/#message_id/crosspost.ts

@@ -10,10 +10,7 @@ router.post("/", route({ permission: "MANAGE_MESSAGES" }), (req: Request, res: R
 		type: 0,
 		content: "",
 		channel_id: "",
-        author: {id: "", 
+		author: { id: "", username: "", avatar: "", discriminator: "", public_flags: 64 },
-        username: "", 
-        avatar: "", 
-        discriminator: "", public_flags: 64}, 
 		attachments: [],
 		embeds: [],
 		mentions: [],
@@ -23,8 +20,9 @@ router.post("/", route({ permission: "MANAGE_MESSAGES" }), (req: Request, res: R
 		tts: false,
 		timestamp: "",
 		edited_timestamp: null,
-        flags: 1, components: []}).status(200);
+		flags: 1,
+		components: []
+	}).status(200);
 });
 
 export default router;
-

api/src/routes/channels/#channel_id/recipients.ts

@@ -1,6 +1,16 @@
 import { Request, Response, Router } from "express";
-import { Channel, ChannelRecipientAddEvent, ChannelType, DiscordApiErrors, DmChannelDTO, emitEvent, PublicUserProjection, Recipient, User } from "@fosscord/util";
+import {
-import { route } from "@fosscord/api"
+	Channel,
+	ChannelRecipientAddEvent,
+	ChannelType,
+	DiscordApiErrors,
+	DmChannelDTO,
+	emitEvent,
+	PublicUserProjection,
+	Recipient,
+	User
+} from "@fosscord/util";
+import { route } from "@fosscord/api";
 
 const router: Router = Router();
 
@@ -9,20 +19,17 @@ router.put("/:user_id", route({}), async (req: Request, res: Response) => {
 	const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients"] });
 
 	if (channel.type !== ChannelType.GROUP_DM) {
-		const recipients = [
+		const recipients = [...channel.recipients!.map((r) => r.user_id), user_id].unique();
-			...channel.recipients!.map(r => r.user_id),
-			user_id
-		].unique()
 
-		const new_channel = await Channel.createDMChannel(recipients, req.user_id)
+		const new_channel = await Channel.createDMChannel(recipients, req.user_id);
 		return res.status(201).json(new_channel);
 	} else {
-		if (channel.recipients!.map(r => r.user_id).includes(user_id)) {
+		if (channel.recipients!.map((r) => r.user_id).includes(user_id)) {
-			throw DiscordApiErrors.INVALID_RECIPIENT //TODO is this the right error?
+			throw DiscordApiErrors.INVALID_RECIPIENT; //TODO is this the right error?
 		}
 
 		channel.recipients!.push(new Recipient({ channel_id: channel_id, user_id: user_id }));
-		await channel.save()
+		await channel.save();
 
 		await emitEvent({
 			event: "CHANNEL_CREATE",
@@ -31,10 +38,12 @@ router.put("/:user_id", route({}), async (req: Request, res: Response) => {
 		});
 
 		await emitEvent({
-			event: "CHANNEL_RECIPIENT_ADD", data: {
+			event: "CHANNEL_RECIPIENT_ADD",
+			data: {
 				channel_id: channel_id,
 				user: await User.findOneOrFail({ where: { id: user_id }, select: PublicUserProjection })
-			}, channel_id: channel_id
+			},
+			channel_id: channel_id
 		} as ChannelRecipientAddEvent);
 		return res.sendStatus(204);
 	}
@@ -44,13 +53,13 @@ router.delete("/:user_id", route({}), async (req: Request, res: Response) => {
 	const { channel_id, user_id } = req.params;
 	const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients"] });
 	if (!(channel.type === ChannelType.GROUP_DM && (channel.owner_id === req.user_id || user_id === req.user_id)))
-		throw DiscordApiErrors.MISSING_PERMISSIONS
+		throw DiscordApiErrors.MISSING_PERMISSIONS;
 
-	if (!channel.recipients!.map(r => r.user_id).includes(user_id)) {
+	if (!channel.recipients!.map((r) => r.user_id).includes(user_id)) {
-		throw DiscordApiErrors.INVALID_RECIPIENT //TODO is this the right error?
+		throw DiscordApiErrors.INVALID_RECIPIENT; //TODO is this the right error?
 	}
 
-	await Channel.removeRecipientFromChannel(channel, user_id)
+	await Channel.removeRecipientFromChannel(channel, user_id);
 
 	return res.sendStatus(204);
 });

api/src/routes/discoverable-guilds.ts

@@ -3,7 +3,6 @@ import { Guild, Config } from "@fosscord/util";
 import { Router, Request, Response } from "express";
 import { route } from "@fosscord/api";
 
-
 const router = Router();
 
 router.get("/", route({}), async (req: Request, res: Response) => {
@@ -12,7 +11,9 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 	// ! this only works using SQL querys
 	// TODO: implement this with default typeorm query
 	// const guilds = await Guild.find({ where: { features: "DISCOVERABLE" } }); //, take: Math.abs(Number(limit)) });
-	const guilds = showAllGuilds ? await Guild.find({take: Math.abs(Number(limit || 20))}) : await Guild.find({ where: `"features" LIKE '%COMMUNITY%'`, take: Math.abs(Number(limit || 20)) });
+	const guilds = showAllGuilds
+		? await Guild.find({ take: Math.abs(Number(limit || 20)) })
+		: await Guild.find({ where: `"features" LIKE '%COMMUNITY%'`, take: Math.abs(Number(limit || 20)) });
 	res.send({ guilds: guilds });
 });
 

api/src/routes/gateway/bot.ts

@@ -12,7 +12,7 @@ export interface GatewayBotResponse {
 		remaining: number;
 		reset_after: number;
 		max_concurrency: number;
-	}
+	};
 }
 
 const options: RouteOptions = {

api/src/routes/store/published-listings/applications/#id/subscription-plans.ts

@@ -18,7 +18,8 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 			currency: "eur",
 			price: 4199,
 			price_tier: null
-        }]).status(200);
+		}
+	]).status(200);
 });
 
 export default router;

api/src/routes/store/published-listings/skus/#sku_id/subscription-plans.ts

@@ -4,10 +4,127 @@ import { route } from "@fosscord/api";
 const router: Router = Router();
 
 const skus = new Map([
-	["521842865731534868", [{"id": "511651856145973248", "name": "Premium Monthly (Legacy)", "interval": 1, "interval_count": 1, "tax_inclusive": true, "sku_id": "521842865731534868", "currency": "usd", "price": 0, "price_tier": null}, {"id": "511651860671627264", "name": "Premium Yearly (Legacy)", "interval": 2, "interval_count": 1, "tax_inclusive": true, "sku_id": "521842865731534868", "currency": "usd", "price": 0, "price_tier": null}]],
+	[
-	["521846918637420545", [{"id": "511651871736201216", "name": "Premium Classic Monthly", "interval": 1, "interval_count": 1, "tax_inclusive": true, "sku_id": "521846918637420545", "currency": "usd", "price": 0, "price_tier": null}, {"id": "511651876987469824", "name": "Premium Classic Yearly", "interval": 2, "interval_count": 1, "tax_inclusive": true, "sku_id": "521846918637420545", "currency": "usd", "price": 0, "price_tier": null}]],
+		"521842865731534868",
-	["521847234246082599", [{"id": "642251038925127690", "name": "Premium Quarterly", "interval": 1, "interval_count": 3, "tax_inclusive": true, "sku_id": "521847234246082599", "currency": "usd", "price": 0, "price_tier": null}, {"id": "511651880837840896", "name": "Premium Monthly", "interval": 1, "interval_count": 1, "tax_inclusive": true, "sku_id": "521847234246082599", "currency": "usd", "price": 0, "price_tier": null}, {"id": "511651885459963904", "name": "Premium Yearly", "interval": 2, "interval_count": 1, "tax_inclusive": true, "sku_id": "521847234246082599", "currency": "usd", "price": 0, "price_tier": null}]],
+		[
-	["590663762298667008", [{"id": "590665532894740483", "name": "Server Boost Monthly", "interval": 1, "interval_count": 1, "tax_inclusive": true, "sku_id": "590663762298667008", "discount_price": 0, "currency": "usd", "price": 0, "price_tier": null}, {"id": "590665538238152709", "name": "Server Boost Yearly", "interval": 2, "interval_count": 1, "tax_inclusive": true, "sku_id": "590663762298667008", "discount_price": 0, "currency": "usd", "price": 0, "price_tier": null}]],
+			{
+				id: "511651856145973248",
+				name: "Premium Monthly (Legacy)",
+				interval: 1,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "521842865731534868",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			},
+			{
+				id: "511651860671627264",
+				name: "Premium Yearly (Legacy)",
+				interval: 2,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "521842865731534868",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			}
+		]
+	],
+	[
+		"521846918637420545",
+		[
+			{
+				id: "511651871736201216",
+				name: "Premium Classic Monthly",
+				interval: 1,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "521846918637420545",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			},
+			{
+				id: "511651876987469824",
+				name: "Premium Classic Yearly",
+				interval: 2,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "521846918637420545",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			}
+		]
+	],
+	[
+		"521847234246082599",
+		[
+			{
+				id: "642251038925127690",
+				name: "Premium Quarterly",
+				interval: 1,
+				interval_count: 3,
+				tax_inclusive: true,
+				sku_id: "521847234246082599",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			},
+			{
+				id: "511651880837840896",
+				name: "Premium Monthly",
+				interval: 1,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "521847234246082599",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			},
+			{
+				id: "511651885459963904",
+				name: "Premium Yearly",
+				interval: 2,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "521847234246082599",
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			}
+		]
+	],
+	[
+		"590663762298667008",
+		[
+			{
+				id: "590665532894740483",
+				name: "Server Boost Monthly",
+				interval: 1,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "590663762298667008",
+				discount_price: 0,
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			},
+			{
+				id: "590665538238152709",
+				name: "Server Boost Yearly",
+				interval: 2,
+				interval_count: 1,
+				tax_inclusive: true,
+				sku_id: "590663762298667008",
+				discount_price: 0,
+				currency: "usd",
+				price: 0,
+				price_tier: null
+			}
+		]
+	]
 ]);
 
 router.get("/", route({}), async (req: Request, res: Response) => {

api/src/routes/users/@me/activities/statistics/applications.ts

@@ -5,7 +5,7 @@ const router = Router();
 
 router.get("/", route({}), (req: Request, res: Response) => {
 	// TODO:
-	res.json([]).status(200)
+	res.json([]).status(200);
 });
 
 export default router;

api/src/routes/users/@me/billing/payment-sources.ts

@@ -5,7 +5,7 @@ const router = Router();
 
 router.get("/", route({}), (req: Request, res: Response) => {
 	// TODO:
-	res.json([]).status(200)
+	res.json([]).status(200);
 });
 
 export default router;

api/src/routes/users/@me/channels.ts

@@ -5,8 +5,11 @@ import { route } from "@fosscord/api";
 const router: Router = Router();
 
 router.get("/", route({}), async (req: Request, res: Response) => {
-	const recipients = await Recipient.find({ where: { user_id: req.user_id, closed: false }, relations: ["channel", "channel.recipients"] });
+	const recipients = await Recipient.find({
-	res.json(await Promise.all(recipients.map(r => DmChannelDTO.from(r.channel, [req.user_id]))));
+		where: { user_id: req.user_id, closed: false },
+		relations: ["channel", "channel.recipients"]
+	});
+	res.json(await Promise.all(recipients.map((r) => DmChannelDTO.from(r.channel, [req.user_id]))));
 });
 
 export interface DmChannelCreateSchema {

api/src/routes/users/@me/email-settings.ts

@@ -11,7 +11,8 @@ router.get("/", route({}), (req: Request, res: Response) => {
 			communication: true,
 			tips: false,
 			updates_and_announcements: false,
-        recommendations_and_events: false },
+			recommendations_and_events: false
+		},
 		initialized: false
 	}).status(200);
 });

api/src/util/ipAddress.ts

@@ -81,7 +81,6 @@ export function getIpAdress(req: Request): string {
 	return req.headers[Config.get().security.forwadedFor] || req.socket.remoteAddress;
 }
 
-
 export function distanceBetweenLocations(loc1: any, loc2: any): number {
 	return distanceBetweenCoords(loc1.latitude, loc1.longitude, loc2.latitude, loc2.longitude);
 }
@@ -90,9 +89,7 @@ export function distanceBetweenLocations(loc1: any, loc2: any): number {
 function distanceBetweenCoords(lat1: number, lon1: number, lat2: number, lon2: number) {
 	const p = 0.017453292519943295; // Math.PI / 180
 	const c = Math.cos;
-	const a = 0.5 - c((lat2 - lat1) * p) / 2 +
+	const a = 0.5 - c((lat2 - lat1) * p) / 2 + (c(lat1 * p) * c(lat2 * p) * (1 - c((lon2 - lon1) * p))) / 2;
-		c(lat1 * p) * c(lat2 * p) *
-		(1 - c((lon2 - lon1) * p)) / 2;
 
 	return 12742 * Math.asin(Math.sqrt(a)); // 2 * R; R = 6371 km
 }