Fix sending annotation photo

src/bots/factory/bots/approved/annotations.ts

@@ -0,0 +1,61 @@
+import * as Sentry from '@sentry/node';
+import { Context } from "telegraf";
+import { AuthorAnnnotation, BookAnnotation } from "./services/book_library";
+
+import env from '@/config';
+import { isNormalText } from "./utils";
+import { getTextPaginationData } from './keyboard';
+
+
+Sentry.init({
+    dsn: env.SENTRY_DSN,
+});
+
+
+export function getAnnotationHandler<T extends BookAnnotation | AuthorAnnnotation>(
+    annotationGetter: (id: number) => Promise<T>,
+    callbackData: string
+): (ctx: Context) => Promise<void> {
+    return async (ctx: Context) => {
+        if (!ctx.message || !('text' in ctx.message)) {
+            return;
+        }
+
+        const objId = ctx.message.text.split("@")[0].split('_')[2];
+
+        const annotation = await annotationGetter(parseInt(objId));
+
+        if (!annotation.file && !isNormalText(annotation.text)) {
+            await ctx.reply("Аннотация недоступна :(");
+            return;
+        }
+
+        if (annotation.file) {
+            try {
+                await ctx.telegram.sendPhoto(ctx.message.chat.id, annotation.file);
+            } catch (e) {
+                console.log(e);
+                Sentry.captureException(e);
+            }
+        }
+
+        if (!isNormalText(annotation.text)) return;
+
+        const data = getTextPaginationData(`${callbackData}${objId}`, annotation.text, 0);
+
+        try {
+            await ctx.reply(data.current, {
+                parse_mode: "HTML",
+                reply_markup: data.keyboard.reply_markup,
+            });
+        } catch (e) {
+            Sentry.captureException(e, {
+                extra: {
+                    message: data.current,
+                    annotation,
+                    objId
+                }
+            })
+        }
+    }
+}

src/bots/factory/bots/approved/index.ts

@@ -15,12 +15,12 @@ import * as BookLibrary from "./services/book_library";
 import UsersCounter from '@/analytics/users_counter';
 import { createOrUpdateUserSettings, getUserOrDefaultLangCodes } from './services/user_settings';
 import { formatBook, formatBookShort, formatAuthor, formatSequence, formatTranslator, formatDetailBook } from './format';
-import { getCallbackArgs, getPaginatedMessage, getPrefixWithQueryCreator, getSearchArgs, registerLanguageSettingsCallback, registerPaginationCommand, registerRandomItemCallback } from './utils';
+import { getCallbackArgs, getPaginatedMessage, getPrefixWithQueryCreator, getSearchArgs, isNormalText, registerLanguageSettingsCallback, registerPaginationCommand, registerRandomItemCallback } from './utils';
 import { getRandomKeyboard, getTextPaginationData, getUpdateLogKeyboard, getUserAllowedLangsKeyboard } from './keyboard';
 import { sendFile } from './hooks/downloading';
 import { setCommands } from './hooks/setCommands';
-import { downloadImage } from './services/downloader';
 import { isNotModifiedMessage, isReplyMessageNotFound } from './errors_utils';
+import { getAnnotationHandler } from './annotations';
 
 
 Sentry.init({
@@ -186,39 +186,10 @@ export async function createApprovedBot(token: string, state: BotState): Promise
         }
     });
 
-    bot.hears(new RegExp(`^/b_an_[\\d]+(@${me.username})*$`), async (ctx: Context) => {
+    bot.hears(
-        if (!ctx.message || !('text' in ctx.message)) {
+        new RegExp(`^/b_an_[\\d]+(@${me.username})*$`),
-            return;
+        getAnnotationHandler(BookLibrary.getBookAnnotation, CallbackData.BOOK_ANNOTATION_PREFIX)
-        }
+    );
-
-        const bookId = ctx.message.text.split("@")[0].split('_')[2];
-
-        const annotation = await BookLibrary.getBookAnnotation(parseInt(bookId));
-
-        if (annotation.file) {
-            const imageData = await downloadImage(annotation.file);
-
-            if (imageData) await ctx.telegram.sendPhoto(ctx.message.chat.id, {source: imageData});
-        }
-
-        if (annotation.text.length === 0) return;
-
-        const data = getTextPaginationData(`${CallbackData.BOOK_ANNOTATION_PREFIX}${bookId}`, annotation.text, 0);
-
-        try {
-            await ctx.reply(data.current, {
-                parse_mode: "HTML",
-                reply_markup: data.keyboard.reply_markup,
-            });
-        } catch (e) {
-            Sentry.captureException(e, {
-                extra: {
-                    message: data.current,
-                    bookId,
-                }
-            })
-        }
-    });
 
     bot.action(new RegExp(CallbackData.BOOK_ANNOTATION_PREFIX), async (ctx: Context) => {
         if (!ctx.callbackQuery || !('data' in ctx.callbackQuery)) return;
@@ -252,39 +223,10 @@ export async function createApprovedBot(token: string, state: BotState): Promise
         }
     });
 
-    bot.hears(new RegExp(`^/a_an_[\\d]+(@${me.username})*$`), async (ctx: Context) => {
+    bot.hears(
-        if (!ctx.message || !('text' in ctx.message)) {
+        new RegExp(`^/a_an_[\\d]+(@${me.username})*$`),
-            return;
+        getAnnotationHandler(BookLibrary.getAuthorAnnotation, CallbackData.AUTHOR_ANNOTATION_PREFIX)
-        }
+    );
-
-        const authorId = ctx.message.text.split('@')[0].split('_')[2];
-
-        const annotation = await BookLibrary.getAuthorAnnotation(parseInt(authorId));
-
-        if (annotation.file) {
-            const imageData = await downloadImage(annotation.file);
-            
-            if (imageData) await ctx.telegram.sendPhoto(ctx.message.chat.id, {source: imageData});
-        }
-
-        if (annotation.text.length === 0) return;
-
-        const data = getTextPaginationData(`${CallbackData.AUTHOR_ANNOTATION_PREFIX}${authorId}`, annotation.text, 0);
-        
-        try {
-            await ctx.reply(data.current, {
-                parse_mode: "HTML",
-                reply_markup: data.keyboard.reply_markup,
-            });
-        } catch (e) {
-            Sentry.captureException(e, {
-                extra: {
-                    message: data.current,
-                    authorId,
-                }
-            })
-        }
-    });
 
     bot.action(new RegExp(CallbackData.AUTHOR_ANNOTATION_PREFIX), async (ctx: Context) => {
         if (!ctx.callbackQuery || !('data' in ctx.callbackQuery)) return;

src/bots/factory/bots/approved/utils.ts

@@ -226,3 +226,11 @@ export function getCallbackArgs(ctx: Context): { query: string, page: number} |
 export function getPrefixWithQueryCreator(prefix: string) {
     return (query: string) => `${prefix}${query}_`; 
 }
+
+export function isNormalText(value: string | null): boolean {
+    if (value === null) return false;
+    if (value.length === 0) return false;
+    if (value.replaceAll("\n", "").replaceAll(" ", "").length === 0) return false;
+
+    return true;
+}