Skip to content

Commit

Permalink
i dont feel like noting each change
Browse files Browse the repository at this point in the history
  • Loading branch information
@PartTimeJS
PartTimeJS committed Sep 2, 2020
1 parent cd5a274 commit 534d158
Show file tree
Hide file tree
Showing 14 changed files with 56 additions and 47 deletions.
9 changes: 0 additions & 9 deletions src/commands/subscription/pokemon/cancel.js
View file

This file was deleted.

5 changes: 2 additions & 3 deletions src/commands/subscription/pokemon/collect_detail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,11 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
switch (CollectedMsg.content.toLowerCase()) {
case "save":
case "yes":
collector.stop("Yes");
collector.stop(true);
break;
case "no":
case "cancel":
return Functions.Cancel(WDR, Functions, Message, Member);
collector.stop(null);
collector.stop(false);
break;
default:
CollectedMsg.reply("`" + CollectedMsg.content + "` is an Invalid Input. " + requirements).then(m => m.delete({
Expand Down
5 changes: 4 additions & 1 deletion src/commands/subscription/pokemon/create.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,10 @@ module.exports = (WDR, Functions, Message, Member, advanced) => {
create.geotype = await Functions.DetailCollect(WDR, Functions, "Geofence", Member, Message, null, "Please respond with 'Yes' or 'No'", create);
}

let confirm = await Functions.DetailCollect(WDR, Functions, "Confirm-Add", Member, Message, null, "Type 'Yes' or 'No'. Subscription will be saved.", create);
create.confirm = await Functions.DetailCollect(WDR, Functions, "Confirm-Add", Member, Message, null, "Type 'Yes' or 'No'. Subscription will be saved.", create);
if (create.confirm === false) {
Functions.Cancel(WDR, Functions, Message, Member);
}

let query =
`INSERT INTO
Expand Down
6 changes: 4 additions & 2 deletions src/commands/subscription/pokemon/preset.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ module.exports = async (WDR, Functions, Message, Member) => {
let preset_name = preset_names[preset];
preset = WDR.Presets.Pokemon.get(preset_name);

// RETRIEVE AREA CONFIMATION FROM USER
preset.areas = await Functions.DetailCollect(WDR, Functions, "Geofence", Member, Message, undefined, "Please respond with 'Yes' or 'No'", preset);
if (preset.areas == Message.discord.name) {
preset.geotype = "city";
} else {
preset.geotype = Member.db.geotype;
}
// RETRIEVE CONFIRMATION FROM USER

preset.confirm = await Functions.DetailCollect(WDR, Functions, "Confirm-Add", Member, Message, undefined, "Type 'Yes' or 'No'. Subscription will be saved.", preset);
if (preset.confirm === false) {
Functions.Cancel(WDR, Functions, Message, Member);
}

WDR.wdrDB.query(`
INSERT INTO
Expand Down
4 changes: 2 additions & 2 deletions src/commands/subscription/pvp/collect_detail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
switch (CollectedMsg.content.toLowerCase()) {
case "save":
case "yes":
collector.stop("Yes");
collector.stop(true);
break;
case "no":
case "cancel":
collector.stop("Cancel");
collector.stop(false);
break;
default:
CollectedMsg.reply("`" + CollectedMsg.content + "` is an Invalid Input. " + requirements).then(m => m.delete({
Expand Down
3 changes: 3 additions & 0 deletions src/commands/subscription/pvp/create.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ module.exports = async (WDR, Functions, Message, Member, advanced) => {
create.geotype = await Functions.DetailCollect(WDR, Functions, "Geofence", Member, Message, null, "Please respond with 'Yes' or 'No'", create);

create.confirm = await Functions.DetailCollect(WDR, Functions, "Confirm-Add", Member, Message, null, "Type 'Yes' or 'No'. Subscription will be saved.", create);
if (create.confirm === false) {
Functions.Cancel(WDR, Functions, Message, Member);
}

let query = `
INSERT INTO
Expand Down
11 changes: 6 additions & 5 deletions src/commands/subscription/pvp/remove.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = (WDR, Functions, Message, Member) => {
let no_subscriptions = new WDR.DiscordJS.MessageEmbed().setColor("00ff00")
.setAuthor(Member.db.user_name, Member.user.displayAvatarURL())
.setTitle("You do not have any PvP Subscriptions!")
.setFooter("You can type \'view\', \'presets\', \'add\', \'remove\', or \'edit\'.");
.setFooter("You can type 'view', 'presets', 'add', 'remove', or 'edit'.");
Message.channel.send(no_subscriptions).catch(console.error).then(BotMsg => {
return Functions.OptionCollect(WDR, Functions, "view", Message, BotMsg, Member);
});
Expand Down Expand Up @@ -44,7 +44,7 @@ module.exports = (WDR, Functions, Message, Member) => {
}
sub_list = sub_list.slice(0, -1);

let number = await Functions.DetailCollect(WDR, Functions, "Remove", Member, Message, subscriptions, "Type the corressponding # of the subscription you would like to remove -OR- type \'all\'", sub_list);
let number = await Functions.DetailCollect(WDR, Functions, "Remove", Member, Message, subscriptions, "Type the corressponding # of the subscription you would like to remove -OR- type 'all'", sub_list);

let remove = subscriptions[number];

Expand All @@ -63,7 +63,7 @@ module.exports = (WDR, Functions, Message, Member) => {
form = ${remove.form}
AND
min_rank = ${remove.min_rank}
AND
AND
league = '${remove.league}';
`;

Expand All @@ -76,11 +76,12 @@ module.exports = (WDR, Functions, Message, Member) => {
timeout: 10000
}));
} else {

let subscription_success = new WDR.DiscordJS.MessageEmbed().setColor("00ff00")
.setAuthor(Member.db.user_name, Member.user.displayAvatarURL())
.setTitle(WDR.Master.Pokemon[remove.pokemon_id].name + " PvP Subscription Removed!")
.setTitle("PvP Subscription Removed!")
.setDescription("Saved to the subscription Database.")
.setFooter("You can type \'view\', \'presets\', \'add\', \'remove\', or \'edit\'.");
.setFooter("You can type 'view', 'presets', 'add', 'remove', or 'edit'.");
return Message.channel.send(subscription_success).then(BotMsg => {
return Functions.OptionCollect(WDR, Functions, "remove", Message, BotMsg, Member);
});
Expand Down
18 changes: 6 additions & 12 deletions src/commands/subscription/raid/collect_detail.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
.setAuthor(Member.db.user_name, Member.user.displayAvatarURL())
.setTitle("Which would you like to Subscribe to?")
.setDescription("Choices:" +
"　**Pokemon Name**　-　Only that Boss." +
"　'**Boss**'　-　All Raid Bosses only." +
"　'**Egg**'　-　All Eggs only." +
"　**Pokemon Name**　-　Only that Boss." + "\n" +
"　'**Boss**'　-　All Raid Bosses only." + "\n" +
"　'**Egg**'　-　All Eggs only." + "\n" +
"　'**All**'　-　All Bosses and Eggs.")
.setFooter(requirements);
break;
Expand All @@ -44,12 +44,7 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s

case "Confirm-Add":

let boss = "";
if (sub.pokemon_id > 0) {
boss = WDR.Master.Pokemon[sub.pokemon_id].name
} else if (sub.gender == 2) {
boss = "All"
}
console.log(sub)

let gym = "";
if (sub.gym === 0) {
Expand All @@ -61,7 +56,7 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
instruction = new WDR.DiscordJS.MessageEmbed()
.setAuthor(Member.db.user_name, Member.user.displayAvatarURL())
.setTitle("Does all of this look correct?")
.setDescription("Boss: `" + boss + "`\n" +
.setDescription("Boss: `" + sub.boss + "`\n" +
"Gym: `" + gym + "`\n" +
"Min Lvl: `" + sub.min_lvl + "`\n" +
"Max Lvl: `" + sub.max_lvl + "`\n" +
Expand Down Expand Up @@ -242,8 +237,7 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
break;
case "no":
case "cancel":
return Functions.Cancel(WDR, Functions, Message, Member);
collector.stop(null);
collector.stop(false);
break;
default:
CollectedMsg.reply("`" + CollectedMsg.content + "` is an Invalid Input. " + requirements).then(m => m.delete({
Expand Down
29 changes: 21 additions & 8 deletions src/commands/subscription/raid/collect_option.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,25 +62,38 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, gym_name_a

switch (arg) {
case "cancel":
return Functions.Cancel(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
Functions.Cancel(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
break;
case "add":
return Functions.Create(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
Functions.Create(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
break;
case "preset":
return Functions.Preset(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
Functions.Preset(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
break;
case "remove":
return Functions.Remove(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
Functions.Remove(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
break;
case "edit":
return Functions.Modify(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
Functions.Modify(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
break;
case "view":
return Functions.View(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
Functions.View(WDR, Functions, OriginalMsg, Member, gym_name_array, gym_detail_array, gym_collection);
break;
case "resume":
case "pause":
return Functions.Status(WDR, Functions, OriginalMsg, Member, arg);
Functions.Status(WDR, Functions, OriginalMsg, Member, arg);
break;
case "time":
return Functions.TimedOut(WDR, Functions, OriginalMsg, Member);
if (source != "complete") {
Functions.TimedOut(WDR, Functions, OriginalMsg, Member);
}
break;
default:
return;
}

// END
return;
});

// END
Expand Down
5 changes: 4 additions & 1 deletion src/commands/subscription/raid/create.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ module.exports = (WDR, Functions, Message, Member, gym_name_array, gym_detail_ar
}

create.confirm = await Functions.DetailCollect(WDR, Functions, "Confirm-Add", Member, Message, null, "Type 'Yes' or 'No'. Subscription will be saved.", create, gym_name_array, gym_detail_array, gym_collection);
if (create.confirm === false) {
Functions.Cancel(WDR, Functions, Message, Member);
}

let query = `
INSERT INTO
Expand Down Expand Up @@ -202,7 +205,7 @@ module.exports = (WDR, Functions, Message, Member, gym_name_array, gym_detail_ar
.setDescription("Saved to the Database.")
.setFooter("You can type 'view', 'presets', 'add', or 'remove'.");
Message.channel.send(subscription_success).then(msg => {
return Functions.OptionCollect(WDR, Functions, "create", Message, msg, Member);
return Functions.OptionCollect(WDR, Functions, "complete", Message, msg, Member);
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/subscription/raid/preset.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = async (WDR, Functions, Message, Member, gym_name_array, gym_det
.setDescription("Saved to the subscription Database.")
.setFooter("You can type 'view', 'presets', 'add', 'add adv', 'remove', or 'edit'.");
Message.channel.send(subscription_success).then(BotMsg => {
return Functions.OptionCollect(WDR, Functions, "create", Message, BotMsg, Member);
return Functions.OptionCollect(WDR, Functions, "complete", Message, BotMsg, Member);
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/subscription/raid/remove.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ module.exports = (WDR, Functions, Message, Member, gym_name_array, gym_detail_ar
.setDescription("Saved to the Database.")
.setFooter("You can type 'view', 'presets', 'add', or 'remove'.");
return Message.channel.send(subscription_success).then(BotMsg => {
return Functions.OptionCollect(WDR, Functions, "remove", Message, BotMsg, Member, gym_name_array, gym_detail_array, gym_collection);
return Functions.OptionCollect(WDR, Functions, "complete", Message, BotMsg, Member, gym_name_array, gym_detail_array, gym_collection);
});
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/subscription/raid/view.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ module.exports = (WDR, Functions, Message, Member, gym_name_array, gym_detail_ar
"Pokemon Status: `" + r_status + "`\n\n" + sub_list)
.setFooter("You can type 'view', 'presets', 'add', or 'remove'.");
Message.channel.send(raidSubs).catch(console.error).then(BotMsg => {
return Functions.OptionCollect(WDR, Functions, "view", Message, BotMsg, Member, gym_name_array, gym_detail_array, gym_collection);
return Functions.OptionCollect(WDR, Functions, "complete", Message, BotMsg, Member, gym_name_array, gym_detail_array, gym_collection);
});
}
}
Expand Down
Loading

0 comments on commit 534d158

Please sign in to comment.