Merge pull request #1236 from dank074/patch/prettier

MaddyUnderStars · web-flow · commit 43b342a152be · 2024-11-20T12:00:26.000+11:00
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -9,39 +9,46 @@ import { FlatCompat } from "@eslint/eslintrc";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
-    allConfig: js.configs.all
+	baseDirectory: __dirname,
+	recommendedConfig: js.configs.recommended,
+	allConfig: js.configs.all,
 });
 
-export default [{
-    ignores: [
-        "**/node_modules",
-        "**/dist",
-        "**/README.md",
-        "**/COPYING",
-        "src/webrtc",
-        "**/scripts/",
-        "**/assets",
-    ],
-}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
-    plugins: {
-        "@typescript-eslint": typescriptEslint,
-    },
+export default [
+	{
+		ignores: [
+			"**/node_modules",
+			"**/dist",
+			"**/README.md",
+			"**/COPYING",
+			"src/webrtc",
+			"**/scripts/",
+			"**/assets",
+		],
+	},
+	...compat.extends(
+		"eslint:recommended",
+		"plugin:@typescript-eslint/recommended",
+	),
+	{
+		plugins: {
+			"@typescript-eslint": typescriptEslint,
+		},
 
-    languageOptions: {
-        globals: {
-            ...globals.node,
-        },
+		languageOptions: {
+			globals: {
+				...globals.node,
+			},
 
-        parser: tsParser,
-    },
+			parser: tsParser,
+		},
 
-    rules: {
-        "no-mixed-spaces-and-tabs": "off",
-        "@typescript-eslint/no-inferrable-types": "off", // Required by typeorm
-        "@typescript-eslint/no-var-requires": "off", // Sometimes requred by typeorm to resolve circular deps
-        "@typescript-eslint/no-require-imports": "off",
-        "@typescript-eslint/no-unused-vars": "off",
-    },
-}];
+		rules: {
+			"no-mixed-spaces-and-tabs": "off",
+			"@typescript-eslint/no-inferrable-types": "off", // Required by typeorm
+			"@typescript-eslint/no-var-requires": "off", // Sometimes requred by typeorm to resolve circular deps
+			"@typescript-eslint/no-require-imports": "off",
+			"@typescript-eslint/no-unused-vars": "off",
+		},
+	},
+];
diff --git a/flake.lock b/flake.lock
diff --git a/server.code-workspace b/server.code-workspace
@@ -1,23 +1,23 @@
 {
 	"folders": [
 		{
-			"path": "src"
+			"path": "src",
 		},
 		{
-			"path": "assets"
+			"path": "assets",
 		},
 		{
-			"path": "scripts"
+			"path": "scripts",
 		},
 		{
-			"path": "."
-		}
+			"path": ".",
+		},
 	],
 	"settings": {
-		"typescript.tsdk": "util\\node_modules\\typescript\\lib"
+		"typescript.tsdk": "util\\node_modules\\typescript\\lib",
 	},
 	"launch": {
 		"version": "0.2.0",
-		"configurations": []
-	}
+		"configurations": [],
+	},
 }
diff --git a/src/api/Server.ts b/src/api/Server.ts
@@ -100,8 +100,7 @@ export class SpacebarServer extends Server {
 		this.app.set("json replacer", JSONReplacer);
 
 		const trustedProxies = Config.get().security.trustedProxies;
-		if(trustedProxies)
-			this.app.set("trust proxy", trustedProxies);
+		if (trustedProxies) this.app.set("trust proxy", trustedProxies);
 
 		this.app.use(CORS);
 		this.app.use(BodyParser({ inflate: true, limit: "10mb" }));
diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts
@@ -72,7 +72,7 @@ router.get(
 						`${Config.get().general.frontPage}/register?token=${
 							x.token
 						}`,
-			  )
+				)
 			: tokens.map((x) => x.token);
 
 		if (req.query.plain) return res.send(ret.join("\n"));
diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -417,7 +417,7 @@ router.post(
 				? Member.update(
 						{ id: req.user_id, guild_id: message.guild_id },
 						{ last_message_id: message.id },
-				  )
+					)
 				: null,
 			channel.save(),
 		]);
diff --git a/src/api/routes/channels/#channel_id/typing.ts b/src/api/routes/channels/#channel_id/typing.ts
@@ -54,7 +54,7 @@ router.post(
 								...member,
 								roles: member?.roles?.map((x) => x.id),
 							},
-					  }
+						}
 					: null),
 				channel_id,
 				timestamp,
diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts
@@ -42,24 +42,24 @@ router.get(
 			guilds = showAllGuilds
 				? await Guild.find({
 						take: Math.abs(Number(limit || configLimit)),
-				  })
+					})
 				: await Guild.find({
 						where: { features: Like(`%DISCOVERABLE%`) },
 						take: Math.abs(Number(limit || configLimit)),
-				  });
+					});
 		} else {
 			guilds = showAllGuilds
 				? await Guild.find({
 						where: { primary_category_id: categories.toString() },
 						take: Math.abs(Number(limit || configLimit)),
-				  })
+					})
 				: await Guild.find({
 						where: {
 							primary_category_id: categories.toString(),
 							features: Like("%DISCOVERABLE%"),
 						},
 						take: Math.abs(Number(limit || configLimit)),
-				  });
+					});
 		}
 
 		const total = guilds ? guilds.length : undefined;
diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts
@@ -48,7 +48,7 @@ router.get(
 			: await Guild.find({
 					where: { features: Like("%DISCOVERABLE%") },
 					take: Math.abs(Number(limit || 24)),
-			  });
+				});
 		res.send({
 			recommended_guilds: guilds,
 			load_id: `server_recs/${genLoadId(32)}`,
diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts
@@ -118,7 +118,7 @@ router.get(
 							guild: {
 								roles: x?.roles || [],
 							},
-					  });
+						});
 
 			return {
 				id: x.guild.id,
diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts
@@ -89,11 +89,13 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
 	}
 
 	try {
-		return await Sentry.startSpan( // Emma [it/its]@Rory&: is this the right function to migrate to in v8?
+		return await Sentry.startSpan(
+			// Emma [it/its]@Rory&: is this the right function to migrate to in v8?
 			{
 				op: "websocket.server",
 				name: `GATEWAY ${OPCODES[data.op]}`,
-				attributes: { // this needs to be reworked :)
+				attributes: {
+					// this needs to be reworked :)
 					...data.d,
 					token: data?.d?.token ? "[Redacted]" : undefined,
 				},
diff --git a/src/gateway/listener/listener.ts b/src/gateway/listener/listener.ts
@@ -82,7 +82,7 @@ export async function setupListener(this: WebSocket) {
 
 	const opts: {
 		acknowledge: boolean;
-		channel?: AMQChannel & { queues?: unknown, ch?: number };
+		channel?: AMQChannel & { queues?: unknown; ch?: number };
 	} = {
 		acknowledge: true,
 	};
@@ -91,10 +91,20 @@ export async function setupListener(this: WebSocket) {
 
 	console.log("[RabbitMQ] setupListener: open for ", this.user_id);
 	if (RabbitMQ.connection) {
-		console.log("[RabbitMQ] setupListener: opts.channel = ", typeof opts.channel, "with channel id", opts.channel?.ch);
+		console.log(
+			"[RabbitMQ] setupListener: opts.channel = ",
+			typeof opts.channel,
+			"with channel id",
+			opts.channel?.ch,
+		);
 		opts.channel = await RabbitMQ.connection.createChannel();
 		opts.channel.queues = {};
-		console.log("[RabbitMQ] channel created: ", typeof opts.channel, "with channel id", opts.channel?.ch);
+		console.log(
+			"[RabbitMQ] channel created: ",
+			typeof opts.channel,
+			"with channel id",
+			opts.channel?.ch,
+		);
 	}
 
 	this.events[this.user_id] = await listenEvent(this.user_id, consumer, opts);
@@ -132,7 +142,14 @@ export async function setupListener(this: WebSocket) {
 	});
 
 	this.once("close", () => {
-		console.log("[RabbitMQ] setupListener: close for", this.user_id, "=", typeof opts.channel, "with channel id", opts.channel?.ch);
+		console.log(
+			"[RabbitMQ] setupListener: close for",
+			this.user_id,
+			"=",
+			typeof opts.channel,
+			"with channel id",
+			opts.channel?.ch,
+		);
 		if (opts.channel) opts.channel.close();
 		else {
 			Object.values(this.events).forEach((x) => x?.());
diff --git a/src/util/entities/Channel.ts b/src/util/entities/Channel.ts
@@ -323,7 +323,7 @@ export class Channel extends BaseClass {
 						event: "CHANNEL_CREATE",
 						data: channel,
 						guild_id: channel.guild_id,
-				  } as ChannelCreateEvent)
+					} as ChannelCreateEvent)
 				: Promise.resolve(),
 			Guild.insertChannelInOrder(guild.id, ret.id, position, guild),
 		]);
diff --git a/src/util/util/Permissions.ts b/src/util/util/Permissions.ts

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,23 @@`
`1`	`1`	`{`
`2`	`2`	`"folders": [`
`3`	`3`	`{`
`4`		`- "path": "src"`
	`4`	`+ "path": "src",`
`5`	`5`	`},`
`6`	`6`	`{`
`7`		`- "path": "assets"`
	`7`	`+ "path": "assets",`
`8`	`8`	`},`
`9`	`9`	`{`
`10`		`- "path": "scripts"`
	`10`	`+ "path": "scripts",`
`11`	`11`	`},`
`12`	`12`	`{`
`13`		`- "path": "."`
`14`		`- }`
	`13`	`+ "path": ".",`
	`14`	`+ },`
`15`	`15`	`],`
`16`	`16`	`"settings": {`
`17`		`- "typescript.tsdk": "util\\node_modules\\typescript\\lib"`
	`17`	`+ "typescript.tsdk": "util\\node_modules\\typescript\\lib",`
`18`	`18`	`},`
`19`	`19`	`"launch": {`
`20`	`20`	`"version": "0.2.0",`
`21`		`- "configurations": []`
`22`		`- }`
	`21`	`+ "configurations": [],`
	`22`	`+ },`
`23`	`23`	`}`