Merge remote-tracking branch 'pasky/master'

irssi/scripts/ideone.pl

@@ -95,8 +95,8 @@
 sub ideone {
 	my ($nick, $code) = @_;
 
-	my $user = 'test';
-	my $pass = 'test';
+	my $user = 'pasky';
+	my $pass = 'brmbrm';
 	my $soap = SOAP::Lite->new(proxy => 'http://ideone.com/api/1/service');
 	my $result;
 
@@ -191,20 +191,20 @@ sub ideone {
 	$code =~ s/\s+$//;
 
 	$result = get_result($soap->createSubmission($user, $pass, $code, $languages{$lang}{'id'}, $input, 1, 1));
-	return $emsg unless defined $result;
+	return "create: $emsg" unless defined $result;
 
 	my $url = $result->{link};
 
 # wait for compilation/execution to complete
 	while(1) {
 	  $result = get_result($soap->getSubmissionStatus($user, $pass, $url));
-	  return $emsg unless defined $result;
+	  return "submit: $emsg" unless defined $result;
 	  last if $result->{status} == 0;
 	  sleep 1;
 	}
 
 	$result = get_result($soap->getSubmissionDetails($user, $pass, $url, 0, 0, 1, 1, 1));
-	return $emsg unless defined $result;
+	return "result: $emsg" unless defined $result;
 
 	my $COMPILER_ERROR = 11;
 	my $RUNTIME_ERROR = 12;
@@ -291,7 +291,7 @@ sub ideone {
 	    return undef;
 	  } else {
 	    if($result->result->{error} ne "OK") {
-	      $emsg = $result->result->{error};
+	      $emsg = join(", ", map { "$_: " . $result->result->{error}->{$_} } keys %{$result->result->{error}});
 	      return undef;
 	    } else {
 	      return $result->result;

irssi/scripts/idos.pl

@@ -75,7 +75,7 @@ sub on_msg {
 		next unless $res;
 		my $cl = $res->connections();
 		my $o = "";
-		$o = sprintf '[%s %s] ', $res->time(), $res->date(), $res->traveltime(), $res->traveldist(), $res->cost();
+		$o = sprintf '[%s %s] ', $res->time(), $res->date();
 		for (0..$#$cl) {
 			my $c = $cl->[$_];
 			my $Cdark = "\3".'14';
@@ -84,8 +84,8 @@ sub on_msg {
 			$o .= sprintf '%s %s--%s %s%s %s<%s>%s %s %s--%s ', $c->origin(), $Cdark, $Creset, $c->note() ? sprintf('[%s] ', $c->note()) : '', $c->start(), $Cblue, $c->by(), $Creset, $c->stop(), $Cdark, $Creset;
 		}
 		$o .= sprintf '%s ', $cl->[$#$cl]->dest() if $#$cl >= 0;
-		$o .= sprintf '[%s] %s', join(', ', grep { defined $_ } ($res->traveltime(), $res->traveldist(), $res->cost())),
-			(defined $res->detail() ? short_link($res->detail()) : '');
+		$o .= sprintf('[%s] %s', join(', ', grep { defined $_ } ($res->traveltime(), $res->traveldist(), $res->cost())),
+			($res->detail() ? short_link($res->detail()) : ''));
 		$server->send_message($dst, "$nick: $o", 0);
 	}
 }

irssi/scripts/wordstats.pl

@@ -275,7 +275,7 @@ sub new {
 
 	$self->{qgetstat} = $self->{dbh}->prepare("SELECT sum(letters), sum(words), sum(actions), sum(smileys), sum(kicks), sum(modes), sum(topics), sum(seconds) FROM stats WHERE user = ? AND channel = ? AND network = ? AND time > ? AND time + timespan < ?");
 	foreach (rows()) {
-		$self->{"qtopstat$_"} = $self->{dbh}->prepare("SELECT user, sum($_) AS s FROM stats WHERE channel = ? AND network = ? AND time > ? AND time + timespan < ? GROUP BY user ORDER BY s DESC LIMIT ?");
+		$self->{"qtopstat$_"} = $self->{dbh}->prepare("SELECT user, sum($_) AS s FROM stats WHERE channel = ? AND network = ? AND time >= ? AND time + timespan < ? GROUP BY user ORDER BY s DESC LIMIT ?");
 	}
 
 	$self->{qgetvocab} = $self->{dbh}->prepare("SELECT count(*) FROM words WHERE user = ? AND channel = ? AND network = ? AND last > ?");