Skip to content

Commit 0e6eecd

Browse files
committed
Support emojis by name, so we donÄt break alternative stages
1 parent 4203379 commit 0e6eecd

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

src/context.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,16 @@ function ensureVoiceChannel(guild: Guild, channelId: Snowflake): VoiceChannel {
203203
return channel;
204204
}
205205

206-
function ensureEmoji(guild: Guild, emojiId: Snowflake): GuildEmoji {
206+
function ensureEmoji(guild: Guild, emojiId: Snowflake, fallbackName: string): GuildEmoji {
207207
const emoji = guild.emojis.resolve(emojiId);
208208
if (!emoji) {
209-
throw new Error(`Emoji with ID "${emojiId}" not found in guild "${guild.id}"`);
209+
const fallback = guild.emojis.cache.find(e => e.name === fallbackName);
210+
if (!fallback) {
211+
throw new Error(
212+
`Emoji with ID "${emojiId}" not found in guild "${guild.id}". Also did not fine a fallback with name "${fallbackName}"`,
213+
);
214+
}
215+
return fallback;
210216
}
211217
return emoji;
212218
}
@@ -368,9 +374,9 @@ export async function createBotContext(client: Client<true>): Promise<BotContext
368374
},
369375

370376
emoji: {
371-
alarm: ensureEmoji(guild, "677503944007876608"),
372-
sadHamster: ensureEmoji(guild, "1237071954591092828"),
373-
trichter: ensureEmoji(guild, "1017040526555488366"),
377+
alarm: ensureEmoji(guild, config.emoji.alarmEmojiId, "alarm"),
378+
sadHamster: ensureEmoji(guild, config.emoji.sadHamsterEmojiId, "sad_hamster"),
379+
trichter: ensureEmoji(guild, config.emoji.trichterEmojiId, "trichter"),
374380
},
375381
};
376382
}

src/service/config.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,10 @@ export interface Config {
178178
emotifiziererRoleId: Snowflake;
179179
lootRoleAsseGuardRoleId: Snowflake;
180180
};
181+
182+
emoji: {
183+
alarmEmojiId: Snowflake;
184+
sadHamsterEmojiId: Snowflake;
185+
trichterEmojiId: Snowflake;
186+
};
181187
}

0 commit comments

Comments
 (0)