Skip to content

Commit

Permalink
Fix deletions
Browse files Browse the repository at this point in the history
  • Loading branch information
brianpgerson committed Feb 26, 2018
1 parent b80805d commit 6bc5ad4
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions lib/countdown.js
Expand Up @@ -304,8 +304,8 @@ class CountdownBot extends SlackWrapper {
}

_deleteCountdown (settings, event, skipMessage) {
console.log(`Deleting ${event.event} for ${settings.teamId}`);
Countdown.findOneAndRemove({teamId: settings.teamId, event: event.event})
console.log(`Deleting ${settings.event} for ${settings.teamId}`);
Countdown.findOneAndRemove({teamId: settings.teamId, event: settings.event})
.then(deleted => {
console.log(deleted);
if (!skipMessage) {
Expand All @@ -331,16 +331,15 @@ class CountdownBot extends SlackWrapper {
var rawDays = hours/24;
var days = Math.ceil(rawDays);

var settings = {team: team, token: countdown.botAccessToken};
var settings = {teamId: team, event: countdownEvent, token: countdown.botAccessToken};

if (hours > 0 && hours < 24) {
this._deleteCountdown(settings, {event: countdownEvent}, true);
this._deleteCountdown(settings, {}, true);
reminder = `Hooray! Today is the day for ${countdownEvent}! You lucky dowgs, you. I just removed that countdown for ya. Bark!`
} else if (rawDays < 0) {
this._deleteCountdown(settings, {event: countdownEvent}, true);
this._deleteCountdown(settings, {}, true);
reminder =`Looks like ${countdownEvent} already happened! I just went ahead and removed that countdown for ya. Arf!`
} else {

reminder = `And now for your scheduled reminder: ${days} ${days > 1 ? 'days' : 'day'} until ${countdownEvent}!`;
}

Expand Down

0 comments on commit 6bc5ad4

Please sign in to comment.