Skip to content

Commit 2410263

Browse files
KathundKathund
committed
Merge branch 'main' into fix-guild-level-up-message
2 parents 7d8f3f1 + 99eba9a commit 2410263

34 files changed

+889
-782
lines changed

‎.eslintrc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
"globals": {
1313
"bot": true,
1414
"client": true,
15-
"guild": true,
16-
"imgurUrl": true
15+
"guild": true
1716
},
1817
"rules": {
1918
"curly": ["warn", "multi-line", "consistent"],

‎.github/workflows/ci-cd-20.18.3.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This CI Workflow was deployed and configured by WarpWing and Nate.
2+
name: CI/CD (20.18.3)
3+
4+
on:
5+
push:
6+
pull_request:
7+
workflow_dispatch:
8+
9+
env:
10+
NODE_VERSION: "20.18.3"
11+
12+
jobs:
13+
es-lint:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Git checkout
17+
uses: actions/checkout@v4
18+
19+
- name: Use Node.js ${{ env.NODE_VERSION }}
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: ${{ env.NODE_VERSION }}
23+
24+
- name: Install node dependencies
25+
run: npm i
26+
27+
- name: es-lint
28+
run: npm run lint
29+
30+
prettier:
31+
runs-on: ubuntu-latest
32+
steps:
33+
- name: Git checkout
34+
uses: actions/checkout@v4
35+
36+
- name: Use Node.js ${{ env.NODE_VERSION }}
37+
uses: actions/setup-node@v4
38+
with:
39+
node-version: ${{ env.NODE_VERSION }}
40+
41+
- name: Install node dependencies
42+
run: npm i
43+
44+
- name: Prettier
45+
run: npm run prettier

.github/workflows/ci-cd.yml renamed to .github/workflows/ci-cd-latest.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# This CI Workflow was deployed and configured by WarpWing and Nate.
2-
name: CI/CD
2+
name: CI/CD (latest)
33

44
on:
55
push:
66
pull_request:
77
workflow_dispatch:
88

99
env:
10-
NODE_VERSION: "16.x"
10+
NODE_VERSION: "latest"
1111

1212
jobs:
1313
es-lint:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Git checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

1919
- name: Use Node.js ${{ env.NODE_VERSION }}
20-
uses: actions/setup-node@v2
20+
uses: actions/setup-node@v4
2121
with:
2222
node-version: ${{ env.NODE_VERSION }}
2323

@@ -31,10 +31,10 @@ jobs:
3131
runs-on: ubuntu-latest
3232
steps:
3333
- name: Git checkout
34-
uses: actions/checkout@v2
34+
uses: actions/checkout@v4
3535

3636
- name: Use Node.js ${{ env.NODE_VERSION }}
37-
uses: actions/setup-node@v2
37+
uses: actions/setup-node@v4
3838
with:
3939
node-version: ${{ env.NODE_VERSION }}
4040

‎README.md‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ that went into it. Thank you!
2323
## NodeJS
2424

2525
- Git
26-
- NodeJS >= 16.9
26+
- NodeJS >= 20.18.3
2727
- A Minecraft account
2828

2929
### Setup Guide for NodeJS
@@ -143,13 +143,6 @@ The `blacklist` option determines whether the blacklist feature is enabled. By d
143143

144144
The `blacklisted` option is an array of user usernames or UUIDs, blacklisted played won't be able to use fragBot. By default, this is set to an empty array.
145145

146-
### Guild
147-
148-
The guild section contains options related to the Hypixel guild.
149-
150-
The `guildExp` option is a number value required for the `!gexp` command, which is used to check how much more guild experience a user needs to collect to meet the
151-
guild's requirements. By default, this is set to 50,000.
152-
153146
### API
154147

155148
The API options include information about APIs which are being used, the only values which needs to be changed are `hypixelAPIkey` and `imgurAPIkey`.

‎config.example.json‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
"blacklist": false,
1717
"blacklisted": []
1818
},
19-
"guild": {
20-
"guildExp": 50000
21-
},
2219
"API": {
2320
"hypixelAPIkey": "HYPIXEL_API_KEY",
2421
"imgurAPIkey": "IMGUR_API_KEY"
@@ -102,26 +99,22 @@
10299
},
103100
"verification": {
104101
"enabled": false,
105-
"verifiedRole": "VERIFIED_ROLE_ID",
106-
"unverifiedRole": "UNVERIFIED_ROLE_ID",
107-
"removeVerificationRole": true,
108-
"guildMemberRole": "GUILD_MEMBER_ROLE_ID",
109-
"autoUpdater": false,
110-
"autoUpdaterInterval": 24,
111-
"name": "{username}",
112-
"levelRoles": [
113-
{
114-
"type": "bedwarsStar",
115-
"requirement": 200,
116-
"roleId": "DISCORD_ROLE_ID"
117-
}
118-
],
119-
"ranks": [
120-
{
121-
"name": "IN_GAME_RANK_NAME",
122-
"roles": ["DISCORD_ROLE_ID"]
123-
}
124-
]
102+
"nickname": "{username}",
103+
"roles": {
104+
"verified": {
105+
"enabled": false,
106+
"roleId": ""
107+
},
108+
"guildMember": {
109+
"enabled": false,
110+
"roleId": ""
111+
},
112+
"custom": []
113+
},
114+
"autoRoleUpdater": {
115+
"enabled": false,
116+
"interval": 24
117+
}
125118
},
126119
"other": {
127120
"autoUpdater": true,

‎jsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"include": ["API/**/*", "types/**/*.d.ts", "src/minecraft/commands/*"],
1212
"globals": {
1313
"bot": "readonly",
14-
"client": "readonly"
14+
"client": "readonly",
15+
"guild": "readonly"
1516
}
1617
}

‎messages.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"offlineInvite": "{username} was offline invited to the guild!",
1515
"guildMuteMessage": "Guild Chat has been muted for {time}!",
1616
"guildUnmuteMessage": "Guild Chat has been unmuted!",
17-
"guildJoinMessage": "Welcome to the guild! Make sure to join our discord using /g discord! To view my commands run {prefix}help",
17+
"guildJoinMessage": "Welcome to the guild! Make sure to join our discord using /g discord!",
1818
"userMuteMessage": "{username} has been muted for {time}!",
1919
"userUnmuteMessage": "{username} has been unmuted!",
2020
"setrankFailMessage": "{username} not found.",

‎package-lock.json‎

Lines changed: 95 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)