Skip to content

Commit 7666944

Browse files
MathMan05MathMan05
authored
Merge branch 'spacebarchat:master' into master
2 parents 897b317 + dd52fbf commit 7666944

File tree

83 files changed

+59940
-4020
lines changed

Some content is hidden

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

83 files changed

+59940
-4020
lines changed

‎.eslintignore

-7
This file was deleted.

‎.eslintrc

-14
This file was deleted.

‎.github/workflows/build.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ on:
88

99
jobs:
1010
build:
11-
1211
runs-on: ubuntu-latest
1312

1413
strategy:
1514
matrix:
16-
node-version: [18.x]
15+
node-version: [20.x]
1716
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1817

1918
steps:

‎.github/workflows/dependabot-nix-update.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Dependabot-nix-update
2+
3+
on:
4+
push:
5+
branches:
6+
- "dependabot/npm_and_yarn/*"
7+
8+
jobs:
9+
update_npm_deps_hash:
10+
name: Update NPM dependencies hash
11+
runs-on: ubuntu-latest
12+
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
13+
permissions:
14+
contents: write
15+
steps:
16+
- name: Check Out Code
17+
uses: actions/checkout@v3
18+
19+
- name: Install Nix
20+
uses: DeterminateSystems/nix-installer-action@main
21+
22+
- name: Configure Cache
23+
uses: DeterminateSystems/magic-nix-cache-action@main
24+
25+
- name: Update Hash
26+
run: nix run .#update-nix
27+
28+
- name: Set up Git Config
29+
run: |
30+
# Configure author metadata to look like commits are made by Dependabot
31+
git config user.name "${GITHUB_ACTOR}"
32+
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
33+
34+
- name: Commit changes
35+
run: |
36+
git add .
37+
# Skip committing or pushing if there are no changes
38+
if [[ $(git status -s) ]]; then
39+
git commit -m "build(deps): update npm dependencies hash [dependabot skip]" --no-verify
40+
git push
41+
echo "Pushed an update to npm dependencies hash"
42+
else
43+
echo "Npm dependencies hash was not changed"
44+
fi

‎.github/workflows/style.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
node-version: [18.x]
16+
node-version: [20.x]
1717
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1818

1919
steps:

‎.husky/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ -x "$(/usr/bin/env which nix-shell 2>/dev/null)" ]; then
1818
elif [ ! -n "$(git status --porcelain=v1 2>/dev/null | grep -E '^M package-lock.json')" ]; then
1919
echo "package-lock.json has no changes. Skipping update of nix dependencies."
2020
else
21-
./nix-update.sh || exit $?
21+
nix run .#nix-update || exit $?
2222
fi
2323
fi
2424
else

‎.prettierrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"bracketSpacing": true,
88
"quoteProps": "as-needed",
99
"useTabs": true,
10-
"singleQuote": false
10+
"singleQuote": false,
11+
"endOfLine": "auto"
1112
}

‎assets/openapi.json

+47
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@
102102
"type": "string"
103103
},
104104
"code": {
105+
"minLength": 6,
106+
"maxLength": 6,
105107
"type": "string"
106108
}
107109
},
@@ -134,6 +136,9 @@
134136
"icon": {
135137
"type": "string"
136138
},
139+
"cover_image": {
140+
"type": "string"
141+
},
137142
"interactions_endpoint_url": {
138143
"type": "string"
139144
},
@@ -167,13 +172,21 @@
167172
},
168173
"flags": {
169174
"type": "integer"
175+
},
176+
"custom_install_url": {
177+
"type": "string"
178+
},
179+
"guild_id": {
180+
"type": "string"
170181
}
171182
}
172183
},
173184
"BackupCodesChallengeSchema": {
174185
"type": "object",
175186
"properties": {
176187
"password": {
188+
"minLength": 1,
189+
"maxLength": 72,
177190
"type": "string"
178191
}
179192
},
@@ -3095,6 +3108,15 @@
30953108
"privacy_policy_url": {
30963109
"type": "string"
30973110
},
3111+
"guild_id": {
3112+
"type": "string"
3113+
},
3114+
"guild": {
3115+
"$ref": "#/components/schemas/Guild"
3116+
},
3117+
"custom_install_url": {
3118+
"type": "string"
3119+
},
30983120
"team": {
30993121
"$ref": "#/components/schemas/Team"
31003122
},
@@ -5606,6 +5628,8 @@
56065628
"type": "string"
56075629
},
56085630
"password": {
5631+
"minLength": 1,
5632+
"maxLength": 72,
56095633
"type": "string"
56105634
},
56115635
"undelete": {
@@ -5986,6 +6010,8 @@
59866010
"type": "object",
59876011
"properties": {
59886012
"password": {
6013+
"minLength": 1,
6014+
"maxLength": 72,
59896015
"type": "string"
59906016
},
59916017
"regenerate": {
@@ -6022,6 +6048,8 @@
60226048
"type": "object",
60236049
"properties": {
60246050
"password": {
6051+
"minLength": 1,
6052+
"maxLength": 72,
60256053
"type": "string"
60266054
},
60276055
"token": {
@@ -6359,6 +6387,8 @@
63596387
"type": "object",
63606388
"properties": {
63616389
"code": {
6390+
"minLength": 6,
6391+
"maxLength": 6,
63626392
"type": "string"
63636393
}
63646394
},
@@ -6370,9 +6400,13 @@
63706400
"type": "object",
63716401
"properties": {
63726402
"password": {
6403+
"minLength": 1,
6404+
"maxLength": 72,
63736405
"type": "string"
63746406
},
63756407
"code": {
6408+
"minLength": 6,
6409+
"maxLength": 6,
63766410
"type": "string"
63776411
},
63786412
"secret": {
@@ -6497,15 +6531,22 @@
64976531
"nullable": true
64986532
},
64996533
"password": {
6534+
"minLength": 1,
6535+
"maxLength": 72,
65006536
"type": "string"
65016537
},
65026538
"new_password": {
6539+
"minLength": 1,
6540+
"maxLength": 72,
65036541
"type": "string"
65046542
},
65056543
"code": {
6544+
"minLength": 6,
6545+
"maxLength": 6,
65066546
"type": "string"
65076547
},
65086548
"email": {
6549+
"format": "email",
65096550
"type": "string"
65106551
},
65116552
"discriminator": {
@@ -10945,6 +10986,12 @@
1094510986
},
1094610987
"tags": [
1094710988
"scheduled-maintenances"
10989+
],
10990+
"x-badges": [
10991+
{
10992+
"label": "Spacebar-only",
10993+
"color": "red"
10994+
}
1094810995
]
1094910996
}
1095010997
},

0 commit comments

Comments
 (0)