Merge pull request #46 from Yey007/fix/concurrency-improvements

Improved concurrency

Author: utkudotdev

src/services/interface/commandexecutor.ts

@@ -68,20 +68,20 @@ export class CommandExecutor {
                 accepts at most ${allLength} ${allPlural} but you provided ${args.length - 1}.`;
 
                 embed.setFooter(`Use "help ${args[0]}" for more information.`);
-                checkedSend(message.channel, embed);
+                await checkedSend(message.channel, embed);
                 Logger.verbose(
                     `Execution of command "${trimmed}" aborted because number of arguments was wrong`,
                     LogOrigin.Discord
                 );
                 return;
             }
             Logger.verbose(`Executing command "${trimmed}"`, LogOrigin.Discord);
-            cmd.execute(message, args);
+            await cmd.execute(message, args);
         } else {
             const embed = this.maker.makeWarning();
             embed.title = 'Command not found';
             embed.description = `The command "${args[0]}" does not exist.`;
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             Logger.verbose(
                 `Execution of command "${trimmed}" aborted because command was not found`,
                 LogOrigin.Discord

src/services/interface/commands/help.ts

@@ -17,13 +17,13 @@ export class HelpCommand extends BotCommand {
 
     public async execute(message: Message, args: string[]): Promise<void> {
         if (args[1]) {
-            this.specificHelp(message, args[1]);
+            await this.specificHelp(message, args[1]);
         } else {
-            this.genericHelp(message);
+            await this.genericHelp(message);
         }
     }
 
-    private genericHelp(message: Message) {
+    private async genericHelp(message: Message) {
         const e = this.maker.makeInfo();
         e.title = 'Help';
 
@@ -45,12 +45,12 @@ export class HelpCommand extends BotCommand {
             `You can address the bot in two ways\n\n1. Mention the bot at the start of your message, like this: **${message.guild.me.toString()} command**\n2. Use the prefix (! by default), like this: **!command**`
         );
 
-        checkedSend(message.channel, e);
+        await checkedSend(message.channel, e);
         Logger.verbose(`Generic help sent in channel with id ${message.channel.id}`, LogOrigin.Discord);
     }
 
     //Argument order, which arguments are required etc.
-    private specificHelp(message: Message, command: string) {
+    private async specificHelp(message: Message, command: string) {
         const cmd = this.mapper.map(command);
         if (cmd !== undefined) {
             const embed = this.maker.makeInfo();
@@ -71,13 +71,13 @@ export class HelpCommand extends BotCommand {
             if (argumentString !== '') {
                 embed.addField('Arguments', argumentString);
             }
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             Logger.verbose(`Specific help sent in channel ${message.channel.id}`, LogOrigin.Discord);
         } else {
             const embed = this.maker.makeWarning();
             embed.title = 'Command not found';
             embed.description = `The command "${command}" does not exist.`;
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             Logger.verbose(
                 `Command not found while trying to send specific help in channel with id ${message.channel.id}`,
                 LogOrigin.Discord

src/services/interface/commands/join.ts

@@ -27,20 +27,20 @@ export class ChannelJoinCommand extends BotCommand {
                 const embed = this.embedMaker.makeWarning();
                 embed.title = 'Channel Unavailable';
                 embed.description = "I can't join that channel. Please make sure I have the correct permissions.";
-                checkedSend(message.channel, embed);
+                await checkedSend(message.channel, embed);
                 Logger.verbose(`Unable to join voice channel with id ${vc.channel.id}`, LogOrigin.Discord);
                 return;
             }
 
             //Due to the wacky API on recieving audio, something must be sent before we can recieve anything
             const dispatcher = vc.play(process.cwd() + '/resources/dummy.mp3', { volume: 0 });
 
-            dispatcher.on('error', () => {
+            dispatcher.on('error', async () => {
                 const embed = this.embedMaker.makeError();
                 embed.title = 'Transcription Error';
                 embed.description =
                     'There was a problem recieving audio from this channel. If this keeps happening, please contact the author.';
-                checkedSend(message.channel, embed);
+                await checkedSend(message.channel, embed);
                 Logger.warn(`Unable to dispatch audio in voice channel with id ${vc.channel.id}`, LogOrigin.Discord);
             });
         }

src/services/interface/commands/prefix.ts

@@ -37,24 +37,25 @@ export class PrefixCommand extends BotCommand {
         if (prefix.length > 5) {
             const embed = this.maker.makeWarning();
             embed.description = 'Prefix cannot be more than 5 characters.';
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             return;
         }
-        await this.repo.save<GuildSettings>({
+        const repoSave = this.repo.save<GuildSettings>({
             guildId: message.guild.id,
             prefix: prefix
         });
         const embed = this.maker.makeSuccess();
         embed.description = `Prefix set to \`${prefix}\``;
-        checkedSend(message.channel, embed);
+        const send = checkedSend(message.channel, embed);
+        await Promise.all([repoSave, send]);
         Logger.verbose(`Sent prefix set success message in channel with id ${message.channel.id}`, LogOrigin.Discord);
     }
 
     private async prefixGet(message: Message): Promise<void> {
         const embed = this.maker.makeInfo();
         const settings = await this.repo.findOneOrDefaults(message.guild.id);
         embed.description = `The prefix is currently \`${settings.prefix}\``;
-        checkedSend(message.channel, embed);
+        await checkedSend(message.channel, embed);
         Logger.verbose(`Sent prefix get message in channel with id ${message.channel.id}`, LogOrigin.Discord);
     }
 

