format messages

src/commands/match/getMatch.ts

@@ -37,7 +37,9 @@ export default class GetMatchCommand extends Command {
 
     const hasScreenshot = match.screenshotPath != null;
 
-    let message = `Match ${match.id} - ${match.getOutcome()}${!hasScreenshot ? ` (no screenshot provided)` : ''}\n`;
+    let message = `\`Team ${match.team1.teamName}\` vs \`Team ${match.team2.teamName}\`\n`;
+    message += `${match.getOutcome()} | Match ID: ${matchId} `;
+    message += !hasScreenshot ? `(no screenshot provided)\n` : '\n';
     message += printTeam(match.team1);
     message += printTeam(match.team2);
 

src/commands/match/storeMatchImage.ts

@@ -47,13 +47,15 @@ export default class StoreImageCommand extends Command {
       return end;
     }
 
+    const oldScreenshot = match.screenshotPath;
     match.matchResult = matchResult;
     match.screenshotPath = msg.attachments.first().url;
     match.save();
 
-    msg.say(
-      `Added \`${match.screenshotPath}\` to Match with ID \`${match.id}\`, and set result as\`${match.matchResult}\``,
-    );
+    let message = `Changed Screenshot from ${oldScreenshot} to ${match.screenshotPath}\n`;
+    message += `for Match ID ${match.id} and set result to ${matchResult}`;
+
+    msg.say(message);
     return end;
   }
 }

src/commands/match/updateMatchResult.ts

@@ -36,7 +36,7 @@ export default class UpdateMatchResultCommand extends Command {
   async run(msg: CommandoMessage, { matchId, matchResult }: PromptArgs) {
     const end = new Message(null, null, msg.channel);
 
-    const match = await Match.findOne({ where: { id: matchId } });
+    const match = await Match.findOne({ where: { id: matchId }, include: [{ all: true }] });
 
     if (match == null) {
       msg.say(`Match with ID ${matchId} was not found!`);

src/core/print.ts

@@ -1,8 +1,15 @@
 import { Team } from '../db/models';
 
 export function printTeam(team: Team): string {
+  const skillTotal =
+    team.player1.skillLevel +
+    team.player2.skillLevel +
+    team.player3.skillLevel +
+    team.player4.skillLevel +
+    team.player5.skillLevel;
+
   let res = '```\n';
-  res += `Team ${team.teamName} (ID: ${team.id})`;
+  res += `Team ${team.teamName} (Total Skill: ${skillTotal} | ID: ${team.id})`;
   res += `\n\tLevel ${team.player1.skillLevel}\t${team.player1.userTag}`;
   res += `\n\tLevel ${team.player2.skillLevel}\t${team.player2.userTag}`;
   res += `\n\tLevel ${team.player3.skillLevel}\t${team.player3.userTag}`;

src/db/models/Match.model.ts

@@ -25,9 +25,9 @@ export default class Match extends Model {
 
   getOutcome(): string {
     if (this.matchResult == 1) {
-      return 'Team 1 won';
+      return `Team ${this.team1.teamName} won`;
     } else if (this.matchResult == 2) {
-      return 'Team 2 won';
+      return `Team ${this.team2.teamName} won`;
     }
 
     return 'Draw';