Skip to content

Commit a8b45c2

Browse files
authored
Merge branch 'main' into feat/add-set-voice-channel-status-permission
2 parents c2827e4 + 19327a5 commit a8b45c2

File tree

246 files changed

+12886
-6716
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+12886
-6716
lines changed

.eslintplugin/index.ts .eslint-plugin-local/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const schema = [
3535
},
3636
},
3737
},
38-
];
38+
] as const;
3939

4040
export = {
4141
rules: {

.eslint-plugin-local/tsconfig.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": "../tsconfig.json",
3+
"compilerOptions": {
4+
"declaration": false,
5+
"declarationMap": false,
6+
"skipLibCheck": true
7+
},
8+
"include": ["./index.ts"]
9+
}

.eslintplugin/tsconfig.json

-20
This file was deleted.

.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"tsdoc/syntax": "off",
1616
"typescript-sort-keys/interface": "off",
1717
"typescript-sort-keys/string-enum": "off",
18-
"unicorn/prefer-math-trunc": "off"
18+
"unicorn/prefer-math-trunc": "off",
19+
"jsdoc/no-undefined-types": "off"
1920
}
2021
}

.github/CODE_OF_CONDUCT.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
- Using welcoming and inclusive language
18-
- Being respectful of differing viewpoints and experiences
19-
- Gracefully accepting constructive criticism
20-
- Focusing on what is best for the community
21-
- Showing empathy towards other community members
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
2222

2323
Examples of unacceptable behavior by participants include:
2424

25-
- The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
- Trolling, insulting/derogatory comments, and personal or political attacks
28-
- Public or private harassment
29-
- Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
- Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
25+
- The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
- Trolling, insulting/derogatory comments, and personal or political attacks
28+
- Public or private harassment
29+
- Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
- Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
3333

3434
## Our Responsibilities
3535

.github/COMMIT_CONVENTION.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ The scope could be anything specifying the place of the commit change. For examp
7474

7575
The subject contains a succinct description of the change:
7676

77-
- use the imperative, present tense: "change" not "changed" nor "changes"
78-
- don't capitalize the first letter
79-
- no dot (.) at the end
77+
- use the imperative, present tense: "change" not "changed" nor "changes"
78+
- don't capitalize the first letter
79+
- no dot (.) at the end
8080

8181
### Body
8282

.github/CONTRIBUTING.md

+22-22
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@
22

