Fixes

gpont · Aug 7, 2024 · 65d91aa · 65d91aa
1 parent 68d2fe1
commit 65d91aa
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/controllers/bot.test.ts b/src/controllers/bot.test.ts
@@ -117,6 +117,24 @@ describe('Bot Commands', () => {
         ),
       );
     });
+
+    it('should error with duplicate group code', async () => {
+      const chatId = createChat();
+      await createGroup(String(chatId));
+      const sendMessage = jest.spyOn(bot, 'sendMessage');
+      const msg = {
+        chat: { id: chatId },
+        text: '/create_group',
+        from: { username: 'test' },
+      } as unknown as TelegramBot.Message;
+
+      await emitMsg(msg);
+
+      expect(sendMessage).toHaveBeenCalledWith(
+        msg.chat.id,
+        expect.stringContaining('Группа уже создана'),
+      );
+    });
   });
 
   describe('join_group', () => {

diff --git a/src/controllers/bot.ts b/src/controllers/bot.ts
@@ -58,6 +58,11 @@ const rawBotHandlers: [RegExp, THandler][] = [
     /\/create_group/,
     (bot) => async (msg) => {
       const chatId = msg.chat.id;
+      const group = await findGroupByCode(String(chatId));
+      if (group) {
+        bot.sendMessage(chatId, texts.group_already_created + group.code);
+        return;
+      }
       await createGroup(String(chatId));
       bot.sendMessage(chatId, `${texts.group_created} ${chatId}`);
     },
@@ -178,11 +183,11 @@ const rawBotHandlers: [RegExp, THandler][] = [
       const chatId = msg.chat.id;
 
       const group = await checkAndGetGroup(msg);
-      const movies = await checkAndGetMoviesList(group.id);
+      const movies = (await checkAndGetMoviesList(group.id)).filter(
+        (movie) => !movie.is_vetoed,
+      );
 
-      const movie = movies.filter((movie) => !movie.is_vetoed)[
-        Math.floor(Math.random() * movies.length)
-      ];
+      const movie = movies[Math.floor(Math.random() * movies.length)];
       bot.sendMessage(chatId, getMovieDescription(movie), MSG_OPTIONS);
     },
   ],

diff --git a/src/texts.json b/src/texts.json
@@ -4,6 +4,7 @@
   "group_created": "Группа создана! Код для присоединения:",
   "joined_group": "Вы присоединились к группе!",
   "group_not_found": "Группа с таким кодом не найдена.",
+  "group_already_created": "Группа уже создана. Код присоединения: ",
   "no_group_code": "Код группы не указан.",
   "movie_suggested": "Фильм предложен",
   "not_in_group": "Вы не состоите ни в одной группе.",