Skip to content

Commit 280f402

Browse files
committed
fix preset db insert values
1 parent 69a6c65 commit 280f402

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

src/commands/subscription/pokemon/preset.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@ module.exports = async (WDR, Functions, Message, Member) => {
1111
preset = WDR.Presets.Pokemon.get(preset_name);
1212

1313
preset.areas = await Functions.DetailCollect(WDR, Functions, 'Geofence', Member, Message, undefined, 'Please respond with \'Yes\' or \'No\'', preset);
14-
if (preset.areas == Message.discord.name) {
15-
preset.geotype = 'city';
16-
} else {
17-
preset.geotype = Member.db.geotype;
18-
}
1914

2015
preset.confirm = await Functions.DetailCollect(WDR, Functions, 'Confirm-Add', Member, Message, undefined, 'Type \'Yes\' or \'No\'. Subscription will be saved.', preset);
2116
if (preset.confirm === false) {
@@ -53,7 +48,7 @@ module.exports = async (WDR, Functions, Message, Member) => {
5348
${Member.db.bot},
5449
${Member.db.pokemon_status},
5550
'${preset.geotype}',
56-
'${preset.areas}',
51+
'${Member.db.areas}',
5752
'${JSON.stringify(Member.db.location)}',
5853
${preset.id},
5954
${preset.form},

src/commands/subscription/pvp/preset.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,8 @@ module.exports = async (WDR, Functions, Message, Member) => {
1010
let preset_name = preset_names[preset];
1111
preset = WDR.Presets.PvP.get(preset_name);
1212

13-
preset.areas = await Functions.DetailCollect(WDR, Functions, 'Geofence', Member, Message, undefined, 'Please respond with \'Yes\' or \'No\'.', preset);
14-
if (preset.areas == Message.discord.name) {
15-
preset.geotype = 'city';
16-
} else {
17-
preset.geotype = Member.db.geotype;
18-
}
13+
preset.geotype = await Functions.DetailCollect(WDR, Functions, 'Geofence', Member, Message, undefined, 'Please respond with \'Yes\' or \'No\'.', preset);
14+
1915
preset.confirm = await Functions.DetailCollect(WDR, Functions, 'Confirm-Add', Member, Message, undefined, 'Type \'Yes\' or \'No\'. Subscription will be saved.', preset);
2016

2117
let query = `
@@ -45,8 +41,8 @@ module.exports = async (WDR, Functions, Message, Member) => {
4541
'${Member.db.guild_name}',
4642
${Member.db.bot},
4743
${Member.db.pvp_status},
48-
'${Member.db.geotype}',
49-
'${preset.areas}',
44+
'${preset.geotype}',
45+
'${Member.db.areas}',
5046
'${JSON.stringify(Member.db.location)}',
5147
${preset.pokemon_id},
5248
'${preset.pokemon_type}',

0 commit comments

Comments
 (0)