From 355129c21938c514e9bada5f2949e2d4ebe1a18f Mon Sep 17 00:00:00 2001
From: oott123 <git@public.oott123.com>
Date: Sun, 24 Oct 2021 15:24:43 +0800
Subject: [PATCH] fix: ocr incorrect when no queue enabled

---
 ROADMAP.md             |  3 ++-
 src/bot/bot.service.ts | 16 +++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 3e9d241..d5bb941 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -2,7 +2,8 @@
 
 - [x] MeiliSearch 单条消息添加索引效率似乎十分不佳。需要有个打包机制，满 100 条或者 60 秒打包提交一次之类的。
 - [x] 如果有打包提交机制，那就需要有 graceful 退出，或者缓存
-- [ ] 支持 OCR 图片搜索
+- [x] 支持 OCR 图片搜索
+- [ ] 支持图片归档到 S3
 - [ ] 支持多条记录合并上下文搜索，应对说话喜欢换行的人
 - [ ] 为没有头像的人生成基于名字的默认头像
 - [ ] 配置消息队列分批大小和超时
diff --git a/src/bot/bot.service.ts b/src/bot/bot.service.ts
index bb2bd1a..c7f89c4 100644
--- a/src/bot/bot.service.ts
+++ b/src/bot/bot.service.ts
@@ -121,18 +121,16 @@ export class BotService {
       timestamp: msg.date * 1000,
     }
 
-    if (msg?.photo?.length) {
-      await this.handlePhoto(msg.photo, baseMessage)
+    if (searchable) {
+      await this.index.queueMessage({
+        ...baseMessage,
+        text: searchable,
+      })
     }
 
-    if (!searchable) {
-      return
+    if (msg?.photo?.length) {
+      await this.handlePhoto(msg.photo, baseMessage)
     }
-
-    await this.index.queueMessage({
-      ...baseMessage,
-      text: searchable,
-    })
   }
 
   private async handlePhoto(