src/services/interface/commands/recordingpermission.ts

@@ -29,32 +29,34 @@ export class RecordingPermissionCommand extends BotCommand {
     public async execute(message: Message, args: string[]): Promise<void> {
         if (args[1]) {
             const maker = this.maker;
-            const success = function () {
+            const success = async function () {
                 const embed = maker.makeSuccess();
                 embed.description = `Recording permission set to \`${args[1]}\``;
-                checkedSend(message.channel, embed);
+                await checkedSend(message.channel, embed);
                 Logger.verbose(
                     `Sent recording permission set success message in channel with id ${message.channel.id}`,
                     LogOrigin.Discord
                 );
             };
 
             if (args[1] === 'accept') {
-                await this.repo.save<UserSettings>({
+                const repoSave = this.repo.save<UserSettings>({
                     userId: message.member.user.id,
                     permission: RecordingPermissionState.Consent
                 });
-                success();
+                const successSend = success();
+                await Promise.all([repoSave, successSend]);
                 return;
             } else if (args[1] === 'deny') {
-                await this.repo.save<UserSettings>({
+                const repoSave = this.repo.save<UserSettings>({
                     userId: message.member.user.id,
                     permission: RecordingPermissionState.NoConsent
                 });
-                success();
+                const successSend = success();
+                await Promise.all([repoSave, successSend]);
                 return;
             }
-            message.channel.send('Invalid setting. Acceptable arguments are `accept` and `deny`.');
+            await checkedSend(message.channel, 'Invalid setting. Acceptable arguments are `accept` and `deny`.');
             Logger.verbose(
                 `Sent recording permission set failure message in channel with id ${message.channel.id}`,
                 LogOrigin.Discord
@@ -64,7 +66,7 @@ export class RecordingPermissionCommand extends BotCommand {
             const settings = await this.repo.findOneOrDefaults(message.member.user.id);
             const perm = settings.permission === RecordingPermissionState.Consent ? 'accept' : 'deny';
             embed.description = `Your recording preference is currently set to \`${perm}\``;
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             Logger.verbose(
                 `Sent recording permission get message in channel with id ${message.channel.id}`,
                 LogOrigin.Discord

src/services/interface/commands/transcriptchannel.ts

@@ -46,30 +46,31 @@ export class TranscriptChannelCommand extends BotCommand {
         } else {
             const embed = this.maker.makeWarning();
             embed.description = 'Invalid operation. Valid operations are `create`, `remove`, and `all`';
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
         }
     }
 
     @managerOrAdminRequired
     public async setChannel(message: Message, args: string[]): Promise<void> {
         const vc = message.guild.channels.cache.find((x) => x.name === args[2] && x.type === 'voice');
         if (vc !== undefined) {
-            await this.repo.save<TranscriptionPair>({
+            const repoSave = this.repo.save<TranscriptionPair>({
                 voiceId: vc.id,
                 textId: message.channel.id,
                 guildId: message.guild.id
             });
             const embed = this.maker.makeSuccess();
             embed.description = `Set the transcription channel for \`${args[2]}\` to this channel`;
-            checkedSend(message.channel, embed);
+            const send = checkedSend(message.channel, embed);
+            await Promise.all([repoSave, send]);
             Logger.verbose(
                 `Sent transcription channel set success message in channel with id ${message.channel.id}`,
                 LogOrigin.Discord
             );
         } else {
             const embed = this.maker.makeWarning();
             embed.description = `Voice channel \`${args[2]}\` not found`;
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             Logger.verbose(
                 `Sent transcription channel set failure message in channel with id ${message.channel.id}`,
                 LogOrigin.Discord
@@ -89,18 +90,19 @@ export class TranscriptChannelCommand extends BotCommand {
                 return;
             }
 
-            await this.repo.delete({ voiceId: vc.id });
+            const del = this.repo.delete({ voiceId: vc.id });
             const embed = this.maker.makeSuccess();
             embed.description = `Removed the transcription channel for \`${args[2]}\``;
-            checkedSend(message.channel, embed);
+            const send = checkedSend(message.channel, embed);
+            await Promise.all([del, send]);
             Logger.verbose(
                 `Sent transcription channel remove success message in channel with id ${message.channel.id}`,
                 LogOrigin.Discord
             );
         } else {
             const embed = this.maker.makeWarning();
             embed.description = `Voice channel \`${args[2]}\` not found`;
-            checkedSend(message.channel, embed);
+            await checkedSend(message.channel, embed);
             Logger.verbose(
                 `Sent transcription channel remove failure message in channel with id ${message.channel.id}`,
                 LogOrigin.Discord
@@ -123,7 +125,7 @@ export class TranscriptChannelCommand extends BotCommand {
         for (const namePair of allNames) {
             embed.description += `${namePair.voice} :arrow_right: ${namePair.text}\n`;
         }
-        checkedSend(message.channel, embed);
+        await checkedSend(message.channel, embed);
     }
 
     public get help(): string {

src/services/permissions/rolemanager.ts

@@ -7,11 +7,11 @@ import { LogOrigin } from '../logging/logorigin';
 export class RoleManager {
     public readonly roleName = 'TranscriberBot Manager';
 
-    public create(guild: Guild): Promise<Role> {
+    public async create(guild: Guild): Promise<Role> {
         const role = guild.roles.cache.find((role) => role.name === this.roleName);
         if (!role) {
             Logger.verbose(`Creating manager role in guild with id ${guild.id}`, LogOrigin.Discord);
-            return guild.roles.create({
+            return await guild.roles.create({
                 data: {
                     name: this.roleName,
                     color: 0x4399b5,
@@ -24,8 +24,6 @@ export class RoleManager {
             `Found existing manager role, returning that instead of creating a new one for guild with id ${guild.id}`,
             LogOrigin.Discord
         );
-        return new Promise((resolutionFunc: (role: Role) => void) => {
-            resolutionFunc(role);
-        });
+        return role;
     }
 }

src/services/permissions/rolerequierments.ts

@@ -13,7 +13,7 @@ export function managerOrAdminRequired(
     descriptor: TypedPropertyDescriptor<(message: Message, ...args: unknown[]) => Promise<void>>
 ): void {
     const original = descriptor.value;
-    descriptor.value = function (message: Message, ...args: unknown[]): Promise<void> {
+    descriptor.value = async function (message: Message, ...args: unknown[]): Promise<void> {
         //Dumb but only way
         const roleManager = Container.get(RoleManager);
         const embedMaker = Container.get(StandardEmbedMaker);
@@ -27,12 +27,12 @@ export function managerOrAdminRequired(
                     `Allowing execution of restricted command because user with id ${message.member.user.id} had manager role or administrator level access`,
                     LogOrigin.Discord
                 );
-                return original.call(this, message, ...args);
+                return await original.call(this, message, ...args);
             } else {
                 const embed = embedMaker.makeWarning();
                 embed.title = 'Permission Denied';
                 embed.description = `You must have the role \`${roleManager.roleName}\` or be an administrator in order to use this command.`;
-                checkedSend(message.channel, embed);
+                await checkedSend(message.channel, embed);
                 Logger.verbose(
                     `Did not allow execution of restricted command because user with id ${message.member.user.id} did not have manager role or administrator level access`,
                     LogOrigin.Discord

src/services/transcription/recpermissiongetter.ts

@@ -29,18 +29,19 @@ export class RecPermissionGetter {
     }
 
     private async askUser(user: User): Promise<RecordingPermissionState> {
-        await this.userSettingsRepo.save<UserSettings>({
+        const save = this.userSettingsRepo.save<UserSettings>({
             userId: user.id,
             permission: RecordingPermissionState.Unknown
         });
 
         let dm: DMChannel;
         try {
             dm = await user.createDM();
-            await dm.send(
+            const send = dm.send(
                 "Hey! I'm currently transcribing audio from the voice channel you're in, but before I can transcribe your voice," +
                     ' I need your permission. Type `!accept` to accept and `!deny` to deny.'
             );
+            await Promise.all([save, send]);
             Logger.verbose(
                 `Asked for recording permission from user with id ${user.id}. Awaiting response...`,
                 LogOrigin.Transcription
@@ -72,26 +73,28 @@ export class RecPermissionGetter {
                 }
             );
         } catch (error) {
-            dm.send('Assumed no permission after 30 seconds.');
+            await dm.send('Assumed no permission after 30 seconds.');
             Logger.verbose(`No accept or deny message recieved from user with id ${user.id}`, LogOrigin.Transcription);
             return RecordingPermissionState.NoConsent;
         }
 
         const preference = collected.first().content;
         if (preference === '!accept') {
-            await this.userSettingsRepo.save<UserSettings>({
+            const save = this.userSettingsRepo.save<UserSettings>({
                 userId: user.id,
                 permission: RecordingPermissionState.Consent
             });
-            dm.send(`Preference set to \`${preference.slice(1)}\``);
+            const send = dm.send(`Preference set to \`${preference.slice(1)}\``);
+            await Promise.all([save, send]);
             Logger.verbose(`Recieved accept message from user with id ${user.id}`, LogOrigin.Transcription);
             return RecordingPermissionState.Consent;
         } else {
-            await this.userSettingsRepo.save<UserSettings>({
+            const save = this.userSettingsRepo.save<UserSettings>({
                 userId: user.id,
                 permission: RecordingPermissionState.NoConsent
             });
-            dm.send(`Preference set to \`${preference.slice(1)}\``);
+            const send = dm.send(`Preference set to \`${preference.slice(1)}\``);
+            await Promise.all([save, send]);
             Logger.verbose(`Recieved deny message from user with id ${user.id}`, LogOrigin.Transcription);
             return RecordingPermissionState.NoConsent;
         }

src/services/transcription/transcriptionmanager.ts

@@ -8,6 +8,7 @@ import { RecordingPermissionState } from '../interface/misc/misctypes';
 import { Logger } from '../logging/logger';
 import { LogOrigin } from '../logging/logorigin';
 import { Service } from 'typedi';
+import { checkedSend } from '../interface/misc/checkedsend';
 
 @Service()
 export class TranscriptionManager {
@@ -34,9 +35,9 @@ export class TranscriptionManager {
 
         const channel = await this.transcriptionChannelGetter.get(member.guild, vc.channel.id);
         if (channel !== undefined) {
-            this.transcriber.transcribe(stream, function (words: string, err: unknown) {
+            this.transcriber.transcribe(stream, async function (words: string, err: unknown) {
                 if (err === undefined) {
-                    s.send(member, channel, vc.channel.name, words);
+                    await s.send(member, channel, vc.channel.name, words);
                     Logger.verbose(
                         `Transcription succeeded for user with id ${member.user.id} in voice channel with id ${vc.channel.id}`,
                         LogOrigin.Transcription
@@ -45,7 +46,7 @@ export class TranscriptionManager {
                     const e = embed.makeWarning();
                     e.description =
                         "Problem transcribing audio. This usually doesn't happen, but it's nothing to worry about.";
-                    channel.send(e);
+                    await checkedSend(channel, e);
                     Logger.verbose(
                         `Transcription failed for user with id ${member.user.id} in voice channel with id ${vc.channel.id}`,
                         LogOrigin.Transcription