chore: Add prettier and do stuff with it

sveltejs · Dec 11, 2021 · b9918c7 · b9918c7
1 parent c76e69d
commit b9918c7
Show file tree

Hide file tree

Showing 12 changed files with 157 additions and 144 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,2 @@
+pnpm-lock.yaml
+dist
diff --git a/.prettierrc b/.prettierrc
@@ -1,10 +1,10 @@
 {
-    "singleQuote": true,
-    "quoteProps": "as-needed",
-    "trailingComma": "all",
-    "bracketSpacing": true,
-    "arrowParens": "always",
-    "semi": true,
-    "useTabs": false,
-    "tabWidth": 4
-}
+	"singleQuote": true,
+	"quoteProps": "as-needed",
+	"trailingComma": "all",
+	"bracketSpacing": true,
+	"arrowParens": "always",
+	"semi": true,
+	"useTabs": true,
+	"tabWidth": 4
+}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,6 +1,6 @@
 {
-    "recommendations": [
-        "esbenp.prettier-vscode",
-        "christian-kohler.npm-intellisense",
-    ]
+	"recommendations": [
+		"esbenp.prettier-vscode",
+		"christian-kohler.npm-intellisense"
+	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,13 +1,13 @@
 {
-    "[javascript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": true
-    },
-    "[typescript]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": true
-    },
-    "[json]": {
-        "editor.defaultFormatter": "vscode.json-language-features"
-    }
+	"[javascript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
+	},
+	"[typescript]": {
+		"editor.defaultFormatter": "esbenp.prettier-vscode",
+		"editor.formatOnSave": true
+	},
+	"[json]": {
+		"editor.defaultFormatter": "vscode.json-language-features"
+	}
 }
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@ something can go here
 # Running for development
 
 1. Once you have the bot cloned and have run `pnpm install` then you need to make a .env file and fill out the fields:
+
     ```sh
     cp .env.example .env
     ```

