Merge pull request #101 from typescript-community/send-improvements

Send improvements

Author: robertt

src/modules/etc.ts

@@ -5,7 +5,11 @@ import {
 	listener,
 } from 'cookiecord';
 import { Message, MessageReaction, GuildMember } from 'discord.js';
-import { clearMessageOwnership, ownsBotMessage } from '../util/send';
+import {
+	clearMessageOwnership,
+	DELETE_EMOJI,
+	ownsBotMessage,
+} from '../util/send';
 
 export class EtcModule extends Module {
 	constructor(client: CookiecordClient) {
@@ -43,12 +47,14 @@ export class EtcModule extends Module {
 
 	@listener({ event: 'messageReactionAdd' })
 	async onReact(reaction: MessageReaction, member: GuildMember) {
-		if (
-			reaction.emoji.name === '❌' &&
-			ownsBotMessage(reaction.message, member.id)
-		) {
+		if (reaction.emoji.name !== DELETE_EMOJI) return;
+		if (member.id === this.client.user?.id) return;
+
+		if (ownsBotMessage(reaction.message, member.id)) {
 			clearMessageOwnership(reaction.message);
 			await reaction.message.delete();
+		} else {
+			await reaction.remove();
 		}
 	}
 }

src/util/send.ts

@@ -4,11 +4,15 @@ const MAX_TRACKED_MESSAGES = 1000;
 
 const messageToUserId = new Map<string, string>();
 
+export const DELETE_EMOJI = '🗑️';
+
 export async function sendWithMessageOwnership(
 	message: Message,
 	toSend: string | { embed: MessageEmbed },
 ) {
 	const sent = await message.channel.send(toSend);
+	await sent.react(DELETE_EMOJI);
+
 	addMessageOwnership(sent, message.author);
 }