Merge pull request #198 from Ohtuproju2021syksy/v13

V13

Author: EgoTastic

src/db/services/channelService.js

@@ -107,18 +107,6 @@ const saveChannelIdWithName = async (id, channelName, Channel) => {
     { where: { name: channelName } });
 };
 
-const uncapitalize = async (courseId, Channel) => {
-  const channels = await findChannelsByCourse(courseId, Channel);
-  channels.map(async (channel) => {
-    console.log(channel.name);
-    const uncapName = channel.name.toLowerCase();
-    channel.name = uncapName;
-    await channel.save();
-  });
-  await Promise.all(channels);
-};
-
-
 module.exports = {
   findChannelFromDbByName,
   findChannelFromDbByDiscordId,
@@ -133,5 +121,4 @@ module.exports = {
   getAllChannels,
   editChannelName,
   saveChannelTopicToDb,
-  uncapitalize,
 };

src/discordBot/commands/admin/list_courses.js

@@ -22,15 +22,9 @@ const execute = async (message, args, models) => {
       statusMessage += "\n";
     }
 
-    if (statusMessage.length >= 2000 && statusMessage < 4000) {
-      message.reply("Courses:\n" + statusMessage.substring(0, 1987));
-      message.reply(statusMessage.substring(1988, statusMessage.length - 1));
-    }
-    else if (statusMessage.length < 2000) {
-      message.reply("Courses:\n" + statusMessage);
-    }
-    else {
-      message.reply("Too long message");
+    for (let i = 0; i < statusMessage.length;) {
+      message.reply(statusMessage.substring(i, i + 1000));
+      i += 1000;
     }
 
 
@@ -41,17 +35,6 @@ const execute = async (message, args, models) => {
       statusMessage += currentChannel.name + " " + currentChannel.discordId + "\n";
     }
 
-    if (statusMessage.length >= 2000 && statusMessage < 4000) {
-      message.reply("Courses:\n" + statusMessage.substring(0, 1987));
-      message.reply(statusMessage.substring(1988, statusMessage.length - 1));
-    }
-    else if (statusMessage.length < 2000) {
-      message.reply("Courses:\n" + statusMessage);
-    }
-    else {
-      message.reply("Too long message");
-    }
-
   }
 };
 

src/discordBot/commands/admin/server_status.js

@@ -75,7 +75,7 @@ const execute = async (message, args, models) => {
               statusMessage += "Channel: " + currentChannel.name + " Course members can speak in locked channel\n";
             }
           }
-          else if (!courseRole.permissionsIn(channelFound).has("SEND_MESSAGES")) {
+          else if (!courseRole.permissionsIn(channelFound).has("SEND_MESSAGES") && !currentChannel.name.includes("announcement")) {
             statusMessage += "Channel: " + currentChannel.name + " Course members can't talk in unlocked channel\n";
           }
         }