33
**The issue tracker is only for bug reports and enhancement suggestions. If you have a question, please ask it in the [Discord server](https://discord.gg/djs) instead of opening an issue, or on [GitHub Discussions](https://github.com/discordjs/discord-api-types/discussions) – you will get redirected there anyway.**
44

5-
- [Code of Conduct](https://github.com/discordjs/discord-api-types/blob/main/.github/CODE_OF_CONDUCT.md)
6-
- [Pull Request Guidelines](#pull-request-guidelines)
7-
- [Development Setup](#development-setup)
8-
- [Project Structure](#project-structure)
9-
- [Contributing Tests](#contributing-tests)
5+
- [Code of Conduct](https://github.com/discordjs/discord-api-types/blob/main/.github/CODE_OF_CONDUCT.md)
6+
- [Pull Request Guidelines](#pull-request-guidelines)
7+
- [Development Setup](#development-setup)
8+
- [Project Structure](#project-structure)
9+
- [Contributing Tests](#contributing-tests)
1010

1111
## Pull Request Guidelines
1212

13-
- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch.
13+
- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch.
1414

15-
- If adding a new feature:
15+
- If adding a new feature:
1616

17-
- Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first and have it approved before working on it.
17+
- Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first and have it approved before working on it.
1818

19-
- If fixing a bug:
19+
- If fixing a bug:
2020

21-
- If you are resolving a special issue, add `fix/close #xxxx[,#xxxx]` (#xxxx is the issue id) in your PR body for a better release log, e.g.
21+
- If you are resolving a special issue, add `fix/close #xxxx[,#xxxx]` (#xxxx is the issue id) in your PR body for a better release log, e.g.
2222

23-
```
24-
fix(Guild): handle events correctly
23+
```
24+
fix(Guild): handle events correctly
2525
26-
close #28
27-
```
26+
close #28
27+
```
2828
29-
- Provide a detailed description of the bug in the PR. Live demo preferred.
29+
- Provide a detailed description of the bug in the PR. Live demo preferred.
3030
31-
- It's OK to have multiple small commits as you work on the PR - GitHub can automatically squash them before merging.
31+
- It's OK to have multiple small commits as you work on the PR - GitHub can automatically squash them before merging.
3232
33-
- Make sure tests pass!
33+
- Make sure tests pass!
3434
35-
- Commit messages must follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. Commit messages are automatically validated before commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [husky](https://github.com/typicode/husky)).
35+
- Commit messages must follow the [commit message convention](./COMMIT_CONVENTION.md) so that changelogs can be automatically generated. Commit messages are automatically validated before commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [husky](https://github.com/typicode/husky)).
3636
37-
- No need to worry about code style as long as you have installed the dev dependencies - modified files are automatically formatted with Prettier on commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [husky](https://github.com/typicode/husky)).
37+
- No need to worry about code style as long as you have installed the dev dependencies - modified files are automatically formatted with Prettier on commit (by invoking [Git Hooks](https://git-scm.com/docs/githooks) via [husky](https://github.com/typicode/husky)).
3838
3939
## Development Setup
4040
@@ -48,6 +48,6 @@ $ npm i # install the dependencies of the project
4848

4949
A high level overview of tools used:
5050

51-
- [TypeScript](https://www.typescriptlang.org/) as the development language
52-
- [ESLint](https://eslint.org/) for code-style
53-
- [Prettier](https://prettier.io/) for code formatting
51+
- [TypeScript](https://www.typescriptlang.org/) as the development language
52+
- [ESLint](https://eslint.org/) for code-style
53+
- [Prettier](https://prettier.io/) for code formatting

.github/labeler.yml

+56-31
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,83 @@
11
chore:
2-
- any: ['*']
3-
all:
4-
[
5-
'!deno/**/*',
6-
'!gateway/**/*',
7-
'!payloads/**/*',
8-
'!rest/**/*',
9-
'!rpc/**/*',
10-
'!tests/**/*',
11-
'!utils/**/*',
12-
'!voice/**/*',
13-
]
2+
- changed-files:
3+
- all-globs-to-any-file:
4+
- '*'
5+
- '!deno/**/*'
6+
- '!gateway/**/*'
7+
- '!payloads/**/*'
8+
- '!rest/**/*'
9+
- '!rpc/**/*'
10+
- '!tests/**/*'
11+
- '!utils/**/*'
12+
- '!voice/**/*'
1413

1514
ci:
16-
- .github/**/*
17-
- .husky/**/*
18-
- scripts/actions/**/*
15+
- changed-files:
16+
- any-glob-to-any-file:
17+
- .github/**/*
18+
- .husky/**/*
19+
- scripts/actions/**/*
1920

2021
dependencies:
21-
- package.json
22-
- package-lock.json
23-
- website/package.json
24-
- website/package-lock.json
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- package.json
25+
- package-lock.json
26+
- website/package.json
27+
- website/package-lock.json
2528

2629
'topic:deno':
27-
- scripts/deno.mjs
28-
- scripts/actions/report-deno-not-ran.mjs
30+
- changed-files:
31+
- any-glob-to-any-file:
32+
- scripts/deno.mjs
33+
- scripts/actions/report-deno-not-ran.mjs
2934

3035
'topic:gateway':
31-
- gateway/**/*
36+
- changed-files:
37+
- any-glob-to-any-file:
38+
- gateway/**/*
3239

3340
'topic:payloads':
34-
- payloads/**/*
41+
- changed-files:
42+
- any-glob-to-any-file:
43+
- payloads/**/*
3544

3645
'topic:rest':
37-
- rest/**/*
46+
- changed-files:
47+
- any-glob-to-any-file:
48+
- rest/**/*
3849

3950
'topic:rpc':
40-
- rpc/**/*
51+
- changed-files:
52+
- any-glob-to-any-file:
53+
- rpc/**/*
4154

4255
'topic:scripts':
43-
- scripts/**/*
56+
- changed-files:
57+
- any-glob-to-any-file:
58+
- scripts/**/*
4459

4560
'topic:tests':
46-
- tests/**/*
61+
- changed-files:
62+
- any-glob-to-any-file:
63+
- tests/**/*
4764

4865
'topic:utils':
49-
- utils/**/*
66+
- changed-files:
67+
- any-glob-to-any-file:
68+
- utils/**/*
5069

5170
'topic:voice':
52-
- voice/**/*
71+
- changed-files:
72+
- any-glob-to-any-file:
73+
- voice/**/*
5374

5475
'topic:globals':
55-
- globals.ts
76+
- changed-files:
77+
- any-glob-to-any-file:
78+
- globals.ts
5679

5780
'topic:website':
58-
- website/**/*
81+
- changed-files:
82+
- any-glob-to-any-file:
83+
- website/**/*

.github/workflows/check-deno.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout Project
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

17-
- name: Use Node.js v16
18-
uses: actions/setup-node@v2
17+
- name: Use Node.js v20
18+
uses: actions/setup-node@v4
1919
with:
20-
node-version: 16
20+
node-version: 20
2121

2222
- name: Install Dependencies
2323
run: npm ci

.github/workflows/cicd.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout Project
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v4
1616

1717
- name: Add problem matcher
1818
run: echo "::add-matcher::.github/problemMatchers/eslint.json" && echo "::add-matcher::.github/problemMatchers/tsc.json"
1919

20-
- name: Use Node.js v16
21-
uses: actions/setup-node@v2
20+
- name: Use Node.js v20
21+
uses: actions/setup-node@v4
2222
with:
23-
node-version: 16
23+
node-version: 20
2424
cache: npm
2525
registry-url: https://registry.npmjs.org/
2626

@@ -42,12 +42,12 @@ jobs:
4242

4343
steps:
4444
- name: Checkout Project
45-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
4646

47-
- name: Use Node.js v16
48-
uses: actions/setup-node@v2
47+
- name: Use Node.js v20
48+
uses: actions/setup-node@v4
4949
with:
50-
node-version: 16
50+
node-version: 20
5151

5252
- name: Install Dependencies
5353
run: npm ci

.github/workflows/create-pr-for-release-and-publish.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ jobs:
1717

1818
steps:
1919
- name: Checkout repository
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323

24-
- name: Install Node v16
25-
uses: actions/setup-node@v2
24+
- name: Install Node v20
25+
uses: actions/setup-node@v4
2626
with:
27-
node-version: 16
27+
node-version: 20
2828
registry-url: https://registry.npmjs.org/
2929

3030
- name: Install dependencies
@@ -65,18 +65,22 @@ jobs:
6565
create_release:
6666
name: Create release and publish
6767
runs-on: ubuntu-latest
68+
permissions:
69+
id-token: write
70+
contents: write
71+
6872
if: github.repository_owner == 'discordjs' && github.event_name == 'push' && startsWith(github.event.head_commit.message, 'chore(release)') && !contains(github.event.head_commit.message, '[skip ci]')
6973

7074
steps:
7175
- name: Checkout repository
72-
uses: actions/checkout@v2
76+
uses: actions/checkout@v4
7377
with:
7478
fetch-depth: 0
7579

76-
- name: Install Node v16
77-
uses: actions/setup-node@v2
80+
- name: Install Node v20
81+
uses: actions/setup-node@v4
7882
with:
79-
node-version: 16
83+
node-version: 20
8084
registry-url: https://registry.npmjs.org/
8185

8286
- name: Install dependencies

.github/workflows/labelsync.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

1919
- name: Label sync
20-
uses: crazy-max/ghaction-github-labeler@v3
20+
uses: crazy-max/ghaction-github-labeler@v5
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)