Adding images to scraping data (#157)

* Fredy now supports pulling the main Image from the listing and send it together with the usual information

lib/notification/adapter/telegram.js

@@ -2,107 +2,97 @@ import { markdown2Html } from '../../services/markdown.js';
 import { getJob } from '../../services/storage/jobStorage.js';
 import fetch from 'node-fetch';
 import pThrottle from 'p-throttle';
+import { normalizeImageUrl } from '../../utils.js';
 
-const MAX_ENTITIES_PER_CHUNK = 8;
 const RATE_LIMIT_INTERVAL = 1000;
 const chatThrottleMap = new Map();
 
 function cleanupOldThrottles() {
   const now = Date.now();
-  const maxAge = RATE_LIMIT_INTERVAL + 1000; // adding extra second
+  const maxAge = RATE_LIMIT_INTERVAL + 1000;
   const toBeDeleted = [];
-
   for (const [chatId, chatThrottle] of chatThrottleMap.entries()) {
-    if (now - chatThrottle.lastUsedAt > maxAge) {
-      toBeDeleted.push(chatId);
-    }
-  }
-
-  for (const chatId of toBeDeleted) {
-    chatThrottleMap.delete(chatId);
+    if (now - chatThrottle.lastUsedAt > maxAge) toBeDeleted.push(chatId);
   }
+  for (const chatId of toBeDeleted) chatThrottleMap.delete(chatId);
 }
 
-/**
- * Returns a throttled async function for sending messages to a specific chat.
- * Telegram enforces a rate limit of 1 message per second per chat (chatId).
- *
- * @param {number} chatId - The chat ID to throttle messages for.
- * @param {Function} fn - The async function to throttle (should send the message).
- * @returns {Function} Throttled async function for sending messages.
- */
 function getThrottled(chatId, call) {
   cleanupOldThrottles();
-
   const now = Date.now();
   const chatThrottle = chatThrottleMap.get(chatId);
-
   if (chatThrottle) {
     chatThrottle.lastUsedAt = now;
     return chatThrottle.throttled;
   }
-
-  // Create new throttled function
-  const newThrottle = {
-    lastUsedAt: now,
-    throttled: pThrottle({ limit: 1, interval: RATE_LIMIT_INTERVAL })(call),
-  };
-  chatThrottleMap.set(chatId, newThrottle);
-  return newThrottle.throttled;
+  const throttled = pThrottle({ limit: 1, interval: RATE_LIMIT_INTERVAL })(call);
+  chatThrottleMap.set(chatId, { lastUsedAt: now, throttled });
+  return throttled;
 }
 
-/**
- * splitting an array into chunks because Telegram only allows for messages up to
- * 4096 chars, thus we have to split messages into chunks
- * @param inputArray
- * @param perChunk
- */
-const arrayChunks = (inputArray, perChunk) =>
-  inputArray.reduce((all, one, i) => {
-    const ch = Math.floor(i / perChunk);
-    all[ch] = [].concat(all[ch] || [], one);
-    return all;
-  }, []);
-function shorten(str, len = 30) {
-  return str.length > len ? str.substring(0, len) + '...' : str;
+function shorten(str, len = 90) {
+  if (!str) return '';
+  return str.length > len ? str.substring(0, len).trim() + '...' : str;
 }
+
+function escapeHtml(s = '') {
+  return s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+function buildCaption(jobName, serviceName, o) {
+  const title = shorten((o.title || '').replace(/\*/g, ''), 90);
+  const meta = [o.address, o.price, o.size].filter(Boolean).join(' | ');
+  return `<i>${escapeHtml(jobName)}</i> (${escapeHtml(serviceName)})\n<a href='${escapeHtml(
+    o.link || '',
+  )}'><b>${escapeHtml(title)}</b></a>\n${escapeHtml(meta)}`.slice(0, 1024);
+}
+
+function buildText(jobName, serviceName, o) {
+  const title = shorten((o.title || '').replace(/\*/g, ''), 90);
+  const meta = [o.address, o.price, o.size].filter(Boolean).join(' | ');
+  return (
+    `<i>${escapeHtml(jobName)}</i> (${escapeHtml(serviceName)})\n` +
+    `<a href='${escapeHtml(o.link || '')}'><b>${escapeHtml(title)}</b></a>\n` +
+    `${escapeHtml(meta)}`
+  );
+}
+
 export const send = ({ serviceName, newListings, notificationConfig, jobKey }) => {
   const { token, chatId } = notificationConfig.find((adapter) => adapter.id === config.id).fields;
   const job = getJob(jobKey);
   const jobName = job == null ? jobKey : job.name;
-  const chunks = arrayChunks(newListings, MAX_ENTITIES_PER_CHUNK);
 
-  const getThrottledSend = getThrottled(chatId, async function (body) {
-    await fetch(`https://api.telegram.org/bot${token}/sendMessage`, {
+  const throttledCall = getThrottled(chatId, async function (endpoint, body) {
+    await fetch(`https://api.telegram.org/bot${token}/${endpoint}`, {
       method: 'post',
       body: JSON.stringify(body),
       headers: { 'Content-Type': 'application/json' },
     });
   });
 
-  const promises = chunks.map((chunk) => {
-    const messageParagraphs = [];
+  const promises = newListings.map(async (o) => {
+    const img = normalizeImageUrl(o.image);
 
-    messageParagraphs.push(`<i>${jobName}</i> (${serviceName}) found <b>${newListings.length}</b> new listings:`);
-    messageParagraphs.push(
-      ...chunk.map(
-        (o) =>
-          `<a href='${o.link}'><b>${shorten(o.title.replace(/\*/g, ''), 45).trim()}</b></a>\n` +
-          [o.address, o.price, o.size].join(' | '),
-      ),
-    );
+    if (img) {
+      return throttledCall('sendPhoto', {
+        chat_id: chatId,
+        photo: img,
+        caption: buildCaption(jobName, serviceName, o),
+        parse_mode: 'HTML',
+      });
+    }
 
-    const body = {
+    return throttledCall('sendMessage', {
       chat_id: chatId,
-      text: messageParagraphs.join('\n\n'),
+      text: buildText(jobName, serviceName, o),
       parse_mode: 'HTML',
       disable_web_page_preview: true,
-    };
-
-    return getThrottledSend(body);
+    });
   });
+
   return Promise.all(promises);
 };
+
 export const config = {
   id: 'telegram',
   name: 'Telegram',