X-Git-Url: http://git.ieval.ro/?p=app-statsbot.git;a=blobdiff_plain;f=lib%2FApp%2FStatsbot.pm;fp=lib%2FApp%2FStatsbot.pm;h=449117068ab990221f4b1845563e78c361f999a1;hp=49fb66fe0dda4aab3bbd5068265caf1c951a7c83;hb=6e23c401b100443891e08cae05b36a1e2b1c43ea;hpb=490e26f9bf344184da03c64458dbe28e3f49f208

diff --git a/lib/App/Statsbot.pm b/lib/App/Statsbot.pm
index 49fb66f..4491170 100644
--- a/lib/App/Statsbot.pm
+++ b/lib/App/Statsbot.pm
@@ -13,6 +13,7 @@ use POE::Component::IRC::Plugin::Connector;
 use POE::Component::IRC::Plugin::CTCP;
 use IRC::Utils qw/parse_user/;
 
+use Carp;
 use DBI;
 use DBD::SQLite;
 use Text::ParseWords qw/shellwords/;
@@ -37,6 +38,21 @@ my $irc;
 
 my %state;
 
+sub _yield { $irc->yield(@_) }
+sub _nick_name { $irc->nick_name }
+
+sub _uptime {
+	my ($starttime, $nick) = @_;
+	my $sth=$dbh->prepare('SELECT start,end FROM presence WHERE end > ? AND nick == ?');
+	$sth->execute($starttime, $nick);
+
+	my $uptime=0;
+	while (my ($start, $end)=$sth->fetchrow_array) {
+		$uptime+=$end-max($start,$starttime)
+	}
+	return $uptime
+}
+
 sub run {
 	$irc=POE::Component::IRC::State->spawn;
 	POE::Session->create(
@@ -53,10 +69,10 @@ sub run {
 		options => { trace => $DEBUG },
 	);
 
-	$dbh=DBI->connect("dbi:SQLite:dbname=$DB") or die "Cannot connect to database: $!";
+	$dbh=DBI->connect("dbi:SQLite:dbname=$DB") or croak "Cannot connect to database: $!";
 	$dbh->do('CREATE TABLE presence (start INTEGER, end INTEGER, nick TEXT)');
-	$insert=$dbh->prepare('INSERT INTO presence (start, end, nick) VALUES (?,?,?)') or die "Cannot prepare query: $!";
-	$update=$dbh->prepare('UPDATE presence SET end = ? WHERE start == ? AND nick == ?') or die "Cannot prepare query: $!";
+	$insert=$dbh->prepare('INSERT INTO presence (start, end, nick) VALUES (?,?,?)') or croak "Cannot prepare query: $!";
+	$update=$dbh->prepare('UPDATE presence SET end = ? WHERE start == ? AND nick == ?') or croak "Cannot prepare query: $!";
 	$poe_kernel->run();
 };
 
@@ -75,7 +91,7 @@ sub tick{
 	$_[KERNEL]->delay(tick => $TICK);
 }
 
-sub bot_start{
+sub bot_start{ ## no critic (RequireArgUnpacking)
 	$_[KERNEL]->delay(tick => $TICK);
 
 	$irc->plugin_add(CTCP => POE::Component::IRC::Plugin::CTCP->new(
@@ -92,8 +108,8 @@ sub bot_start{
 		servers => [ $SERVER ],
 	));
 
-	$irc->yield(register => 'all');
-	$irc->yield(
+	_yield(register => 'all');
+	_yield(
 		connect => {
 			Nick     => $NICKNAME,
 			Username => 'statsbot',
@@ -105,20 +121,20 @@ sub bot_start{
 	);
 }
 
-sub on_fatal{ die "Fatal error: $_[ARG0]" }
+sub on_fatal{ croak "Fatal error: $_[ARG0]" }
 
 sub on_public{
 	my ($targets,$message)=@_[ARG1,ARG2];
-	my $botnick = $irc->nick_name;
+	my $botnick = _nick_name;
 
 	if ($message =~ /(?:$botnick[:,])?\s*!?help\s*(.*)/) {
-		$irc->yield(privmsg => $targets, "Try !presence username interval [truncate]");
-		$irc->yield(privmsg => $targets, "For example, !presence mgv '2 days'");
-		$irc->yield(privmsg => $targets, "or !presence mgv '1 year' 4");
+		_yield(privmsg => $targets, "Try !presence username interval [truncate]");
+		_yield(privmsg => $targets, "For example, !presence mgv '2 days'");
+		_yield(privmsg => $targets, "or !presence mgv '1 year' 4");
 		return;
 	}
 
-	return unless $message =~ /(?:$botnick[:,])?\s*!?presence\s*(.*)/;
+	return unless $message =~ /(?:$botnick[:,])?\s*!?presence\s*(.*)/sx;
 	my ($nick, $time, $truncate) = shellwords $1;
 
 	$truncate//=-1;
@@ -131,19 +147,11 @@ sub on_public{
 	eval {
 		$time = parse_duration $time;
 	} or do {
-		$irc->yield(privmsg => $targets, "cannot parse timespec: $time");
+		_yield(privmsg => $targets, "cannot parse timespec: $time");
 		return;
 	};
 
-	my $starttime=time-$time;
-
-	my $sth=$dbh->prepare('SELECT start,end FROM presence WHERE end > ? AND nick == ?');
-	$sth->execute($starttime, $nick);
-
-	my $uptime=0;
-	while (my ($start, $end)=$sth->fetchrow_array) {
-		$uptime+=$end-max($start,$starttime)
-	}
+	my $uptime=_uptime time-$time, $nick;
 
 	my $ret;
 	if ($truncate == -1) {
@@ -155,7 +163,7 @@ sub on_public{
 
 	$time=duration_exact $time;
 
-	$irc->yield(privmsg => $targets, "$nick was here $ret during the last $time");
+	_yield(privmsg => $targets, "$nick was here $ret during the last $time");
 }