Skip to content

Commit

Permalink
[NITPICK] Fun Category
Browse files Browse the repository at this point in the history
Weekly and Daily are not yet finished waiting for other changes. (WeeklyCommand vote branch and DailyCommand for me to make a new design)
  • Loading branch information
wizardlink committed Apr 20, 2018
1 parent b877996 commit a963e29
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/commands/fun/8ball.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { CommandHandler } from '../../structures/CommandHandler';
class EigthBallCommand extends Command {
private _responses: string[] = [
'I want it too! <:KannaHug:299650645001240578>',
'aye (Yes) <:KannaLolipop:315264556282675200>',
'aye... (No) <:FeelsKannaMan:341054171212152832>',
'aye! <:KannaLolipop:315264556282675200>',
'no... <:FeelsKannaMan:341054171212152832>',
'do not do it! <:KannaAyy:315270615844126720>',
'why?! <:KannaWtf:320406412133924864>',
'I have to gather more information first <:KannaISee:315264557843218432>',
Expand All @@ -24,7 +24,7 @@ class EigthBallCommand extends Command {
}

public parseArgs(message: Message, args: string[]): string[] | string {
if (!args.length) return 'you have to ask a question! 👀';
if (!args.length) return 'you have to ask a question! <:SherlockKanna:430499051075665951>';

return args;
}
Expand Down
10 changes: 7 additions & 3 deletions src/commands/fun/choose.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ class ChooseCommand extends Command {
super(handler, {
aliases: ['choice'],
description: 'Let me choose between things',
examples: ['choose Tohru|Kanna', 'choose Tohru Kanna'],
examples: [
'choose Tohru | Me', 'choose Tohru Kanna',
'choose Tohru or Me',
'choose Tohru, Me, or Kobayashi-san',
],
name: 'choose',
usage: 'choose <...Choices>',
});
Expand All @@ -18,8 +22,8 @@ class ChooseCommand extends Command {
if (!args.length) return `you have to give me something to choose from! (\`${this.usage}\`)`;

const joined: string = args.join(' ');
const options: string[] = joined.includes('|')
? joined.split('|')
const options: string[] = /\||or|,/ig.test(joined)
? joined.replace(/\s*(\||or|,)\s*/ig, ' ').split(' ')
: args;

if (!options.length) return `you have to give me something to choose from! (\`${this.usage}\`)`;
Expand Down

0 comments on commit a963e29

Please sign in to comment.