Skip to content

Commit b6c51c7

Browse files
author
xyzjesper
committed
Fix Vanity Discovery and update database update for the Embed!
1 parent be646b1 commit b6c51c7

26 files changed

+2047
-2027
lines changed

‎prisma/schema.prisma‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -597,64 +597,64 @@ model GuildBackups {
597597
}
598598

599599
model Vanitys {
600-
id String @id @default(auto()) @map("_id") @db.ObjectId
601-
UUID String @unique
600+
id String @id @default(auto()) @map("_id") @db.ObjectId
601+
UUID String @unique
602602
Slug String
603603
Host String
604604
GuildId String
605605
Invite String
606-
InDiscovery Boolean? @default(false)
607-
IsBannedFromDiscover Boolean? @default(false)
608-
Analytics VanityAnalytics?
606+
InDiscovery Boolean? @default(false)
607+
IsBannedFromDiscover Boolean? @default(false)
608+
Analytics VanityAnalytic?
609609
CreatedAt DateTime
610-
Embed VanityEmbeds?
610+
Embed VanityEmbed?
611611
UserId String
612-
Users Users @relation(fields: [UserId], references: [UserId])
612+
Users Users @relation(fields: [UserId], references: [UserId])
613613
}
614614

615-
model VanityEmbeds {
616-
id String @id @default(auto()) @map("_id") @db.ObjectId
615+
model VanityEmbed {
616+
id String @id @default(auto()) @map("_id") @db.ObjectId
617617
Title String
618618
Description String
619619
Color String
620-
Author VanityEmbedAuthors?
621-
ImageUrl String
622-
ThumbnailUrl String
623-
VanityId String @unique
624-
Vanitys Vanitys @relation(fields: [VanityId], references: [UUID])
620+
Author VanityEmbedAuthor?
621+
ImageUrl String?
622+
ThumbnailUrl String?
623+
VanityId String @unique
624+
Vanitys Vanitys @relation(fields: [VanityId], references: [UUID])
625625
}
626626

627-
model VanityEmbedAuthors {
628-
id String @id @default(auto()) @map("_id") @db.ObjectId
629-
Name String
630-
URL String
631-
IconURL String
632-
VanityEmbedsId String @unique
633-
VanityEmbeds VanityEmbeds @relation(fields: [VanityEmbedsId], references: [VanityId])
627+
model VanityEmbedAuthor {
628+
id String @id @default(auto()) @map("_id") @db.ObjectId
629+
Name String?
630+
URL String?
631+
IconURL String?
632+
VanityEmbedsId String @unique
633+
VanityEmbeds VanityEmbed @relation(fields: [VanityEmbedsId], references: [VanityId])
634634
}
635635

636-
model VanityAnalytics {
637-
id String @id @default(auto()) @map("_id") @db.ObjectId
636+
model VanityAnalytic {
637+
id String @id @default(auto()) @map("_id") @db.ObjectId
638638
Click Int
639639
TrackInviteWithLog String?
640640
TrackMessageId String?
641-
Latest30Days AnalyticsLatest30Days?
641+
Latest30Days VanityAnalyticsLatest30Day?
642642
Update DateTime?
643643
UniqueClick Int?
644644
JoinedWithCode Int?
645645
LoggedIPs String[]
646-
VanityId String @unique
647-
Vanitys Vanitys @relation(fields: [VanityId], references: [UUID])
646+
VanityId String @unique
647+
Vanitys Vanitys @relation(fields: [VanityId], references: [UUID])
648648
}
649649

650-
model AnalyticsLatest30Days {
651-
id String @id @default(auto()) @map("_id") @db.ObjectId
650+
model VanityAnalyticsLatest30Day {
651+
id String @id @default(auto()) @map("_id") @db.ObjectId
652652
Click Int?
653653
UniqueClick Int?
654654
Date DateTime?
655655
JoinedWithCode Int?
656-
VanityAnalyticsId String @unique
657-
VanityAnalytics VanityAnalytics @relation(fields: [VanityAnalyticsId], references: [VanityId])
656+
VanityAnalyticsId String @unique
657+
VanityAnalytics VanityAnalytic @relation(fields: [VanityAnalyticsId], references: [VanityId])
658658
}
659659

660660
// DisBot

‎src/api/services/vanity.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export async function vanityAPI(client: ExtendedClient) {
3838

3939
const isUniqueClick = !data.Analytics?.LoggedIPs?.includes(userIP as string);
4040
if (isUniqueClick) {
41-
await database.vanityAnalytics.update({
41+
await database.vanityAnalytic.update({
4242
where: {
4343
VanityId: data.UUID
4444
},
@@ -49,7 +49,7 @@ export async function vanityAPI(client: ExtendedClient) {
4949
}
5050
}
5151
});
52-
await database.analyticsLatest30Days.update({
52+
await database.vanityAnalyticsLatest30Day.update({
5353
where: {
5454
VanityAnalyticsId: data.UUID
5555
},
@@ -59,7 +59,7 @@ export async function vanityAPI(client: ExtendedClient) {
5959
});
6060
}
6161

62-
await database.vanityAnalytics.update({
62+
await database.vanityAnalytic.update({
6363
where: {
6464
VanityId: data.UUID
6565
},
@@ -68,7 +68,7 @@ export async function vanityAPI(client: ExtendedClient) {
6868
Update: new Date()
6969
}
7070
});
71-
await database.analyticsLatest30Days.update({
71+
await database.vanityAnalyticsLatest30Day.update({
7272
where: {
7373
VanityAnalyticsId: data.UUID
7474
},

‎src/helper/databaseHelper.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@ export async function initGuildsToDatabase(client: ExtendedClient) {
114114
GuildId: guild.id
115115
}
116116
})
117-
118-
console.log(guildsData)
119-
120117
const guildOwner = await client.guilds.fetch(guild.id)
121118
if (!guildsData) {
122119
await database.guilds.create({

‎src/modules/commands/buttons/commands-manager-toggle.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,16 @@ export default {
7171
}
7272
)
7373

74-
await interaction.reply({
74+
return await interaction.reply({
7575
flags: MessageFlags.Ephemeral,
7676
content: `## ${await convertToEmojiPng("check", client.user.id)} Added command to the guild.`
7777
})
7878

79-
} else {
79+
} else if (
80+
command.name == data.CustomName &&
81+
command.guildId == interaction.guild?.id
82+
) {
83+
8084
await interaction.guild.commands.delete(command.id)
8185
await database.buildInCommands.update({
8286
where: {
@@ -86,14 +90,14 @@ export default {
8690
IsEnabled: false
8791
}
8892
})
89-
await interaction.reply({
93+
return await interaction.reply({
9094
flags: MessageFlags.Ephemeral,
9195
content: `## ${await convertToEmojiPng("check", client.user.id)} Removed command successfully!`
9296
})
9397
}
9498
}
9599
} catch (error) {
96-
await interaction.reply({
100+
return await interaction.reply({
97101
flags: MessageFlags.Ephemeral,
98102
content: `## ${await convertToEmojiPng("error", client.user.id)} Can't remove this command from the Guild!`
99103
})

‎src/modules/commands/commands/commands.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export default {
7272
``,
7373
`**Create Commands** - Create a new Commands.`,
7474
`**Manage Commands** - Manage your Commands.`,
75-
`**Use Command Manager** - Edit Build-in Command from the Bot.`,
75+
`**Use Command Manager** - Edit Build-in Command from the Bot. (Not work for all commands!)`,
7676
``,
7777
].join("\n")
7878
)).addActionRowComponents(row)

‎src/modules/vanity/buttons/vanity-manage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default {
5252
`**Host**: \`${embed.Host}\``,
5353
`**Guild**: ${await client.guilds.fetch(embed?.GuildId as string).then(g => g.name)} (\`${embed?.GuildId}\`)`,
5454
`**Invite**: [Invite](${embed.Invite})`,
55-
`**vanity-Link**: [vanity Link](https://dchat.click/${embed.Slug})`,
55+
`**Vanity-Link**: [Vanity Link](https://dchat.link/${embed.Slug})`,
5656
`**UUID**: \`\`\`${embed.UUID}\`\`\``
5757
].join("\n")
5858
);

‎src/modules/vanity/buttons/vanity-toggle-invite-logging.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default {
3939
}
4040

4141
if (data.Analytics?.TrackInviteWithLog) {
42-
await database.vanityAnalytics.update(
42+
await database.vanityAnalytic.update(
4343
{
4444
where: {VanityId: data.UUID},
4545
data: {

‎src/modules/vanity/buttons/vanity-update-embed.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ export default {
6666
return;
6767
}
6868

69-
interaction.editReply({
70-
components: [row]
69+
await interaction.editReply({
70+
components: [row, row2]
7171
})
7272
}
7373
};

‎src/modules/vanity/events/vanityMemberJoin.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636
if (!vanityInvite.Analytics?.TrackMessageId) return;
3737
if (!vanityInvite.Analytics?.TrackInviteWithLog) return;
3838

39-
await database.vanityAnalytics.update({
39+
await database.vanityAnalytic.update({
4040
where: {
4141
VanityId: vanityInvite.UUID,
4242
},
@@ -45,7 +45,7 @@ export default {
4545
}
4646
}
4747
)
48-
await database.analyticsLatest30Days.update({
48+
await database.vanityAnalyticsLatest30Day.update({
4949
where: {
5050
VanityAnalyticsId: vanityInvite.UUID,
5151
},

‎src/modules/vanity/modals/vanity-create-modal.ts‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,26 @@ export default {
4444
await database.vanitys.create({
4545
data: {
4646
Slug: query,
47-
Host: "dchat.click",
47+
Host: "dchat.link",
4848
UserId: interaction.user.id,
49-
UUID: randomUUID(),
49+
UUID: uuid,
5050
Invite: invite.url,
5151
GuildId: interaction.guildId,
5252
CreatedAt: new Date(),
53+
InDiscovery: false,
54+
IsBannedFromDiscover: false,
55+
Embed: {
56+
connectOrCreate: {
57+
where: {
58+
VanityId: uuid
59+
},
60+
create: {
61+
Title: interaction.guild.name,
62+
Description: interaction.guild.description,
63+
Color: "#282b30",
64+
}
65+
}
66+
},
5367
Analytics: {
5468
connectOrCreate: {
5569
create: {
@@ -83,7 +97,7 @@ export default {
8397
});
8498

8599
return interaction.editReply({
86-
content: `## ${await convertToEmojiPng("link", client.user.id)}Your Vanity URL has been created. - [dchat.click/${query}](https://dchat.click/${query})`
100+
content: `## ${await convertToEmojiPng("link", client.user.id)}Your Vanity URL has been created. - [dchat.link/${query}](https://dchat.link/${query})`
87101
});
88102
});
89103
}

0 commit comments

Comments
 (0)