fix: inline query and table parser

TTG-Club · Feb 7, 2024 · b90f1e5 · b90f1e5
1 parent 2b41cd3
commit b90f1e5
Show file tree

Hide file tree

Showing 2 changed files with 102 additions and 74 deletions.
diff --git a/src/inline-query/index.ts b/src/inline-query/index.ts
@@ -1,4 +1,5 @@
 import { InlineKeyboard, InlineQueryResultBuilder } from 'grammy';
+import { debounce } from 'lodash-es';
 
 import { useConfig } from '../utils/useConfig.js';
 import { useHelpers } from '../utils/useHelpers.js';
@@ -20,7 +21,7 @@ export const useInlineQueries = () => {
     }
   };
 
-  const handler = async (ctx: InlineQueryContext<IContext>) => {
+  const handler = debounce(async (ctx: InlineQueryContext<IContext>) => {
     const { query } = ctx.inlineQuery;
 
     if (!query || query.length < 3) {
@@ -73,7 +74,7 @@ export const useInlineQueries = () => {
     }
 
     return ctx.answerInlineQuery(spells, answerConfig);
-  };
+  }, 500);
 
   const registerInlineQueries = (bot: Bot<IContext>) => {
     bot.on('inline_query', ctx => handler(ctx));

diff --git a/src/utils/useMarkup.ts b/src/utils/useMarkup.ts
@@ -48,95 +48,122 @@ const allowedTags = [
   'dice-roller'
 ];
 
-export const useMarkup = () => {
-  const turndownService = new TurndownService({
-    bulletListMarker: '-'
-  });
+const turndownService = new TurndownService({
+  bulletListMarker: '-'
+});
+
+turndownService.use(gfm);
 
-  turndownService.use(gfm);
+turndownService.addRule('paragraph', {
+  filter: 'p',
+  replacement: (content, node) => {
+    if (!node.parentNode?.nodeName) {
+      return `\n\n${content}\n\n`;
+    }
 
-  turndownService.addRule('paragraph', {
-    filter: 'p',
-    replacement: content => `\n\n${content}\n\n`
-  });
+    return content;
+  }
+});
+
+turndownService.addRule('superscript', {
+  filter: node => node.nodeName === 'SUP',
+  replacement: content => ` [${content}]`
+});
+
+turndownService.addRule('tableCell', {
+  filter: node => node.nodeName === 'TH' || node.nodeName === 'TD',
+  replacement: (content, node) => {
+    const isLastElement =
+      node.nextSibling?.nodeName !== 'TH' &&
+      node.nextSibling?.nodeName !== 'TD';
+
+    return `| ${content}${isLastElement ? ' |' : ''}`;
+  }
+});
+
+turndownService.addRule('tableRow', {
+  filter: node => node.nodeName === 'TR',
+  replacement: content => `\n${content}\n`
+});
+
+turndownService.addRule('table', {
+  filter: node => node.nodeName === 'TABLE',
+  replacement: content => `\n${content}\n`
+});
+
+turndownService.addRule('diceRoller', {
+  filter: node => node.nodeName === 'DICE-ROLLER',
+  replacement: (content, node) => {
+    let text = '';
+
+    if ('getAttribute' in node && node.getAttribute('formula')) {
+      text = `<b>${node.getAttribute('formula')}</b>`;
+    }
 
-  turndownService.addRule('superscript', {
-    filter: node => node.nodeName === 'SUP',
-    replacement: content => ` [${content}]`
-  });
+    if ('getAttribute' in node && node.getAttribute(':formula')) {
+      text = `<b>${node.getAttribute('formula')}</b>`;
+    }
 
-  turndownService.addRule('diceRoller', {
-    filter: node => node.nodeName === 'DICE-ROLLER',
-    replacement: (content, node) => {
-      let text = '';
+    if (content) {
+      text = `<b>${content}</b>`;
+    }
 
-      if ('getAttribute' in node && node.getAttribute('formula')) {
-        text = `<b>${node.getAttribute('formula')}</b>`;
-      }
+    return text;
+  }
+});
 
-      if ('getAttribute' in node && node.getAttribute(':formula')) {
-        text = `<b>${node.getAttribute('formula')}</b>`;
-      }
+turndownService.addRule('inlineLink', {
+  filter: (node, options) =>
+    options.linkStyle === 'inlined' &&
+    node.nodeName === 'A' &&
+    !!node.getAttribute('href'),
 
-      if (content) {
-        text = `<b>${content}</b>`;
+  replacement: (content, node) => {
+    const getUpdatedHref = (href: string) => {
+      if (href.startsWith('http')) {
+        return href;
       }
 
-      return text;
-    }
-  });
+      return getUrl(href);
+    };
 
-  turndownService.addRule('inlineLink', {
-    filter: (node, options) =>
-      options.linkStyle === 'inlined' &&
-      node.nodeName === 'A' &&
-      !!node.getAttribute('href'),
+    let href: string | null = null;
 
-    replacement: (content, node) => {
-      const getUpdatedHref = (href: string) => {
-        if (href.startsWith('http')) {
-          return href;
-        }
+    if ('getAttribute' in node) {
+      href = node.getAttribute('href');
+    }
 
-        return getUrl(href);
-      };
+    if (href) {
+      href = getUpdatedHref(href);
+    }
 
-      let href: string | null = null;
+    return `<a href="${href}">${content}</a>`;
+  }
+});
 
-      if ('getAttribute' in node) {
-        href = node.getAttribute('href');
-      }
+turndownService.addRule('baseTags', {
+  filter: [
+    // Bold
+    'b',
+    'strong',
 
-      if (href) {
-        href = getUpdatedHref(href);
-      }
+    // Italic
+    'i',
+    'em',
 
-      return `<a href="${href}">${content}</a>`;
-    }
-  });
-
-  turndownService.addRule('baseTags', {
-    filter: [
-      // Bold
-      'b',
-      'strong',
-
-      // Italic
-      'i',
-      'em',
-
-      // Strikethrough
-      's',
-      'del',
-
-      // Underline
-      'u',
-      'ins'
-    ],
-    replacement: (content, node) =>
-      `<${node.nodeName.toLowerCase()}>${content}</${node.nodeName.toLowerCase()}>`
-  });
+    // Strikethrough
+    's',
+    'del',
 
+    // Underline
+    'u',
+    'ins'
+  ],
+  replacement: (content, node) =>
+    `<${node.nodeName.toLowerCase()}>${content}</${node.nodeName.toLowerCase()}>`
+});
+
+export const useMarkup = () => {
   const getSanitized = (html: string) => sanitizeHtml(html, { allowedTags });
 
   const getMarkup = (html: string) => {