Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.

Commit 4b28dea

Browse files
Mateo-temMateo-tem
committed
Discord-Modals v1.3.5: Style and Code Cleanup: All files.
1 parent 320de69 commit 4b28dea

20 files changed

+493
-387
lines changed

‎.eslintrc.json

Lines changed: 205 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,210 @@
11
{
2-
"env": {
3-
"browser": true,
4-
"es2021": true,
5-
"node": true
6-
},
7-
"extends": [
8-
"eslint:recommended",
9-
"plugin:@typescript-eslint/recommended",
10-
"plugin:@typescript-eslint/recommended-requiring-type-checking",
11-
"prettier"
12-
],
13-
"parser": "@typescript-eslint/parser",
2+
"root": true,
3+
"extends": ["eslint:recommended", "plugin:prettier/recommended"],
4+
"plugins": ["import"],
145
"parserOptions": {
15-
"ecmaVersion": 12,
16-
"project": "./tsconfig.json",
17-
"sourceType": "module"
6+
"ecmaVersion": 2022
7+
},
8+
"env": {
9+
"es2022": true,
10+
"node": true
1811
},
19-
"plugins": ["@typescript-eslint", "prettier"],
2012
"rules": {
21-
"@typescript-eslint/array-type": [
22-
"error",
23-
{
24-
"default": "array-simple",
25-
"readonly": "array-simple"
26-
}
27-
],
28-
"@typescript-eslint/await-thenable": "error",
29-
"@typescript-eslint/consistent-type-assertions": "error",
30-
"@typescript-eslint/consistent-type-definitions": "error",
31-
"@typescript-eslint/consistent-type-imports": "error",
32-
"@typescript-eslint/explicit-member-accessibility": "error",
33-
"@typescript-eslint/no-base-to-string": "error",
34-
"@typescript-eslint/no-confusing-non-null-assertion": "error",
35-
"@typescript-eslint/no-dynamic-delete": "error",
36-
"@typescript-eslint/no-floating-promises": "error",
37-
"@typescript-eslint/no-unnecessary-condition": "error",
38-
"@typescript-eslint/no-unused-vars": "off",
39-
"@typescript-eslint/no-non-null-assertion": "off",
40-
"@typescript-eslint/prefer-includes": "error",
41-
"@typescript-eslint/prefer-optional-chain": "error",
42-
"@typescript-eslint/prefer-return-this-type": "error",
43-
"@typescript-eslint/require-await": "off",
44-
"arrow-body-style": "error",
45-
"arrow-spacing": "error",
46-
"block-spacing": "error",
47-
"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
48-
"comma-spacing": "error",
49-
"computed-property-spacing": ["error", "always"],
50-
"consistent-return": "error",
51-
"curly": ["error", "multi-line"],
52-
"dot-location": ["error", "property"],
53-
"dot-notation": "error",
54-
"eol-last": ["error", "always"],
55-
"eqeqeq": ["error", "always"],
56-
"key-spacing": "error",
57-
"keyword-spacing": "error",
58-
"linebreak-style": ["error", "windows"],
59-
"max-classes-per-file": ["error", 1],
60-
"new-parens": ["error", "always"],
61-
"newline-per-chained-call": "error",
62-
"no-constructor-return": "error",
63-
"no-multiple-empty-lines": "error",
64-
"no-nested-ternary": "error",
65-
"no-return-await": "error",
66-
"no-template-curly-in-string": "error",
67-
"no-trailing-spaces": "error",
68-
"no-unsafe-optional-chaining": "error",
69-
"no-var": "error",
70-
"object-curly-spacing": ["error", "always"],
71-
"prefer-arrow-callback": "error",
72-
"prefer-const": "error",
73-
"prefer-destructuring": "error",
74-
"prefer-rest-params": "error",
75-
"prefer-spread": "error",
76-
"prefer-template": "error",
77-
"quotes": ["error", "single"],
78-
"radix": ["error", "always"],
79-
"require-await": "error",
13+
"import/order": [
14+
"error",
15+
{
16+
"groups": ["builtin", "external", "internal", "index", "sibling", "parent"],
17+
"alphabetize": {
18+
"order": "asc"
19+
}
20+
}
21+
],
22+
"prettier/prettier": [
23+
2,
24+
{
25+
"printWidth": 120,
26+
"singleQuote": true,
27+
"quoteProps": "as-needed",
28+
"trailingComma": "all",
29+
"endOfLine": "lf",
30+
"arrowParens": "avoid"
31+
}
32+
],
33+
"strict": ["error", "global"],
34+
"no-await-in-loop": "warn",
35+
"no-compare-neg-zero": "error",
36+
"no-template-curly-in-string": "error",
37+
"no-unsafe-negation": "error",
38+
"valid-jsdoc": [
39+
"error",
40+
{
41+
"requireReturn": false,
42+
"requireReturnDescription": false,
43+
"prefer": {
44+
"return": "returns",
45+
"arg": "param"
46+
},
47+
"preferType": {
48+
"String": "string",
49+
"Number": "number",
50+
"Boolean": "boolean",
51+
"Symbol": "symbol",
52+
"object": "Object",
53+
"function": "Function",
54+
"array": "Array",
55+
"date": "Date",
56+
"error": "Error",
57+
"null": "void"
58+
}
59+
}
60+
],
61+
62+
"accessor-pairs": "warn",
63+
"array-callback-return": "error",
64+
"consistent-return": "error",
65+
"curly": ["error", "multi-line", "consistent"],
66+
"dot-location": ["error", "property"],
67+
"dot-notation": "error",
68+
"eqeqeq": "error",
69+
"no-empty-function": "off",
70+
"no-floating-decimal": "error",
71+
"no-implied-eval": "error",
72+
"no-invalid-this": "error",
73+
"no-lone-blocks": "error",
74+
"no-multi-spaces": "error",
75+
"no-new-func": "error",
76+
"no-new-wrappers": "error",
77+
"no-new": "error",
78+
"no-octal-escape": "error",
79+
"no-return-assign": "error",
80+
"no-return-await": "error",
81+
"no-self-compare": "error",
82+
"no-sequences": "error",
83+
"no-throw-literal": "error",
84+
"no-unmodified-loop-condition": "error",
85+
"no-unused-expressions": "error",
86+
"no-useless-call": "error",
87+
"no-useless-concat": "error",
88+
"no-useless-escape": "error",
89+
"no-useless-return": "error",
90+
"no-void": "error",
91+
"no-warning-comments": "warn",
92+
"prefer-promise-reject-errors": "error",
93+
"require-await": "warn",
94+
"wrap-iife": "error",
95+
"yoda": "error",
96+
97+
"no-label-var": "error",
98+
"no-shadow": "error",
99+
"no-undef-init": "error",
100+
101+
"callback-return": "error",
102+
"getter-return": "off",
103+
"handle-callback-err": "error",
104+
"no-mixed-requires": "error",
105+
"no-new-require": "error",
106+
"no-path-concat": "error",
107+
108+
"array-bracket-spacing": "error",
109+
"block-spacing": "error",
110+
"brace-style": ["error", "1tbs", { "allowSingleLine": true }],
111+
"capitalized-comments": ["error", "always", { "ignoreConsecutiveComments": true }],
112+
"comma-dangle": ["error", "always-multiline"],
113+
"comma-spacing": "error",
114+
"comma-style": "error",
115+
"computed-property-spacing": "error",
116+
"consistent-this": ["error", "$this"],
117+
"eol-last": "error",
118+
"func-names": "error",
119+
"func-name-matching": "error",
120+
"func-style": ["error", "declaration", { "allowArrowFunctions": true }],
121+
"key-spacing": "error",
122+
"keyword-spacing": "error",
123+
"max-depth": "error",
124+
"max-len": ["error", 120, 2],
125+
"max-nested-callbacks": ["error", { "max": 4 }],
126+
"max-statements-per-line": ["error", { "max": 2 }],
127+
"new-cap": "off",
128+
"newline-per-chained-call": ["error", { "ignoreChainWithDepth": 3 }],
129+
"no-array-constructor": "error",
130+
"no-inline-comments": "error",
131+
"no-lonely-if": "error",
132+
"no-multiple-empty-lines": ["error", { "max": 2, "maxEOF": 1, "maxBOF": 0 }],
133+
"no-new-object": "error",
134+
"no-spaced-func": "error",
135+
"no-trailing-spaces": "error",
136+
"no-unneeded-ternary": "error",
137+
"no-whitespace-before-property": "error",
138+
"nonblock-statement-body-position": "error",
139+
"object-curly-spacing": ["error", "always"],
140+
"operator-assignment": "error",
141+
"padded-blocks": ["error", "never"],
142+
"quote-props": ["error", "as-needed"],
143+
"quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
144+
"semi-spacing": "error",
145+
"semi": "error",
146+
"space-before-blocks": "error",
147+
"space-before-function-paren": [
148+
"error",
149+
{
150+
"anonymous": "never",
151+
"named": "never",
152+
"asyncArrow": "always"
153+
}
154+
],
155+
"space-in-parens": "error",
156+
"space-infix-ops": "error",
157+
"space-unary-ops": "error",
158+
"spaced-comment": "error",
159+
"template-tag-spacing": "error",
160+
"unicode-bom": "error",
161+
162+
"arrow-body-style": "error",
163+
"arrow-parens": ["error", "as-needed"],
164+
"arrow-spacing": "error",
165+
"no-duplicate-imports": "error",
166+
"no-useless-computed-key": "error",
167+
"no-useless-constructor": "error",
168+
"prefer-arrow-callback": "error",
169+
"prefer-numeric-literals": "error",
170+
"prefer-rest-params": "error",
171+
"prefer-spread": "error",
172+
"prefer-template": "error",
173+
"prefer-object-has-own": "error",
174+
"rest-spread-spacing": "error",
175+
"template-curly-spacing": "error",
176+
"yield-star-spacing": "error",
177+
178+
"no-restricted-globals": [
179+
"error",
180+
{
181+
"name": "Buffer",
182+
"message": "Import Buffer from `node:buffer` instead"
183+
},
184+
{
185+
"name": "process",
186+
"message": "Import process from `node:process` instead"
187+
},
188+
{
189+
"name": "setTimeout",
190+
"message": "Import setTimeout from `node:timers` instead"
191+
},
192+
{
193+
"name": "setInterval",
194+
"message": "Import setInterval from `node:timers` instead"
195+
},
196+
{
197+
"name": "setImmediate",
198+
"message": "Import setImmediate from `node:timers` instead"
199+
},
200+
{
201+
"name": "clearTimeout",
202+
"message": "Import clearTimeout from `node:timers` instead"
203+
},
204+
{
205+
"name": "clearInterval",
206+
"message": "Import clearInterval from `node:timers` instead"
207+
}
208+
]
80209
}
81-
}
210+
}

