diff --git a/src/commands/ocr/ocr.ts b/src/commands/ocr/ocr.ts index 18a18b4..dd566fd 100644 --- a/src/commands/ocr/ocr.ts +++ b/src/commands/ocr/ocr.ts @@ -75,6 +75,7 @@ export async function ocrImpl(url: string) { }); if (!type?.mime.startsWith("image/")) { + console.log(type, url); abort("The file must be an image!"); } diff --git a/src/commands/ocr/ocrMenu.ts b/src/commands/ocr/ocrMenu.ts index b12afe3..872f223 100644 --- a/src/commands/ocr/ocrMenu.ts +++ b/src/commands/ocr/ocrMenu.ts @@ -12,9 +12,12 @@ export default defineCommand({ if (!interaction.isMessageContextMenuCommand()) return; const attachment = interaction.targetMessage.attachments.first(); + const embed = interaction.targetMessage.embeds[0]; + const imageUrl = getImageFromAttachmentOrString( attachment, - interaction.targetMessage.embeds[0]?.image?.url || + embed?.image?.url || + embed?.thumbnail?.url || interaction.targetMessage.content ); diff --git a/src/commands/ocr/ocrTranslateEnglishMenu.ts b/src/commands/ocr/ocrTranslateEnglishMenu.ts index c092ded..db8188f 100644 --- a/src/commands/ocr/ocrTranslateEnglishMenu.ts +++ b/src/commands/ocr/ocrTranslateEnglishMenu.ts @@ -13,9 +13,12 @@ export default defineCommand({ if (!interaction.isMessageContextMenuCommand()) return; const attachment = interaction.targetMessage.attachments.first(); + const embed = interaction.targetMessage.embeds[0]; + const imageUrl = getImageFromAttachmentOrString( attachment, - interaction.targetMessage.embeds[0]?.image?.url || + embed?.image?.url || + embed?.thumbnail?.url || interaction.targetMessage.content ); diff --git a/src/commands/ocr/ocrTranslateMenu.ts b/src/commands/ocr/ocrTranslateMenu.ts index 3e068e0..35efac6 100644 --- a/src/commands/ocr/ocrTranslateMenu.ts +++ b/src/commands/ocr/ocrTranslateMenu.ts @@ -16,9 +16,12 @@ export default defineCommand({ if (!interaction.isMessageContextMenuCommand()) return; const attachment = interaction.targetMessage.attachments.first(); + const embed = interaction.targetMessage.embeds[0]; + const imageUrl = getImageFromAttachmentOrString( attachment, - interaction.targetMessage.embeds[0]?.image?.url || + embed?.image?.url || + embed?.thumbnail?.url || interaction.targetMessage.content );