Skip to content

Send improvements #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertt merged 1 commit into from
Oct 27, 2020
Merged

Send improvements #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions src/modules/etc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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();
}
}
}
4 changes: 4 additions & 0 deletions src/util/send.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down