Skip to content

Fix !timer date parsing: strict mode, flexible formats, time-before-date #31

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

Merged
Tsarpf merged 1 commit into from
Jun 26, 2026
Merged

Fix !timer date parsing: strict mode, flexible formats, time-before-date #31

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
22 changes: 16 additions & 6 deletions features/timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,16 @@ const _ = require('underscore'),
TimerDB = require('../lib/timerdb').TimerDB;

var timerdb = new TimerDB(),
date_strs = ['HH:mm', 'DD.MM', 'DD.MM HH:mm', 'DD.MM.YYYY', 'DD.MM.YYYY HH:mm'],
help_str = "Supported formats: [number]s/m/h, " + date_strs.join(", ");
date_strs = [
'HH:mm',
'D.M', 'DD.MM',
'D.M HH:mm', 'DD.MM HH:mm',
'HH:mm D.M', 'HH:mm DD.MM',
'D.M.YYYY', 'DD.MM.YYYY',
'D.M.YYYY HH:mm', 'DD.MM.YYYY HH:mm',
'HH:mm D.M.YYYY', 'HH:mm DD.MM.YYYY',
],
help_str = "Supported formats: [number]s/m/h, HH:mm, DD.MM, DD.MM HH:mm, HH:mm DD.MM, DD.MM.YYYY, DD.MM.YYYY HH:mm, HH:mm DD.MM.YYYY";

var timer = function(client, channel, from, line) {
var say = function(msg) {
Expand All @@ -23,14 +31,16 @@ var timer = function(client, channel, from, line) {
var moment_delay = moment().add(
initial(first_arg),
last(first_arg));
var moment_date = moment(_.rest(line_arr).join(" "), date_strs);
var date_two = line_arr.length >= 3 ? moment(first_arg + ' ' + line_arr[2], date_strs, true) : null;
var date_one = moment(first_arg, date_strs, true);

if (first_arg.match(/^[0-9]{1,3}[a-zM]$/) &&
moment_delay.isValid()) {
date = moment_delay;
} else if (first_arg.match(/(:|\.)/) &&
moment_date.isValid()) {
date = moment_date;
} else if (date_two && date_two.isValid()) {
date = date_two;
} else if (date_one.isValid()) {
date = date_one;
} else {
say(help_str);
return;
Expand Down
9 changes: 8 additions & 1 deletion test/cases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,12 @@

{ "cmd": "!add ciexpl this is a ci expl", "expect": "ciexpl", "desc": "pythonsimo expl add" },
{ "cmd": "!expl ciexpl", "expect": "ci expl", "desc": "pythonsimo expl lookup" },
{ "cmd": "!remove ciexpl 1", "expect": "Deleted", "desc": "pythonsimo expl remove" }
{ "cmd": "!remove ciexpl 1", "expect": "Deleted", "desc": "pythonsimo expl remove" },

{ "cmd": "!timer 5m ci reminder", "expect": "Timer set to:.*202", "desc": "timer: duration in minutes" },
{ "cmd": "!timer 2h ci reminder", "expect": "Timer set to:.*202", "desc": "timer: duration in hours" },
{ "cmd": "!timer 23:59 ci reminder", "expect": "23:59", "desc": "timer: time-only with message" },
{ "cmd": "!timer 14:45 1.1.2077 ci reminder", "expect": "Jan 01 2077 14:45", "desc": "timer: time-first date format with message" },
{ "cmd": "!timer 1.1.2077 14:45 ci reminder", "expect": "Jan 01 2077 14:45", "desc": "timer: date-first format with message" },
{ "cmd": "!timer garbage", "expect": "Supported formats", "desc": "timer: invalid input shows help" }
]
Loading