‎CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
Hello! This is the Change log section of Discord-Modals. Here you can see what things have been changed in the different versions, to be informed. This will be updated every time there are new versions. I hope you enjoy this package :)
44

5-
# v1.3.4 (Stable)
5+
# v1.3.5 (Stable)
6+
7+
- Style and Code Cleanup: All files.
8+
- Chore: Add eslint.
9+
10+
# v1.3.4
611

712
- Fix: JSON Modals on `.showModal()` didn't work.
813

‎package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "discord-modals",
3-
"version": "1.3.4",
3+
"version": "1.3.5",
44
"description": "Discord-Modals is a package that allows your discord.js v13 and v14 bot to create, and interact with Modals, a new Discord feature.",
55
"main": "index.js",
66
"files": [
@@ -9,7 +9,9 @@
99
"index.js"
1010
],
1111
"scripts": {
12-
"test": "echo \"Error: no test specified\" && exit 1"
12+
"test": "echo \"Error: no test specified\" && exit 1",
13+
"eslint-fix": "eslint src/ --fix --ext .js --cache",
14+
"eslint-err": "eslint src/ --ext .js --cache"
1315
},
1416
"keywords": [
1517
"discord.js",
@@ -40,10 +42,11 @@
4042
},
4143
"devDependencies": {
4244
"@typescript-eslint/eslint-plugin": "5.18.0",
43-
"@typescript-eslint/parser": "5.18.0",
44-
"eslint": "8.12.0",
45-
"eslint-config-prettier": "8.5.0",
46-
"eslint-plugin-prettier": "4.0.0",
47-
"discord.js": "^13.6.0"
45+
"@typescript-eslint/parser": "5.18.0",
46+
"discord.js": "^13.6.0",
47+
"eslint": "8.12.0",
48+
"eslint-config-prettier": "8.5.0",
49+
"eslint-plugin-import": "^2.26.0",
50+
"eslint-plugin-prettier": "4.0.0"
4851
}
4952
}

