Fix 2 internal errors with /calc and /av.

retrixe · Aug 31, 2021 · 80b48e4 · 80b48e4
1 parent 4c80771
commit 80b48e4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/commands/games.ts b/src/commands/games.ts
@@ -268,7 +268,7 @@ More info here: https://mathjs.org/docs/expressions/syntax.html`,
   generator: (message, args) => handleCalculate.commonGenerator(args.join(' ')),
   commonGenerator: (expression: string) => {
     try {
-      return `${evaluate(expression.split(',').join('.').split('÷').join('/').toLowerCase())}`
+      return `${evaluate(expression.split(',').join('.').split('÷').join('/').toLowerCase())}`.trim()
     } catch (e) {
       return { content: 'Invalid expression >_<', error: true }
     }

diff --git a/src/commands/utilities.ts b/src/commands/utilities.ts
@@ -499,7 +499,7 @@ export const handleAvatar: Command = {
     let user: Message['author'] = getUser(message, args.join(' ')) || message.author
     if (!user && message.mentions.length !== 0) user = message.mentions[0]
     const member = message.member.guild.members.get(user.id)
-    const format = user.avatar.startsWith('a_') ? 'gif' : 'png'
+    const format = user.avatar && user.avatar.startsWith('a_') ? 'gif' : 'png'
     return {
       content: '**Avatar:**',
       embed: {