Reply to originally invoking message for reminders

We only do this if we have a reminder body, otherwise we would link to the original message twice.

backend/src/data/GuildReminders.ts

@@ -34,14 +34,15 @@ export class GuildReminders extends BaseGuildRepository {
  });
  }
 
- async add(userId: string, channelId: string, remindAt: string, body: string, created_at: string) {
+ async add(userId: string, channelId: string, remindAt: string, body: string, created_at: string, source_id?: string) {
  await this.reminders.insert({
  guild_id: this.guildId,
  user_id: userId,
  channel_id: channelId,
  remind_at: remindAt,
  body,
  created_at,
+ source_message_id: source_id,
  });
  }
 }

backend/src/data/entities/Reminder.ts

@@ -17,4 +17,6 @@ export class Reminder {
  @Column() body: string;
 
  @Column() created_at: string;
+
+ @Column() source_message_id: string;
 }

backend/src/migrations/1631494429170-AddSourceMessageIdToReminders.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
+
+export class AddSourceMessageIdToReminders1631494429170 implements MigrationInterface {
+ public async up(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.addColumns("reminders", [
+ new TableColumn({
+ name: "source_message_id",
+ type: "bigint",
+ isNullable: true,
+ default: null,
+ unsigned: true,
+ }),
+ ]);
+ }
+
+ public async down(queryRunner: QueryRunner): Promise<void> {
+ await queryRunner.dropColumn("reminders", "source_message_id");
+ }
+}

backend/src/plugins/Reminders/commands/RemindCmd.ts

@@ -56,6 +56,7 @@ export const RemindCmd = remindersCmd({
  reminderTime.clone().tz("Etc/UTC").format("YYYY-MM-DD HH:mm:ss"),
  reminderBody,
  moment.utc().format("YYYY-MM-DD HH:mm:ss"),
+ args.reminder ? msg.id : undefined,
  );
 
  const msUntilReminder = reminderTime.diff(now);

backend/src/plugins/Reminders/utils/postDueRemindersLoop.ts

@@ -24,13 +24,15 @@ export async function postDueRemindersLoop(pluginData: GuildPluginData<Reminders
  content: disableLinkPreviews(
  `Reminder for <@!${reminder.user_id}>: ${reminder.body} \n\`Set at ${reminder.created_at} (${result} ago)\``,
  ),
+ reply: { messageReference: reminder.source_message_id, failIfNotExists: false },
  allowedMentions: {
  users: [reminder.user_id as Snowflake],
  },
  });
  } else {
  await channel.send({
  content: disableLinkPreviews(`Reminder for <@!${reminder.user_id}>: ${reminder.body}`),
+ reply: { messageReference: reminder.source_message_id, failIfNotExists: false },
  allowedMentions: {
  users: [reminder.user_id as Snowflake],
  },