Skip to content

Commit

Permalink
Merge branch 'main' into memberProfileBlocking
Browse files Browse the repository at this point in the history
  • Loading branch information
jaw0r3k committed Oct 8, 2023
2 parents ad1e7c4 + 05acd50 commit 6e0df74
Show file tree
Hide file tree
Showing 93 changed files with 7,974 additions and 2,856 deletions.
19 changes: 11 additions & 8 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{
"extends": "marine/prettier/node",
"ignorePatterns": ["dist/*", "**/*.js"],
"parserOptions": {
"project": "./tsconfig.eslint.json"
},
"rules": {
"no-eq-null": "off"
}
"root": true,
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "prettier"],
"rules": {
"prettier/prettier": "error"
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
]
}
49 changes: 49 additions & 0 deletions .github/ISSUE_TEMPLATE/app-subscriptions-bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: App Subscriptions Bug Report
description: A bug has been found in Discord's App Subscriptions.
labels: ["bug", "premium-apps"]
body:
- type: markdown
attributes:
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"
- type: textarea
id: description
attributes:
label: Description
description: Provide a clear and concise description of what the problem is.
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to Reproduce
description: Provide clear and concise steps for us to reliably reproduce this issue.
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected Behavior
description: What is the behavior you expect to occur that is not?
validations:
required: true
- type: textarea
id: current
attributes:
label: Current Behavior
description: What is the behavior you are currently seeing instead?
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: Screenshots/Videos
description: Provide a screenshot and/or video demonstrating the issue being experienced.
validations:
required: false
- type: textarea
id: information
attributes:
label: Client and System Information
description: What is the browser/library/client you are using? What operating system and version?
validations:
required: true
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/developer-site-bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Developer Site Bug Report
description: A bug has been found with Discord's Developer site or documentation.
labels: ["bug"]
labels: ["bug", "developer portal"]
body:
- type: markdown
attributes:
value: "Before opening a new issue, please search existing issues: https://github.com/discord/discord-api-docs/issues"
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"
- type: textarea
id: description
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/message-components-bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Message Components Bug Report
description: A bug has been found in Discord's Message Components.
labels: ["message components"]
labels: ["bug", "message components"]
body:
- type: markdown
attributes:
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+"
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"
- type: textarea
id: description
attributes:
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/slash-command-bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Slash Commands Bug Report
description: A bug has been found in Discord's Slash Commands and Interactions.
labels: ["slash commands"]
labels: ["bug", "slash commands"]
body:
- type: markdown
attributes:
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+"
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"
- type: textarea
id: description
attributes:
Expand Down
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,11 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
ignore:
- dependency-name: "*"
update-types:
["version-update:semver-patch", "version-update:semver-minor"]
29 changes: 29 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Verify Docs Formatting

on: [push, pull_request]

permissions:
contents: read

jobs:
markdown_tables:
name: Check Markdown Tables
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Node v16
uses: actions/setup-node@v3
with:
node-version: 16
cache: npm

- name: Install dependencies
run: npm ci

- name: Check Markdown Tables
run: |
shopt -s globstar
npx markdown-table-formatter docs/**/*.{md,mdx} --check
shell: bash
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Node v16
uses: actions/setup-node@v3
Expand All @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Node v16
uses: actions/setup-node@v3
Expand All @@ -45,4 +45,4 @@ jobs:
run: npm run build

- name: Run Link Checks
run: npm run test:links
run: npm run test:links
14 changes: 1 addition & 13 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
{
"quoteProps": "consistent",
"endOfLine": "lf",
"printWidth": 120,
"useTabs": true,
"overrides": [
{
"files": "*.md",
"options": {
"useTabs": false,
"tabWidth": 4
}
}
]
"printWidth": 120
}
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@
1. Modifications to the overall structure and format of the API docs.
1. Additions that replicate or needlessly restructure current documentation.
1. Additions that document unreleased product functionality.
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).

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

0 comments on commit 6e0df74

Please sign in to comment.