diff --git a/package.json b/package.json
@@ -1,29 +1,31 @@
 {
-  "name": "svelte-bot",
-  "private": true,
-  "version": "0.0.0",
-  "main": "dist/index.js",
-  "scripts": {
-    "build": "rimraf dist && tsc",
-    "dev": "rimraf dist && run-p dev:*",
-    "dev:tsc": "tsc -w --preserveWatchOutput",
-    "dev:nodemon": "nodemon .",
-    "start": "node ."
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@types/nice-try": "^2.1.0",
-    "@types/node": "^16.11.12",
-    "discord.js": "^13.3.1",
-    "dotenv": "^10.0.0",
-    "jellycommands": "^1.0.0-12",
-    "nice-try": "^3.0.0",
-    "rimraf": "^3.0.2",
-    "typescript": "^4.5.3",
-    "url-regex": "^5.0.0"
-  },
-  "devDependencies": {
-    "nodemon": "^2.0.15",
-    "npm-run-all": "^4.1.5"
-  }
+	"name": "svelte-bot",
+	"private": true,
+	"version": "0.0.0",
+	"main": "dist/index.js",
+	"scripts": {
+		"build": "rimraf dist && tsc",
+		"dev": "rimraf dist && run-p dev:*",
+		"dev:tsc": "tsc -w --preserveWatchOutput",
+		"format": "prettier --write --plugin-search-dir=. .",
+		"dev:nodemon": "nodemon .",
+		"start": "node ."
+	},
+	"license": "MIT",
+	"dependencies": {
+		"@types/nice-try": "^2.1.0",
+		"@types/node": "^16.11.12",
+		"discord.js": "^13.3.1",
+		"dotenv": "^10.0.0",
+		"jellycommands": "^1.0.0-12",
+		"nice-try": "^3.0.0",
+		"rimraf": "^3.0.2",
+		"typescript": "^4.5.3",
+		"url-regex": "^5.0.0"
+	},
+	"devDependencies": {
+		"nodemon": "^2.0.15",
+		"npm-run-all": "^4.1.5",
+		"prettier": "^2.5.1"
+	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/commands/test.ts b/src/commands/test.ts
@@ -1,12 +1,12 @@
 import { command } from 'jellycommands';
 
 export default command({
-    name: 'test',
-    description: 'Testing that the bot works fine',
+	name: 'test',
+	description: 'Testing that the bot works fine',
 
-    global: true,
-    dev: true,
+	global: true,
+	dev: true,
 
-    run: ({ interaction }) =>
-        interaction.reply({ embeds: [{ description: 'Hello World!' }] }),
+	run: ({ interaction }) =>
+		interaction.reply({ embeds: [{ description: 'Hello World!' }] }),
 });
diff --git a/src/events/message.ts b/src/events/message.ts
@@ -4,72 +4,72 @@ import niceTry from 'nice-try';
 
 // TODO discuss best way to store these ids
 const linkOnlyChannels = [
-    // Testing Channel
-    '918915215368810566',
+	// Testing Channel
+	'918915215368810566',
 
-    // Showcase
-    '479653552869081089',
+	// Showcase
+	'479653552869081089',
 
-    // Resources
-    '837012201444999248',
+	// Resources
+	'837012201444999248',
 ];
 
 const autoThreadChannels = [
-    // testing
-    '918932662226386994',
+	// testing
+	'918932662226386994',
 
-    // Showcase
-    '479653552869081089',
+	// Showcase
+	'479653552869081089',
 
-    // Resources
-    '837012201444999248',
+	// Resources
+	'837012201444999248',
 ];
 
 export default event({
-    name: 'messageCreate',
+	name: 'messageCreate',
 
-    run: async ({}, message) => {
-        if (message.author.bot) return;
+	run: async ({}, message) => {
+		if (message.author.bot) return;
 
-        if (linkOnlyChannels.includes(message.channel.id)) {
-            const hasLink = urlRegex().test(message.content);
+		if (linkOnlyChannels.includes(message.channel.id)) {
+			const hasLink = urlRegex().test(message.content);
 
-            if (!hasLink) {
-                try {
-                    if (message.deletable) await message.delete();
+			if (!hasLink) {
+				try {
+					if (message.deletable) await message.delete();
 
-                    await message.author.send({
-                        embeds: [
-                            {
-                                description: `Your message in ${message.channel.toString()} was removed since it doesn't contain a link, if you are trying to showcase a project please post a link with your text. Otherwise all conversation should be inside a thread\n\nYour message was sent below so you don't lose it!`,
-                            },
-                        ],
-                    });
+					await message.author.send({
+						embeds: [
+							{
+								description: `Your message in ${message.channel.toString()} was removed since it doesn't contain a link, if you are trying to showcase a project please post a link with your text. Otherwise all conversation should be inside a thread\n\nYour message was sent below so you don't lose it!`,
+							},
+						],
+					});
 
-                    await message.author.send({
-                        content: message.content,
-                    });
-                } catch {
-                    // this will fail if message is already deleted but we don't know or if the dm can't be sent - either way we don't need to do anything
-                }
+					await message.author.send({
+						content: message.content,
+					});
+				} catch {
+					// this will fail if message is already deleted but we don't know or if the dm can't be sent - either way we don't need to do anything
+				}
 
-                return;
-            }
-        }
+				return;
+			}
+		}
 
-        if (
-            autoThreadChannels.includes(message.channel.id) &&
-            !message.hasThread &&
-            message.channel.type == 'GUILD_TEXT'
-        ) {
-            try {
-                message.channel.threads.create({
-                    name: 'Discussion',
-                    startMessage: message,
-                });
-            } catch {
-                // we can ignore this error since chances are it will be that thread already exists
-            }
-        }
-    },
+		if (
+			autoThreadChannels.includes(message.channel.id) &&
+			!message.hasThread &&
+			message.channel.type == 'GUILD_TEXT'
+		) {
+			try {
+				message.channel.threads.create({
+					name: 'Discussion',
+					startMessage: message,
+				});
+			} catch {
+				// we can ignore this error since chances are it will be that thread already exists
+			}
+		}
+	},
 });
diff --git a/src/events/ready.ts b/src/events/ready.ts
@@ -1,6 +1,6 @@
 import { event } from 'jellycommands';
 
 export default event({
-    name: 'ready',
-    run: () => console.log('Bot is online!'),
+	name: 'ready',
+	run: () => console.log('Bot is online!'),
 });
diff --git a/src/index.ts b/src/index.ts
@@ -3,24 +3,24 @@ import { JellyCommands } from 'jellycommands';
 import { Intents } from 'discord.js';
 
 const client = new JellyCommands({
-    commands: 'dist/commands',
-    events: 'dist/events',
+	commands: 'dist/commands',
+	events: 'dist/events',
 
-    clientOptions: {
-        intents: [
-            Intents.FLAGS.GUILDS,
-            Intents.FLAGS.GUILD_MESSAGES,
-            Intents.FLAGS.GUILD_MEMBERS,
-        ],
-    },
+	clientOptions: {
+		intents: [
+			Intents.FLAGS.GUILDS,
+			Intents.FLAGS.GUILD_MESSAGES,
+			Intents.FLAGS.GUILD_MEMBERS,
+		],
+	},
 
-    dev: {
-        // If we set dev to true in a command it disabled global and adds it to the guilds bellow
-        guilds: ['918887934822858802'],
-    },
+	dev: {
+		// If we set dev to true in a command it disabled global and adds it to the guilds bellow
+		guilds: ['918887934822858802'],
+	},
 
-    // we can disable this but I like to see the debug messages xD - GHOST
-    debug: true,
+	// we can disable this but I like to see the debug messages xD - GHOST
+	debug: true,
 });
 
 // Auto reads the DISCORD_TOKEN environment variable

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,22 +1,22 @@
 {
-    "compilerOptions": {
-        "target": "es2019",
-        "module": "commonjs",
-        "outDir": "./dist",
-        "lib": ["ES2020"],
-        "moduleResolution": "node",
+	"compilerOptions": {
+		"target": "es2019",
+		"module": "commonjs",
+		"outDir": "./dist",
+		"lib": ["ES2020"],
+		"moduleResolution": "node",
 
-        "strict": true,
-        "declaration": false,
-        "strictNullChecks": true,
-        "noImplicitReturns": true,
-        "noImplicitThis": true,
-        "noImplicitAny": true,
-        "esModuleInterop": true,
-        "forceConsistentCasingInFileNames": true,
-        "resolveJsonModule": true,
-        "allowJs": true
-    },
-    "include": ["src/**/*"],
-    "exclude": ["dist"]
+		"strict": true,
+		"declaration": false,
+		"strictNullChecks": true,
+		"noImplicitReturns": true,
+		"noImplicitThis": true,
+		"noImplicitAny": true,
+		"esModuleInterop": true,
+		"forceConsistentCasingInFileNames": true,
+		"resolveJsonModule": true,
+		"allowJs": true
+	},
+	"include": ["src/**/*"],
+	"exclude": ["dist"]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ something can go here @@
     # Running for development
 . Once you have the bot cloned and have run `pnpm install` then you need to make a .env file and fill out the fields:
         ```sh
         cp .env.example .env
         ```
@@ Expand Down @@