Skip to content

Issue 239 stop old due dates #269

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
clivemeister wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Issue 239 stop old due dates #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f11ad8
stop old commit dates being parsed out of promise URLs - fixes issue 239
clivemeister Sep 4, 2018
9cc7fb7
Candidate fix for issue 239
clivemeister Sep 4, 2018
ab7b75a
Candidate fix for issue 239, with fixed-up lint warnings.
clivemeister Sep 4, 2018
28073c7
Merge branch 'issue_239_stop_old_due_dates' of https://github.com/cli…
clivemeister Sep 9, 2018
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ tmp/

# css is compiled from scss in /styles
public/main.css
package-lock.json
12 changes: 11 additions & 1 deletion lib/parse/promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,17 @@ export const parsePromise = ({
const { tini, tdue: dueDate, tfin } = promise

const text = parseText({ text: urtext })
const { eventTitle, isAllDay, startDate } = parseSherlock({ text, timezone })
let { eventTitle, isAllDay, startDate } = parseSherlock({ text, timezone })

if ( moment(startDate).isBefore(moment().subtract(1, 'years')) ) {
Copy link
Member

@chrisbutler chrisbutler Sep 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so, i think that this check/override should only happen when we create the the promise, so that this function still gives us what we expect

also, this will need to be a timezone aware check because we're going to change the criteria to reject any date that is in the past i.e. < now (before, at a 1 year scale, being within 24 hours wouldn't really matter)

this should happen before that closeOfBusiness check so that the default will be applied (and you can look at that function for timezone handling)

<<<<<<< HEAD
log.warn('parsePromise rejected, past due date:', startDate)
startDate = null // clear startDate if more than a year ago
=======
log.debug('Caught and fixed promise with old parsed start date of:', startDate)
Copy link

@qlty-cloud-legacy qlty-cloud-legacy bot Sep 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line 36 exceeds the maximum line length of 80.

Copy link
Member

@chrisbutler chrisbutler Sep 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea to log this, we should probably have it as a warn with a more succinct message like 'parsePromise rejected past due date:'

startDate = null; // clear startDate if more than a year ago
Copy link

@qlty-cloud-legacy qlty-cloud-legacy bot Sep 4, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Extra semicolon.

Copy link
Member

@chrisbutler chrisbutler Sep 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

>>>>>>> 9cc7fb723ff8ffe9392ad605ffe3ae22362c6d63
}

const tdue = dueDate || (startDate && moment(startDate)
.add(+isAllDay, 'days') // turn boolean into 1 or 0
Expand Down