Skip to content

Commit 6e0df74

Browse files
committed
Merge branch 'main' into memberProfileBlocking
2 parents ad1e7c4 + 05acd50 commit 6e0df74

File tree

93 files changed

+7974
-2856
lines changed

Some content is hidden

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

93 files changed

+7974
-2856
lines changed

.eslintrc.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
2-
"extends": "marine/prettier/node",
3-
"ignorePatterns": ["dist/*", "**/*.js"],
4-
"parserOptions": {
5-
"project": "./tsconfig.eslint.json"
6-
},
7-
"rules": {
8-
"no-eq-null": "off"
9-
}
2+
"root": true,
3+
"parser": "@typescript-eslint/parser",
4+
"plugins": ["@typescript-eslint", "prettier"],
5+
"rules": {
6+
"prettier/prettier": "error"
7+
},
8+
"extends": [
9+
"eslint:recommended",
10+
"plugin:@typescript-eslint/recommended",
11+
"plugin:prettier/recommended"
12+
]
1013
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: App Subscriptions Bug Report
2+
description: A bug has been found in Discord's App Subscriptions.
3+
labels: ["bug", "premium-apps"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues?q=is%3Aissue+label%3A%22premium-apps%22"
8+
- type: textarea
9+
id: description
10+
attributes:
11+
label: Description
12+
description: Provide a clear and concise description of what the problem is.
13+
validations:
14+
required: true
15+
- type: textarea
16+
id: steps
17+
attributes:
18+
label: Steps to Reproduce
19+
description: Provide clear and concise steps for us to reliably reproduce this issue.
20+
validations:
21+
required: true
22+
- type: textarea
23+
id: expected
24+
attributes:
25+
label: Expected Behavior
26+
description: What is the behavior you expect to occur that is not?
27+
validations:
28+
required: true
29+
- type: textarea
30+
id: current
31+
attributes:
32+
label: Current Behavior
33+
description: What is the behavior you are currently seeing instead?
34+
validations:
35+
required: true
36+
- type: textarea
37+
id: screenshots
38+
attributes:
39+
label: Screenshots/Videos
40+
description: Provide a screenshot and/or video demonstrating the issue being experienced.
41+
validations:
42+
required: false
43+
- type: textarea
44+
id: information
45+
attributes:
46+
label: Client and System Information
47+
description: What is the browser/library/client you are using? What operating system and version?
48+
validations:
49+
required: true

.github/ISSUE_TEMPLATE/developer-site-bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Developer Site Bug Report
22
description: A bug has been found with Discord's Developer site or documentation.
3-
labels: ["bug"]
3+
labels: ["bug", "developer portal"]
44
body:
55
- type: markdown
66
attributes:
7-
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues"
7+
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues?q=is%3Aissue+label%3A%22developer+portal%22"
88
- type: textarea
99
id: description
1010
attributes:

.github/ISSUE_TEMPLATE/message-components-bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Message Components Bug Report
22
description: A bug has been found in Discord's Message Components.
3-
labels: ["message components"]
3+
labels: ["bug", "message components"]
44
body:
55
- type: markdown
66
attributes:
7-
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues?q=is%3Aissue+label%3A%22message+components%22+"
7+
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues?q=is%3Aissue+label%3A%22message+components%22"
88
- type: textarea
99
id: description
1010
attributes:

.github/ISSUE_TEMPLATE/slash-command-bug-report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Slash Commands Bug Report
22
description: A bug has been found in Discord's Slash Commands and Interactions.
3-
labels: ["slash commands"]
3+
labels: ["bug", "slash commands"]
44
body:
55
- type: markdown
66
attributes:
7-
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues?q=is%3Aissue+label%3A%22slash+commands%22+"
7+
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues?q=is%3Aissue+label%3A%22slash+commands%22"
88
- type: textarea
99
id: description
1010
attributes:

.github/dependabot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,11 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7+
- package-ecosystem: "npm"
8+
directory: "/"
9+
schedule:
10+
interval: "weekly"
11+
ignore:
12+
- dependency-name: "*"
13+
update-types:
14+
["version-update:semver-patch", "version-update:semver-minor"]

.github/workflows/docs.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Verify Docs Formatting
2+
3+
on: [push, pull_request]
4+
5+
permissions:
6+
contents: read
7+
8+
jobs:
9+
markdown_tables:
10+
name: Check Markdown Tables
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repository
14+
uses: actions/checkout@v4
15+
16+
- name: Install Node v16
17+
uses: actions/setup-node@v3
18+
with:
19+
node-version: 16
20+
cache: npm
21+
22+
- name: Install dependencies
23+
run: npm ci
24+
25+
- name: Check Markdown Tables
26+
run: |
27+
shopt -s globstar
28+
npx markdown-table-formatter docs/**/*.{md,mdx} --check
29+
shell: bash

.github/workflows/test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout repository
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Install Node v16
1717
uses: actions/setup-node@v3
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
3434

3535
- name: Install Node v16
3636
uses: actions/setup-node@v3
@@ -45,4 +45,4 @@ jobs:
4545
run: npm run build
4646

4747
- name: Run Link Checks
48-
run: npm run test:links
48+
run: npm run test:links

.prettierrc.json

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
{
2-
"quoteProps": "consistent",
3-
"endOfLine": "lf",
4-
"printWidth": 120,
5-
"useTabs": true,
6-
"overrides": [
7-
{
8-
"files": "*.md",
9-
"options": {
10-
"useTabs": false,
11-
"tabWidth": 4
12-
}
13-
}
14-
]
2+
"printWidth": 120
153
}

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@
1212
1. Modifications to the overall structure and format of the API docs.
1313
1. Additions that replicate or needlessly restructure current documentation.
1414
1. Additions that document unreleased product functionality.
15+
1. Changes that modify [Community Resources](https://discord.com/developers/docs/topics/community-resources#community-resources) (see [guidelines](https://github.com/discord/discord-api-docs/discussions/4456) for more detail).
1516

1617
See the [README](https://github.com/discord/discord-api-docs/blob/main/README.md) for licensing and legal information.

0 commit comments

Comments
 (0)