From f5e100bb9e3008566681988db0b483b4a496a53f Mon Sep 17 00:00:00 2001 From: Thibault Camlane Date: Mon, 14 Jul 2025 10:24:11 +0200 Subject: [PATCH] adding an error message when fetching satellite image --- backend/src/api/slack/controllers/slack.js | 2 -- backend/src/api/slack/services/slack.js | 3 ++- frontend/src/app/satellites/[satelliteSlug]/satImage.tsx | 9 ++++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/backend/src/api/slack/controllers/slack.js b/backend/src/api/slack/controllers/slack.js index f1e57d9..7986e5d 100644 --- a/backend/src/api/slack/controllers/slack.js +++ b/backend/src/api/slack/controllers/slack.js @@ -24,8 +24,6 @@ module.exports = { }, getSharedURL: async (ctx) => { const { fileId } = ctx.request.body; - const slackToken = process.env.SLACK_BOT_TOKEN; - if (!fileId) { return ctx.badRequest("File ID is required"); } diff --git a/backend/src/api/slack/services/slack.js b/backend/src/api/slack/services/slack.js index 8475735..148cc2c 100644 --- a/backend/src/api/slack/services/slack.js +++ b/backend/src/api/slack/services/slack.js @@ -27,8 +27,9 @@ module.exports = { try { const result = await slack.conversations.history({ channel: process.env.SLACK_CHANNEL_ID, - limit: 20, + limit: 15, }); + console.log("Fetched images from Slack:", result.messages.length); cachedImages = result.messages.filter( (msg) => msg.bot_profile?.name === "hypso1bot" && diff --git a/frontend/src/app/satellites/[satelliteSlug]/satImage.tsx b/frontend/src/app/satellites/[satelliteSlug]/satImage.tsx index e55325e..b09e0e7 100644 --- a/frontend/src/app/satellites/[satelliteSlug]/satImage.tsx +++ b/frontend/src/app/satellites/[satelliteSlug]/satImage.tsx @@ -80,6 +80,7 @@ export default function SatImage({ files: SlackFile[]; } + console.log("Fetched Slack images:", data); const rightMessage: SlackMessage | undefined = ( data as SlackMessage[] ).find((message: SlackMessage) => { @@ -92,7 +93,13 @@ export default function SatImage({ } return false; }); - + if (!rightMessage) { + console.warn("No matching satellite image found."); + setError( + "No matching satellite image found. Try again later when a new image is uploaded.", + ); + return; + } const rightFile: SlackFile | undefined = rightMessage?.files[0]; makeTheImagePublic(rightFile?.id as number).catch((err) => { console.error("Error making image public:", err);