artie/artemis.js
1
0
Fork 0
mirror of https://github.com/artiemis/artemis.js.git synced 2026-02-14 02:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: artie:1568439a42cd39914ed1f065409ca448b948866e
Branches Tags
artie:main
...
compare: artie:c7e5aca7009e26dac54b36d470e955a8334bb4bf
Branches Tags
artie:main

2 Commits
1568439a42 ... c7e5aca700

Author SHA1 Message Date
artie
c7e5aca700 remove comment 2025-04-15 19:02:27 +02:00
artie
35a95f651e support forwarded messages in ocr menus, disable glens fallback error reporting 2025-04-15 19:00:08 +02:00
2 changed files with 22 additions and 10 deletions
Show Stats Expand all files Collapse all files

4
src/commands/ocr/ocr.ts
View File

@ -6,7 +6,7 @@ import {
} from "discord.js"; } from "discord.js";
import { defineCommand } from ".."; import { defineCommand } from "..";
import { downloadFile } from "../../utils/http"; import { downloadFile } from "../../utils/http";
import { abort, sendErrorAlert } from "../../utils/error"; import { abort } from "../../utils/error";
import { yandexOcr } from "../../utils/yandex"; import { yandexOcr } from "../../utils/yandex";
import sharp from "sharp"; import sharp from "sharp";
import { import {
@ -88,7 +88,7 @@ export async function ocrImpl(url: string) {
const result = await lensOcr(compressed) const result = await lensOcr(compressed)
.catch(err => { .catch(err => {
logger.error(err, "Google Lens error, falling back to Yandex"); logger.error(err, "Google Lens error, falling back to Yandex");
sendErrorAlert(err, { mime: type.mime }); // sendErrorAlert(err, { mime: type.mime });
return yandexOcr(compressed, type.mime); return yandexOcr(compressed, type.mime);
}) })
.catch(() => abort("Failed to OCR the image")); .catch(() => abort("Failed to OCR the image"));

28
src/utils/functions.ts
View File

@ -9,6 +9,7 @@ import {
MessageFlags, MessageFlags,
ModalSubmitInteraction, ModalSubmitInteraction,
type ChatInputCommandInteraction, type ChatInputCommandInteraction,
type MessageSnapshot,
} from "discord.js"; } from "discord.js";
import { abort } from "./error"; import { abort } from "./error";
@ -94,15 +95,26 @@ export function getImageUrlFromChatInteraction(
} }
export function getImageUrlFromMessage(message: Message): string { export function getImageUrlFromMessage(message: Message): string {
const attachment = message.attachments.first(); function extractImageUrl(message: Message | MessageSnapshot) {
const attachment = message.attachments.first();
return ( return (
(attachment?.contentType?.startsWith("image/") && attachment.url) || (attachment?.contentType?.startsWith("image/") && attachment.url) ||
message.embeds[0]?.image?.url || message.embeds[0]?.image?.url ||
message.embeds[0]?.thumbnail?.url || message.embeds[0]?.thumbnail?.url ||
findFirstUrl(message.content) || findFirstUrl(message.content)
abort("No valid image found!") );
); }
if (message.messageSnapshots) {
const snapshot = message.messageSnapshots.first();
if (snapshot) {
const url = extractImageUrl(snapshot);
if (url) return url;
}
}
return extractImageUrl(message) || abort("No valid image found!");
} }
export function languageCodeToName(code: string) { export function languageCodeToName(code: string) {