X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=lib%2FOnis%2FPlugins%2FInterestingnumbers.pm;h=4397db6a883481aa3385bb963046238306c80bb6;hb=8d1eb6e92325eb096b6221fed7dbe785cd676936;hp=6554bd4aba031d0e4d451996b678488b3b0460a3;hpb=3be8114d3632498723c23dc0faffb286078d4a69;p=onis.git

diff --git a/lib/Onis/Plugins/Interestingnumbers.pm b/lib/Onis/Plugins/Interestingnumbers.pm
index 6554bd4..4397db6 100644
--- a/lib/Onis/Plugins/Interestingnumbers.pm
+++ b/lib/Onis/Plugins/Interestingnumbers.pm
@@ -8,9 +8,8 @@ use Exporter;
 use Onis::Config (qw(get_config));
 use Onis::Html (qw(html_escape get_filehandle));
 use Onis::Language (qw(translate));
-use Onis::Data::Core (qw(register_plugin));
+use Onis::Data::Core (qw(register_plugin get_main_nick nick_to_name));
 use Onis::Data::Persistent;
-use Onis::Users (qw(nick_to_name));
 
 @Onis::Plugins::Interestingnumbers::EXPORT_OK = (qw(get_interestingnumbers));
 @Onis::Plugins::Interestingnumbers::ISA = ('Exporter');
@@ -23,7 +22,7 @@ register_plugin ('TEXT', \&add_text);
 register_plugin ('OUTPUT', \&output);
 
 our $InterestingNumbersCache = Onis::Data::Persistent->new ('InterestingNumbersCache', 'nick',
-	qw(actions joins kicks_given kicks_received ops_given ops_taken soliloquies));
+	qw(actions joins kick_given kick_received op_given op_taken soliloquies));
 our $InterestingNumbersData = {};
 
 our $SoliloquiesNick = '';
@@ -119,6 +118,7 @@ sub add_mode
 			{
 				$data[4]++;
 			}
+			$InterestingNumbersCache->put ($nick, @data);
 		}
 	}
 
@@ -155,12 +155,13 @@ sub calculate
 	{
 		my $nick = $_;
 		my ($actions, $joins,
-			$kicks_given, $kicks_received,
-			$ops_given, $ops_taken,
+			$kick_given, $kick_received,
+			$op_given, $op_taken,
 			$soliloquies) = $InterestingNumbersCache->get ($nick);
 		my $main = get_main_nick ($nick);
 
-		die unless ($main);
+		next unless ($main);
+		next unless (defined ($soliloquies)); # Person has not written a single line, eg. bots..
 
 		if (!defined ($InterestingNumbersData->{$main}))
 		{
@@ -168,20 +169,20 @@ sub calculate
 			{
 				actions		=> 0,
 				joins		=> 0,
-				kicks_given	=> 0,
-				kicks_received	=> 0,
-				ops_given	=> 0,
-				ops_taken	=> 0,
+				kick_given	=> 0,
+				kick_received	=> 0,
+				op_given	=> 0,
+				op_taken	=> 0,
 				soliloquies	=> 0
 			};
 		}
 
 		$InterestingNumbersData->{$main}{'actions'}        += $actions;
 		$InterestingNumbersData->{$main}{'joins'}          += $joins;
-		$InterestingNumbersData->{$main}{'kicks_given'}    += $kicks_given;
-		$InterestingNumbersData->{$main}{'kicks_received'} += $kicks_received;
-		$InterestingNumbersData->{$main}{'ops_given'}      += $ops_given;
-		$InterestingNumbersData->{$main}{'ops_taken'}      += $ops_taken;
+		$InterestingNumbersData->{$main}{'kick_given'}     += $kick_given;
+		$InterestingNumbersData->{$main}{'kick_received'}  += $kick_received;
+		$InterestingNumbersData->{$main}{'op_given'}       += $op_given;
+		$InterestingNumbersData->{$main}{'op_taken'}       += $op_taken;
 		$InterestingNumbersData->{$main}{'soliloquies'}    += $soliloquies;
 	}
 }
@@ -409,7 +410,7 @@ sub get_interestingnumbers
 {
 	my $nick = shift;
 
-	if (defined ($InterestingNumbersData->{$nick}))
+	if (!defined ($InterestingNumbersData->{$nick}))
 	{
 		return ({});
 	}