Skip to content

Commit be646b1

Browse files
author
xyzjesper
committed
Update Config and fix Tempvoice bug
1 parent 03deff9 commit be646b1

File tree

11 files changed

+84
-103
lines changed

11 files changed

+84
-103
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"main": "./.build/startup.js",
44
"version": "1.6.2",
55
"scripts": {
6-
"disbot": "cd /bot && node ./.build/src/main/startup.js",
6+
"disbot": "node ./.build/src/main/startup.js",
77
"customer": "cd /home/disbot && node ./.build/src/main/startup.js",
88
"customerdev": "bun run build && node ./.build/src/main/startup.js",
99
"disbotdev": "bun run build && node ./.build/src/main/startup.js",

prisma/schema.prisma

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ model Giveaways {
215215
model TempVoices {
216216
id String @id @default(auto()) @map("_id") @db.ObjectId
217217
UUID String @unique
218-
Name String
218+
Name String?
219219
JointoCreateChannel String
220220
JointoCreateCategory String
221221
Manage Boolean
222-
PresetLimit Int
222+
PresetLimit Int?
223223
TempVoiceChannels TempVoiceChannels[]
224224
GuildId String
225225
Guilds Guilds @relation(fields: [GuildId], references: [GuildId])

src/helper/databaseHelper.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,18 @@ export async function initGuildsToDatabase(client: ExtendedClient) {
115115
}
116116
})
117117

118+
console.log(guildsData)
119+
118120
const guildOwner = await client.guilds.fetch(guild.id)
119-
if (!guildsData) await database.guilds.create({
120-
data: {
121-
GuildId: guild.id,
122-
GuildName: guild.name,
123-
GuildOwner: guildOwner.id
124-
}
125-
})
121+
if (!guildsData) {
122+
await database.guilds.create({
123+
data: {
124+
GuildId: guild.id,
125+
GuildName: guild.name,
126+
GuildOwner: guildOwner.id
127+
}
128+
})
129+
}
126130
if (!guildCommandManagerData) {
127131
await database.guildCommandManger.create({
128132
data: {

src/main/config.ts

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,6 @@ export async function configStartup() {
3535
VerifyRedirectUrl: "",
3636
VerifyAuthUrl: "",
3737
},
38-
Bot: {
39-
NewsChannel1: "",
40-
NewsChannel2: "",
41-
NewsChannel3: "",
42-
NewsChannel4: "",
43-
},
44-
Customer: {
45-
PelicanApi: "",
46-
PelicanClientApiToken: "",
47-
PelicanClientApi: "",
48-
PelicanApplicationApi: "",
49-
},
5038
Notifications: {
5139
SpotifyClientId: "",
5240
SpotifyClientSecret: "",
@@ -64,11 +52,6 @@ export async function configStartup() {
6452
VotePort: 0,
6553
},
6654
AppPort: 0,
67-
EventsApi: {
68-
ApiKey: "",
69-
ApiPort: 0,
70-
WsPort: 0,
71-
},
7255
API: {
7356
ApiPort: 0,
7457
ApiKey: "",
@@ -85,7 +68,7 @@ export async function configStartup() {
8568

8669
const doc = new YAML.Document(configData);
8770

88-
doc.commentBefore = ` DisBot Config v${botData.configVersion} of version ${botData.version}\n Read more: https://doc.xyzhub.link/s/disbot/doc/config-yXEob11woF`;
71+
doc.commentBefore = ` DisBot Config v${botData.configVersion} of version ${botData.version}.`;
8972

9073
generateConfigCommentBeforeIn(doc, ["Bot", "DiscordBotToken"], " Discord Bot Token from https://discord.com/developers/applications/<bot-id>/bot")
9174
generateConfigCommentBeforeIn(doc, ["Bot", "DiscordApplicationId"], " Discord Bot Token from https://discord.com/developers/applications/<bot-id>/information")

src/modules/tempvoice/commands/subCommand/tempvoice.setup.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,24 @@ export default {
7979

8080
await database.tempVoices.create({
8181
data: {
82-
GuildId: interaction.guild.id,
8382
JointoCreateChannel: channel?.id,
8483
JointoCreateCategory: category?.id,
8584
Manage: false,
86-
PresetLimit: getLimit,
87-
Name: getName,
85+
PresetLimit: getLimit ?? null,
86+
Name: getName ?? null,
8887
UUID: randomUUID(),
88+
Guilds: {
89+
connectOrCreate: {
90+
where: {
91+
GuildId: interaction.guild.id
92+
},
93+
create: {
94+
GuildId: interaction.guild.id,
95+
GuildName: interaction.guild.name,
96+
GuildOwner: interaction.guild.ownerId
97+
}
98+
}
99+
}
89100
}
90101
});
91102

src/prisma/edge.js

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

0 commit comments

Comments
 (0)