[backport] fix 2 errors with /calc and /av

retrixe · Oct 16, 2021 · fb0a376 · fb0a376
1 parent 2af8182
commit fb0a376
Show file tree

Hide file tree

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

diff --git a/server/bot/commands/utilities.ts b/server/bot/commands/utilities.ts
@@ -473,7 +473,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: {