Skip to content

Commit 1d0b0d3

Browse files
author
xyzjesper
committed
Fixed ticketHelper.ts bugs, Welcome & Leave Bugs. And messageHelper.ts (MessageBuilder problem)
1 parent fd595ff commit 1d0b0d3

File tree

5 files changed

+70
-60
lines changed

5 files changed

+70
-60
lines changed

‎src/helper/messageHelper.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export async function MessageBuilder(data: {
136136
}
137137
} else {
138138
messageData = {
139-
content: replacePlaceholders(data.Content, placeholderType) ?? " ",
139+
content: replacePlaceholders(data.Content ?? "", placeholderType) ?? " ",
140140
embeds: []
141141
}
142142

‎src/helper/ticketHelper.ts‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,15 @@ export async function ticketHelper(
265265

266266
// TicketLimit
267267
if (data.TicketLimit) {
268-
const ticketsPerUser = await database.tickets.findMany({
268+
const openTicketsPerUser = await database.tickets.findMany({
269269
where: {
270+
TicketId: ticketSetupId,
270271
IsClosed: false,
271272
TicketOwnerId: user.id
272273
}
273274
})
274275

275-
if (ticketsPerUser.length >= data.TicketLimit) {
276+
if (openTicketsPerUser.length >= data.TicketLimit) {
276277
if (ticketType == "event") {
277278
(messageEvent.channel as TextChannel).send({
278279
content: `-# ${await convertToEmojiToPng("ticket")} You have reached the ticket limit! You can only open ${data.TicketLimit} more tickets.`
@@ -302,6 +303,9 @@ export async function ticketHelper(
302303
if (!messageData) {
303304
const ticketTemplateMessage = await fetch("https://cdn.xyzhub.link/raw/VqvWD9.json?download=true")
304305
const ticketTemplateMessageData = await ticketTemplateMessage.json()
306+
307+
console.log(ticketTemplateMessageData)
308+
305309
messageData = {
306310
Id: Number(Math.random() * 134324),
307311
GuildId: guild.id,
@@ -401,11 +405,9 @@ export async function ticketHelper(
401405
if (IsThread) {
402406
for (const perms of data.TicketPermissions) {
403407
if (perms.DiscordRoleId) {
404-
await channel.guild.members.fetch();
405-
const role = await channel.guild.roles.fetch(perms.DiscordRoleId);
406-
for (const memberId of role.members.values()) {
407-
await (channel as ThreadChannel).members.add(memberId)
408-
}
408+
// "MEMBER PING" - I will not fetch the Role and add the member because of Discord Rate Limits and so on...
409+
const discordRolePingMessage = await channel.send(`<@&${perms.DiscordRoleId}>`)
410+
await discordRolePingMessage.delete()
409411
} else if (perms.DiscordUserId) {
410412
await (channel as ThreadChannel).members.add(perms.DiscordUserId)
411413
}
@@ -416,11 +418,11 @@ export async function ticketHelper(
416418
for (const perms of data.TicketPermissions) {
417419
if (perms.HasShadowPing) {
418420
// Thread
419-
// Threads cannot have shadow pings because I add the member from the role in lines 328-335, and this pings the member!
421+
// Threads cannot have shadow pings because I add the member from the role, and this pings the member!
420422

421423
// Channel
422424
if (IsChannel && perms.DiscordRoleId) {
423-
channel.send({
425+
await channel.send({
424426
content: `<@&${perms.DiscordRoleId}>`
425427
}).then(async (m) => {
426428
await m.delete()
@@ -549,7 +551,7 @@ export async function ticketHelper(
549551
return;
550552
}
551553
} catch (e) {
552-
Logger.error(e)
554+
Logger.error(`Ticket Error: ${e}`)
553555
if (ticketType == "event") {
554556
(messageEvent.channel as TextChannel).send({
555557
allowedMentions: {

‎src/modules/leave/events/guildMemberLeave.ts‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -69,34 +69,38 @@ export default {
6969
},
7070
};
7171

72-
const imageBuffer = await drawCardCanvas({
73-
theme: (data.ImageData?.Theme as "dark" | "circuit" | "code") ?? "dark",
74-
text: {
75-
title: replacePlaceholders(data.ImageData?.Title, replacements) ?? "Welcome!",
76-
subtitle:
77-
replacePlaceholders(data.ImageData?.Subtitle, replacements) ??
78-
`Member Count: ${guild.memberCount}`,
79-
text: replacePlaceholders(data.ImageData?.Text, replacements) ?? member.user.tag,
80-
color: data.ImageData?.Color ?? "#88f"
81-
},
82-
avatar: {
83-
image: member.displayAvatarURL({extension: "png"}),
84-
outlineWidth: 5,
85-
outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
86-
},
87-
card: {
88-
background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
89-
blur: 1,
90-
border: true,
91-
rounded: true
92-
}
93-
});
94-
const cdnUrl = await uploadToCDN(imageBuffer)
72+
let cdnUrl;
9573

74+
if (data.ImageData) {
75+
76+
const imageBuffer = await drawCardCanvas({
77+
theme: (data.ImageData?.Theme as "dark" | "circuit" | "code") ?? "dark",
78+
text: {
79+
title: replacePlaceholders(data.ImageData?.Title, replacements) ?? "Welcome!",
80+
subtitle:
81+
replacePlaceholders(data.ImageData?.Subtitle, replacements) ??
82+
`Member Count: ${guild.memberCount}`,
83+
text: replacePlaceholders(data.ImageData?.Text, replacements) ?? member.user.tag,
84+
color: data.ImageData?.Color ?? "#88f"
85+
},
86+
avatar: {
87+
image: member.displayAvatarURL({extension: "png"}),
88+
outlineWidth: 5,
89+
outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
90+
},
91+
card: {
92+
background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
93+
blur: 1,
94+
border: true,
95+
rounded: true
96+
}
97+
});
98+
cdnUrl = await uploadToCDN(imageBuffer)
99+
}
96100
const withImagePlaceholder = {
97101
...replacements,
98102
leave: {
99-
image: cdnUrl,
103+
image: cdnUrl ?? "https://cdn.xyzhub.link/u/ixBzIX.png",
100104
},
101105
}
102106

‎src/modules/ticket/buttons/ticket-list-guild-tickets.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export default {
4444
})
4545

4646
if (data.length <= 0) return interaction.reply({
47-
content: "No ticket-setups found.",
47+
content: "No tickets found.",
4848
flags: MessageFlags.Ephemeral
4949
});
5050

‎src/modules/welcome/events/guildMemberAdd.ts‎

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,34 +71,38 @@ export default {
7171
},
7272
};
7373

74-
const imageBuffer = await drawCardCanvas({
75-
theme: (data.ImageData?.Theme as "dark" | "circuit" | "code") ?? "dark",
76-
text: {
77-
title: replacePlaceholders(data.ImageData?.Title, replacements) ?? "Welcome!",
78-
subtitle:
79-
replacePlaceholders(data.ImageData?.Subtitle, replacements) ??
80-
`Member Count: ${guild.memberCount}`,
81-
text: replacePlaceholders(data.ImageData?.Text, replacements) ?? member.user.tag,
82-
color: data.ImageData?.Color ?? "#88f"
83-
},
84-
avatar: {
85-
image: member.displayAvatarURL({extension: "png"}),
86-
outlineWidth: 5,
87-
outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
88-
},
89-
card: {
90-
background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
91-
blur: 1,
92-
border: true,
93-
rounded: true
94-
}
95-
});
96-
const cdnUrl = await uploadToCDN(imageBuffer)
74+
let cdnUrl;
75+
76+
if (data.ImageData) {
77+
const imageBuffer = await drawCardCanvas({
78+
theme: (data.ImageData?.Theme as "dark" | "circuit" | "code") ?? "dark",
79+
text: {
80+
title: replacePlaceholders(data.ImageData?.Title, replacements) ?? "Welcome!",
81+
subtitle:
82+
replacePlaceholders(data.ImageData?.Subtitle, replacements) ??
83+
`Member Count: ${guild.memberCount}`,
84+
text: replacePlaceholders(data.ImageData?.Text, replacements) ?? member.user.tag,
85+
color: data.ImageData?.Color ?? "#88f"
86+
},
87+
avatar: {
88+
image: member.displayAvatarURL({extension: "png"}),
89+
outlineWidth: 5,
90+
outlineColor: data.ImageData?.Gradient?.split(",")[0] ?? "#fff"
91+
},
92+
card: {
93+
background: data.ImageData?.Background ?? "https://cdn.xyzhub.link/u/czdZgx.png",
94+
blur: 1,
95+
border: true,
96+
rounded: true
97+
}
98+
});
99+
cdnUrl = await uploadToCDN(imageBuffer)
100+
}
97101

98102
const withImagePlaceholder = {
99103
...replacements,
100104
welcome: {
101-
image: cdnUrl,
105+
image: cdnUrl ?? "https://cdn.xyzhub.link/u/ixBzIX.png",
102106
},
103107
}
104108

0 commit comments

Comments
 (0)