‎src/structures/BaseMessageComponent.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
const { MessageComponentTypes } = require('../util/Constants');
1+
'use strict';
2+
23
const { TypeError } = require('./errors');
4+
const { MessageComponentTypes } = require('../util/Constants');
35

46
/**
57
* Represents an interactive component of a Message.
@@ -12,7 +14,7 @@ class BaseMessageComponent {
1214

1315
static create(data, client) {
1416
let component;
15-
let type = data.type;
17+
let { type } = data;
1618

1719
if (typeof type === 'string') type = MessageComponentTypes[type];
1820

@@ -37,4 +39,4 @@ class BaseMessageComponent {
3739
}
3840
}
3941

40-
module.exports = BaseMessageComponent;
42+
module.exports = BaseMessageComponent;

‎src/structures/Interaction.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

3+
const { InteractionType } = require('discord-api-types/v9');
34
const { Base, Permissions } = require('discord.js');
45
const SnowflakeUtil = require('../util/SnowflakeUtil');
5-
const { InteractionType } = require('discord-api-types/v9');
66

77
/**
88
* Represents an Interaction.
@@ -15,7 +15,7 @@ class Interaction extends Base {
1515

1616
this.id = data.id;
1717

18-
Object.defineProperty(this, "token", { value: data.token });
18+
Object.defineProperty(this, 'token', { value: data.token });
1919

2020
this.applicationId = data.application_id;
2121

@@ -25,15 +25,11 @@ class Interaction extends Base {
2525

2626
this.user = this.client.users._add(data.user ?? data.member.user);
2727

28-
this.member = data.member
29-
? this.guild?.members._add(data.member) ?? data.member
30-
: null;
28+
this.member = data.member ? this.guild?.members._add(data.member) ?? data.member : null;
3129

3230
this.version = data.version;
3331

34-
this.memberPermissions = data.member?.permissions
35-
? new Permissions(data.member.permissions).freeze()
36-
: null;
32+
this.memberPermissions = data.member?.permissions ? new Permissions(data.member.permissions).freeze() : null;
3733

3834
this.locale = data.locale;
3935

0 commit comments

Comments
 (0)