Merge bridge and telegramBot

Author: tire95

__tests__/jest/slashCommands/slash_lock_chat.test.js

@@ -6,7 +6,7 @@ const {
   checkCourseCooldown } = require("../../../src/discordBot/services/service");
 const { setCourseToLocked, findCourseFromDb } = require("../../../src/db/services/courseService");
 
-jest.mock("../../../src/bridge/service");
+jest.mock("../../../src/telegramBot/bridge/service");
 jest.mock("../../../src/discordBot/services/message");
 jest.mock("../../../src/discordBot/services/confirm");
 jest.mock("../../../src/discordBot/services/service");

__tests__/jest/slashCommands/slash_unlock_chat.test.js

@@ -6,7 +6,7 @@ const {
   checkCourseCooldown } = require("../../../src/discordBot/services/service");
 const { setCourseToUnlocked, findCourseFromDb } = require("../../../src/db/services/courseService");
 
-jest.mock("../../../src/bridge/service");
+jest.mock("../../../src/telegramBot/bridge/service");
 jest.mock("../../../src/discordBot/services/message");
 jest.mock("../../../src/discordBot/services/confirm");
 jest.mock("../../../src/discordBot/services/service");

src/db/hooks/courseHooks.js

@@ -13,7 +13,7 @@ const {
   setEmojisUnhide,
   setCoursePositionABC,
   updateGuide } = require("../../discordBot/services/service");
-const { lockTelegramCourse, unlockTelegramCourse } = require("../../bridge/service");
+const { lockTelegramCourse, unlockTelegramCourse } = require("../../telegramBot/bridge/service");
 const { courseAdminRole } = require("../../../config.json");
 const { Op } = require("sequelize");
 const { editChannelNames, createDefaultChannelsToDatabase } = require("../../db/services/channelService");

src/db/models/Course.js

@@ -23,11 +23,13 @@ module.exports = (sequelize, DataTypes) => {
     private: {
       type: DataTypes.BOOLEAN,
       allowNull: true,
+      defaultValue: false,
       unique: false,
     },
     locked: {
       type: DataTypes.BOOLEAN,
       allowNull: true,
+      defaultValue: false,
       unique: false,
     },
     categoryId: {

src/db/services/courseService.js

@@ -106,7 +106,9 @@ const findUnlockedCoursesFromDb = async (order, Course) => {
     attributes: ["id", "code", "fullName", "name"],
     order: [order],
     where: {
-      locked: false,
+      locked: {
+        [Sequelize.Op.or]: [false, null],
+      },
     },
     raw: true,
   });

src/discordBot/commands/faculty/delete_bridge.js

@@ -3,7 +3,7 @@ const { sendEphemeral, editEphemeral } = require("../../services/message");
 const { confirmChoice } = require("../../services/confirm");
 const { facultyRole } = require("../../../../config.json");
 const { findCourseFromDb } = require("../../../db/services/courseService");
-const { sendMessageToTelegram } = require("../../../bridge/service");
+const { sendMessageToTelegram } = require("../../../telegramBot/bridge/service");
 
 
 const execute = async (interaction, client, models) => {

src/index.js

@@ -3,7 +3,7 @@ const { sequelize, connectToDatabase } = require("./db/index");
 const startServer = require("./server/server");
 const { client, startDiscordBot } = require("./discordBot/index");
 const { telegramClient, startTelegramBot } = require("./telegramBot/index");
-const { startBridge } = require("./bridge/index");
+const { startBridge } = require("./telegramBot/bridge/index");
 const { resetCounters } = require("./promMetrics/promCounters");
 
 const start = async () => {

src/bridge/index.js renamed to src/telegramBot/bridge/index.js

@@ -1,7 +1,7 @@
 const { initService, handleBridgeMessage } = require("./service");
-const { getCourseNameFromCategory } = require("../discordBot/services/service");
-const { findChannelFromDbByName } = require("../db/services/channelService");
-const models = require("../db/dbInit");
+const { getCourseNameFromCategory } = require("../../discordBot/services/service");
+const { findChannelFromDbByName } = require("../../db/services/channelService");
+const models = require("../../db/dbInit");
 
 const startBridge = async (discordClient, telegramClient) => {
   initService(discordClient, telegramClient);

src/bridge/service.js renamed to src/telegramBot/bridge/service.js

@@ -1,13 +1,13 @@
-const { sendErrorReportNoInteraction } = require("../discordBot/services/message");
-const { logError, logNoInteractionError } = require("../discordBot/services/logger");
+const { sendErrorReportNoInteraction } = require("../../discordBot/services/message");
+const { logError, logNoInteractionError } = require("../../discordBot/services/logger");
 let discordClient;
 let telegramClient;
 const keywords = ["crypto", "krypto", "btc", "doge", "btc", "eth", "musk", "money", "$", "usd", "bitcoin", "muskx.co", "coin", "elonmusk", "prize", "еlonmusk", "btc", "cash", "million",
   "interest", "investment", "join"];
 const cyrillicPattern = /^\p{Script=Cyrillic}+$/u;
 
-const { findCourseFromDb } = require("../db/services/courseService");
-const { bridgedMessagesCounter } = require("../promMetrics/promCounters");
+const { findCourseFromDb } = require("../../db/services/courseService");
+const { bridgedMessagesCounter } = require("../../promMetrics/promCounters");
 
 const validDiscordChannel = async (courseName) => {
   const guild = await discordClient.guilds.fetch(process.env.GUILD_ID);

src/telegramBot/events/animation.js

@@ -1,4 +1,4 @@
-const { createDiscordUser, validDiscordChannel, sendMessageToDiscord } = require("../../bridge/service");
+const { createDiscordUser, validDiscordChannel, sendMessageToDiscord } = require("../bridge/service");
 
 const execute = async (ctx, message, telegramClient, Course) => {
   const id = ctx.message.chat.id;