Skip to content

Fixed bug that allowed multiple subscriptions to created/edited simultaneously #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavisPoGo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed bug that allowed multiple subscriptions to created/edited simultaneously #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/commands/subscription/area/collect_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,17 @@ module.exports = async (WDR, Functions, type, member, message, object, requireme
// FILTER COLLECT EVENT
collector.on('collect', CollectedMsg => {

CollectedMsg.delete();
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

switch (true) {
case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
case CollectedMsg.content.toLowerCase() == 'cancel':
collector.stop('cancel');
break;
Expand Down Expand Up @@ -157,4 +165,4 @@ module.exports = async (WDR, Functions, type, member, message, object, requireme
});
});
});
};
};
16 changes: 13 additions & 3 deletions src/commands/subscription/area/collect_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
// FILTER COLLECT EVENT
collector.on('collect', CollectedMsg => {

if (BotMsg.channel.type != 'dm') {
CollectedMsg.delete();
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX && BotMsg.channel.type != 'dm')) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}


switch (CollectedMsg.content.toLowerCase()) {
case 'add':
collector.stop('add');
Expand All @@ -28,6 +34,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
case 'cancel':
collector.stop('cancel');
break;
default:
collector.stop('cancel');
}
});

Expand All @@ -39,6 +47,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
}

switch (msg) {
case 'cancel':
return Functions.Cancel(WDR, Functions, OriginalMsg, Member);
case 'add':
return Functions.Add(WDR, Functions, OriginalMsg, Member, AreaArray);
case 'distance':
Expand All @@ -61,4 +71,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)

// END
return;
};
};
13 changes: 8 additions & 5 deletions src/commands/subscription/location/collect_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,17 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, l

collector.on('collect', async CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

switch (true) {
case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
case CollectedMsg.content.toLowerCase() == 'cancel':
collector.stop('cancel');
break;
Expand Down Expand Up @@ -228,4 +231,4 @@ async function generate_body(WDR, Message, location) {
return resolve(body);
});
});
}
}
16 changes: 11 additions & 5 deletions src/commands/subscription/location/collect_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
// FILTER COLLECT EVENT
collector.on('collect', CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

switch (CollectedMsg.content.toLowerCase()) {
Expand All @@ -33,6 +35,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
case 'view':
collector.stop('view');
break;
default:
collector.stop('cancel');
}
});

Expand All @@ -49,6 +53,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)
}

switch (msg) {
case 'cancel':
return Functions.Cancel(WDR, Functions, OriginalMsg, Member);
case 'create':
return Functions.Create(WDR, Functions, OriginalMsg, Member, AreaArray);
case 'remove':
Expand All @@ -73,4 +79,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member, AreaArray)

// END
return;
};
};
14 changes: 8 additions & 6 deletions src/commands/subscription/pokemon/collect_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,16 +169,18 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s

collector.on('collect', async CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

switch (true) {


case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
case CollectedMsg.content.toLowerCase() == 'stop':
case CollectedMsg.content.toLowerCase() == 'cancel':
collector.stop('cancel');
Expand Down Expand Up @@ -482,4 +484,4 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
// END
return;
});
};
};
14 changes: 7 additions & 7 deletions src/commands/subscription/pokemon/collect_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
});

collector.on('collect', CollectedMsg => {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

let input = CollectedMsg.content.split(' ').toString().toLowerCase();

let adv_words = ['adv'],
Expand Down Expand Up @@ -97,4 +97,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {

// END
return;
};
};
13 changes: 8 additions & 5 deletions src/commands/subscription/pvp/collect_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,20 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
// FILTER COLLECT EVENT
collector.on('collect', async CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

let old_data;

switch (true) {

case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
case CollectedMsg.content.toLowerCase() == 'stop':
case CollectedMsg.content.toLowerCase() == 'cancel':
collector.stop('cancel');
Expand Down Expand Up @@ -410,4 +413,4 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
// END
return;
});
};
};
12 changes: 7 additions & 5 deletions src/commands/subscription/pvp/collect_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {

collector.on('collect', CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

let input = CollectedMsg.content.split(' ')[0].toString().toLowerCase();
Expand Down Expand Up @@ -95,4 +97,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {

// END
return;
};
};
24 changes: 18 additions & 6 deletions src/commands/subscription/quest/collect_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,18 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s

collector.on('collect', async CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

switch (true) {

case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
case CollectedMsg.content.toLowerCase() == 'stop':
case CollectedMsg.content.toLowerCase() == 'cancel':
collector.stop('cancel');
Expand Down Expand Up @@ -220,8 +223,17 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s

}
}
return resolve(reason);
switch (reason) {
case 'cancel':
Functions.Cancel(WDR, Functions, Message, Member, 'Quest');
return null;
case 'time':
Functions.TimedOut(WDR, Functions, Message, Member, 'Quest');
return null;
default:
return resolve(reason);
}
});
});
});
};
};
14 changes: 9 additions & 5 deletions src/commands/subscription/quest/collect_option.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {

collector.on('collect', CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

let input = CollectedMsg.content.split(' ')[0].toString().toLowerCase();
Expand Down Expand Up @@ -50,6 +52,8 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {
case resume_words.some(word => input.includes(word)):
collector.stop('resume');
break;
default:
collector.stop('cancel');
}
});

Expand Down Expand Up @@ -88,4 +92,4 @@ module.exports = (WDR, Functions, source, oMessage, bMessage, Member) => {

// END
return;
};
};
26 changes: 19 additions & 7 deletions src/commands/subscription/raid/collect_detail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,17 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s
// FILTER COLLECT EVENT
collector.on('collect', async CollectedMsg => {

try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {
if (!CollectedMsg.content.startsWith(WDR.Config.PREFIX)) {
try {
CollectedMsg.delete();
// eslint-disable-next-line no-empty
} catch (e) {

}
}

switch (true) {

case CollectedMsg.content.startsWith(WDR.Config.PREFIX):
case CollectedMsg.content.toLowerCase() == 'stop':
case CollectedMsg.content.toLowerCase() == 'cancel':
collector.stop('cancel');
Expand Down Expand Up @@ -316,8 +318,18 @@ module.exports = (WDR, Functions, type, Member, Message, object, requirements, s

}
}
return resolve(reason);

switch (reason) {
case 'cancel':
Functions.Cancel(WDR, Functions, Message, Member, 'Raid');
return null;
case 'time':
Functions.TimedOut(WDR, Functions, Message, Member, 'Raid');
return null;
default:
return resolve(reason);
}
});
});
});
};
};
Loading