Skip to content

Commit dd9bb8a

Browse files
committed
Add more emotes to context
1 parent 94d5089 commit dd9bb8a

3 files changed

Lines changed: 10 additions & 13 deletions

File tree

src/context.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ export interface BotContext {
153153

154154
emoji: {
155155
alarm: GuildEmoji;
156+
sadHamster: GuildEmoji;
157+
trichter: GuildEmoji;
156158
};
157159
}
158160

@@ -367,6 +369,8 @@ export async function createBotContext(client: Client<true>): Promise<BotContext
367369

368370
emoji: {
369371
alarm: ensureEmoji(guild, "677503944007876608"),
372+
sadHamster: ensureEmoji(guild, "1237071954591092828"),
373+
trichter: ensureEmoji(guild, "1017040526555488366"),
370374
},
371375
};
372376
}

src/service/lootDrop.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ export async function postLootDrop(
8989
donor: User | undefined,
9090
predecessorLootId: LootId | undefined,
9191
): Promise<Loot | undefined> {
92-
const hamster = context.guild.emojis.cache.find(e => e.name === "sad_hamster") ?? ":(";
93-
9492
const takeLootButton = new ButtonBuilder()
9593
.setCustomId("take-loot")
9694
.setLabel("Geschenk nehmen")
@@ -144,7 +142,7 @@ export async function postLootDrop(
144142
donor
145143
? // TODO: `Keiner wollte das Geschenk von ${donor} haben. ${donor} hat es wieder mitgenommen.`
146144
`Das Geschenk von ${donor} verpuffte im nichts :(`
147-
: `Oki aber nächstes mal bitti aufmachi, sonst muss ichs wieder mitnehmi ${hamster}`,
145+
: `Oki aber nächstes mal bitti aufmachi, sonst muss ichs wieder mitnehmi ${context.emoji.sadHamster}`,
148146
),
149147
footer => footer.setContent("-# ❌ Niemand war schnell genug"),
150148
),
@@ -179,7 +177,7 @@ export async function postLootDrop(
179177

180178
if (!claimedLoot) {
181179
await reply.edit({
182-
content: `Upsi, da ist was schief gelaufi oder jemand anderes war schnelli ${hamster}`,
180+
content: `Upsi, da ist was schief gelaufi oder jemand anderes war schnelli ${context.emoji.sadHamster}`,
183181
});
184182
return;
185183
}
@@ -286,7 +284,7 @@ export async function postLootDrop(
286284
rarityAttribute,
287285
);
288286
if (!extraLoot) {
289-
await channel.send(`${winner}, ups, da ist was schief gelaufi ${hamster}`);
287+
await channel.send(`${winner}, ups, da ist was schief gelaufi ${context.emoji.sadHamster}`);
290288
return;
291289
}
292290

src/service/trichterUnser.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
import { ContainerBuilder, MessageFlags } from "discord.js";
22
import type { BotContext } from "#context.ts";
33

4-
export async function sendTrichterUnser(ctx: BotContext) {
5-
const trichterEmote = ctx.guild.emojis.cache.find(value => value.name === "trichter");
6-
if (!trichterEmote) {
7-
return;
8-
}
9-
10-
await ctx.textChannels.hauptchat.send({
4+
export async function sendTrichterUnser(context: BotContext) {
5+
await context.textChannels.hauptchat.send({
116
components: [
127
new ContainerBuilder().addTextDisplayComponents(
13-
t => t.setContent(`# Das ${trichterEmote}-Unser`),
8+
t => t.setContent(`# Das ${context.emoji.trichter}-Unser`),
149
t =>
1510
t.setContent(`
1611
Unser Bier, das im Kühlschrank steht,

0 commit comments

Comments
 (0)