Skip to content

Commit 4ef4b70

Browse files
committed
updates
1 parent ec83a3d commit 4ef4b70

File tree

7 files changed

+18
-20
lines changed

7 files changed

+18
-20
lines changed

src/commands/reminders/cancel.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,13 @@ const command: Command = {
6666
const reminders = await Reminder.find({ user: interaction.user.id });
6767

6868
// Filter reminders
69-
const filteredReminders = reminders.filter((reminder) => reminder._id.startsWith(option.value));
69+
const filteredReminders = reminders.filter((reminder) => reminder.reminder_id.startsWith(option.value));
7070

7171
// Map reminders
7272
const choices = filteredReminders.map((reminder) => {
7373
return {
74-
name: reminder._id,
75-
value: reminder._id
74+
name: reminder.reminder_id,
75+
value: reminder.reminder_id
7676
}
7777
})
7878

src/commands/reminders/info.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const command: Command = {
4343

4444
const info = new Discord.EmbedBuilder()
4545
.setColor(client.config.embeds.default as ColorResolvable)
46-
.setTitle(reminder._id)
46+
.setTitle(reminder.reminder_id)
4747
.addFields(
4848
{ name: "Reason", value: reminder.reason },
4949
{ name: "Set", value: `<t:${reminder.reminder_set.toString().slice(0, -3)}:f>`, inline: true },
@@ -63,13 +63,13 @@ const command: Command = {
6363
const reminders = await Reminder.find({ user: interaction.user.id });
6464

6565
// Filter reminders
66-
const filteredReminders = reminders.filter((reminder) => reminder._id.startsWith(option.value));
66+
const filteredReminders = reminders.filter((reminder) => reminder.reminder_id.startsWith(option.value));
6767

6868
// Map reminders
6969
const choices = filteredReminders.map((reminder) => {
7070
return {
71-
name: reminder._id,
72-
value: reminder._id
71+
name: reminder.reminder_id,
72+
value: reminder.reminder_id
7373
}
7474
})
7575

src/commands/reminders/reminders.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const command: Command = {
4545
const list = new Discord.EmbedBuilder()
4646
.setColor(client.config.embeds.default as ColorResolvable)
4747
.setTitle("Your Reminders")
48-
.setDescription(cap(reminders.map(r => `\`${r._id}\` (<t:${r.reminder_due.toString().slice(0, -3)}:R>):\n*${!fullReasons ? cap(r.reason, 100): r.reason}*`).join("\n"), 4000))
48+
.setDescription(cap(reminders.map(r => `\`${r.reminder_id}\` (<t:${r.reminder_due.toString().slice(0, -3)}:R>):\n*${!fullReasons ? cap(r.reason, 100): r.reason}*`).join("\n"), 4000))
4949

5050
await interaction.editReply({ embeds: [list] });
5151
} catch(err) {

src/commands/reminders/remindme.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const command: Command = {
123123
.addFields (
124124
{ name: "Set", value: `<t:${reminder.reminder_set.toString().slice(0, -3)}:f> (<t:${reminder.reminder_set.toString().slice(0, -3)}:R>)` }
125125
)
126-
.setFooter({ text: `ID: ${reminder._id}` })
126+
.setFooter({ text: `ID: ${reminder.reminder_id}` })
127127
.setTimestamp()
128128

129129

@@ -155,7 +155,7 @@ const command: Command = {
155155

156156
const reminderSet = new Discord.EmbedBuilder()
157157
.setColor(client.config.embeds.default as ColorResolvable)
158-
.setDescription(`${emoji.tick} Your reminder has been set for <t:${reminder.reminder_due.toString().slice(0, -3)}:f> with ID \`${reminder._id}\`!`)
158+
.setDescription(`${emoji.tick} Your reminder has been set for <t:${reminder.reminder_due.toString().slice(0, -3)}:f> with ID \`${reminder.reminder_id}\`!`)
159159

160160
await interaction.editReply({ embeds: [reminderSet] });
161161
} catch(err) {

src/events/client/ready.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const event: Event = {
3535
{ name: "Set", value: `<t:${reminder.reminder_set.toString().slice(0, -3)}:f>`, inline: true },
3636
{ name: "Overdue Since", value: `<t:${reminder.reminder_due.toString().slice(0, -3)}:R>`, inline: true }
3737
)
38-
.setFooter({ text: `ID: ${reminder._id}` })
38+
.setFooter({ text: `ID: ${reminder.reminder_id}` })
3939
.setTimestamp()
4040

4141
if(reminder?.send_in_channel && reminder.channel) {
@@ -81,7 +81,7 @@ const event: Event = {
8181
if(reminders.length === 0) return;
8282

8383
for(const reminder of reminders) {
84-
if(client.reminders.get(`${reminder.user}-${reminder._id}`)) continue;
84+
if(client.reminders.get(`${reminder.user}-${reminder.reminder_id}`)) continue;
8585

8686
await setReminder(reminder, client);
8787
}

src/models/Reminder.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function decrypt(text: string): string {
2222
}
2323

2424
interface Reminder extends Document {
25-
_id: string;
25+
reminder_id: string;
2626
user: string;
2727
channel?: string;
2828
delay: number;
@@ -34,13 +34,11 @@ interface Reminder extends Document {
3434

3535
const reminderSchema = new Schema<Reminder>(
3636
{
37-
_id: {
37+
reminder_id: {
3838
type: String,
3939
required: true,
4040
unique: true,
41-
index: true,
42-
set: (value: string) => encrypt(value),
43-
get: (value: string) => decrypt(value)
41+
index: true
4442
},
4543
user: {
4644
type: String,

src/util/setReminder.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ export default async function (reminder: any, client: ExtendedClient): Promise<B
77

88
if(delay > client.config.reminders.timeTillSet) return false;
99

10-
client.reminders.set(`${reminder.user}-${reminder._id}`, setTimeout(async () => {
10+
client.reminders.set(`${reminder.user}-${reminder.reminder_id}`, setTimeout(async () => {
1111
await reminder.deleteOne();
12-
client.reminders.delete(`${reminder.user}-${reminder._id}`);
12+
client.reminders.delete(`${reminder.user}-${reminder.reminder_id}`);
1313

1414
const embed = new EmbedBuilder()
1515
.setColor(client.config.embeds.default as ColorResolvable)
@@ -18,7 +18,7 @@ export default async function (reminder: any, client: ExtendedClient): Promise<B
1818
.addFields (
1919
{ name: "Set", value: `<t:${reminder.reminder_set.toString().slice(0, -3)}:f> (<t:${reminder.reminder_set.toString().slice(0, -3)}:R>)` }
2020
)
21-
.setFooter({ text: `ID: ${reminder._id}` })
21+
.setFooter({ text: `ID: ${reminder.reminder_id}` })
2222
.setTimestamp()
2323

2424
if(reminder?.send_in_channel && reminder?.channel) {

0 commit comments

Comments
 (0)