GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-01-11 20:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Add repeatable reminders; misc sanity checks

Browse Source
This commit is contained in:
Pragmatic Software 2017-08-12 16:18:25 -07:00
parent 1f212c1886
commit 669733f353
1 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
PBot/Plugins/RemindMe.pm
View File

@ -64,6 +64,8 @@ CREATE TABLE IF NOT EXISTS Reminders (
target TEXT, target TEXT,
text TEXT, text TEXT,
alarm NUMERIC, alarm NUMERIC,
repeat INTEGER,
duration NUMERIC,
created_on NUMERIC, created_on NUMERIC,
created_by TEXT created_by TEXT
) )
@ -96,11 +98,11 @@ sub dbi_end {
} }
sub add_reminder { sub add_reminder {
my ($self, $account, $target, $text, $alarm, $owner) = @_; my ($self, $account, $target, $text, $alarm, $duration, $repeat, $owner) = @_;
eval { eval {
my $sth = $self->{dbh}->prepare('INSERT INTO Reminders (account, target, text, alarm, created_on, created_by) VALUES (?, ?, ?, ?, ?, ?)'); my $sth = $self->{dbh}->prepare('INSERT INTO Reminders (account, target, text, alarm, duration, repeat, created_on, created_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?)');
$sth->execute($account, $target, $text, $alarm, scalar gettimeofday, $owner); $sth->execute($account, $target, $text, $alarm, $duration, $repeat, scalar gettimeofday, $owner);
}; };
if ($@) { if ($@) {
@ -110,6 +112,34 @@ sub add_reminder {
return 1; return 1;
} }
sub update_reminder {
my ($self, $id, $data) = @_;
eval {
my $sql = 'UPDATE Reminders SET ';
my $comma = '';
foreach my $key (keys %$data) {
$sql .= "$comma$key = ?";
$comma = ', ';
}
$sql .= ' WHERE id = ?';
my $sth = $self->{dbh}->prepare($sql);
my $param = 1;
foreach my $key (keys %$data) {
$sth->bind_param($param++, $data->{$key});
}
$sth->bind_param($param++, $id);
$sth->execute();
};
$self->{pbot}->{logger}->log($@) if $@;
}
sub get_reminder { sub get_reminder {
my ($self, $id) = @_; my ($self, $id) = @_;
@ -167,11 +197,11 @@ sub remindme {
return "Internal error."; return "Internal error.";
} }
my $usage = "Usage: remindme [-c channel] message -t time | remindme -l [nick] | remindme -d id"; my $usage = "Usage: remindme [-c channel] [-r count] message -t time | remindme -l [nick] | remindme -d id";
return $usage if not length $arguments; return $usage if not length $arguments;
my ($target, $text, $alarm, $list_reminders, $delete_id); my ($target, $repeat, $text, $alarm, $list_reminders, $delete_id);
my $getopt_error; my $getopt_error;
local $SIG{__WARN__} = sub { local $SIG{__WARN__} = sub {
@ -182,6 +212,7 @@ sub remindme {
$arguments =~ s/'/\\'/g; $arguments =~ s/'/\\'/g;
my ($ret, $args) = GetOptionsFromString($arguments, my ($ret, $args) = GetOptionsFromString($arguments,
'r:i' => \$repeat,
't:s' => \$alarm, 't:s' => \$alarm,
'c:s' => \$target, 'c:s' => \$target,
'm:s' => \$text, 'm:s' => \$text,
@ -290,6 +321,18 @@ sub remindme {
return "Come on now, I'll be dead by then."; return "Come on now, I'll be dead by then.";
} }
if (not defined $admininfo and $length < 60) {
return "Time must be a minimum of 60 seconds.";
}
if (not defined $admininfo and $repeat > 5) {
return "You may only set up to 5 repeats.";
}
if ($repeat < 0) {
return "Repeats must be 0 or greater.";
}
$alarm = gettimeofday + $length; $alarm = gettimeofday + $length;
my $account = $self->{pbot}->{messagehistory}->{database}->get_message_account($nick, $user, $host); my $account = $self->{pbot}->{messagehistory}->{database}->get_message_account($nick, $user, $host);
@ -302,7 +345,7 @@ sub remindme {
} }
} }
if ($self->add_reminder($account, $target, $text, $alarm, "$nick!$user\@$host")) { if ($self->add_reminder($account, $target, $text, $alarm, $length, $repeat, "$nick!$user\@$host")) {
return "Reminder added."; return "Reminder added.";
} else { } else {
return "Failed to add reminder."; return "Failed to add reminder.";
@ -344,7 +387,15 @@ sub check_reminders {
my $text = "Reminder: $reminder->{text} (Set $duration ago)"; my $text = "Reminder: $reminder->{text} (Set $duration ago)";
my $target = $reminder->{target} // $nick; my $target = $reminder->{target} // $nick;
$self->{pbot}->{conn}->privmsg($target, $text); $self->{pbot}->{conn}->privmsg($target, $text);
$self->delete_reminder($reminder->{id});
if ($reminder->{repeat} > 0) {
$reminder->{repeat}--;
$reminder->{alarm} = gettimeofday + $reminder->{duration};
my $data = { repeat => $reminder->{repeat}, alarm => $reminder->{alarm} };
$self->update_reminder($reminder->{id}, $data);
} else {
$self->delete_reminder($reminder->{id});
}
} }
} }