X-Git-Url: https://ruin.nu/git/?p=NDIRC.git;a=blobdiff_plain;f=Delling.pm;h=e08f7910b98c8d4daf90a9c66acd616a2ae1455f;hp=33141596b3f6d82c29ceebe6ec6e4d1be398dbcd;hb=921132036eac2233472b1b315e4ee39f5ab17fbd;hpb=05629ec258dcfc359decc3cbc44c3345dd0eb62e

diff --git a/Delling.pm b/Delling.pm
index 3314159..e08f791 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -26,11 +26,10 @@ use Moose;
 extends 'NDIRC::Bot';
 
 use POE::Session;
-use NDIRC::Misc;
 use ND::DB;
 
 sub irc_public {
-	my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+	my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
 	my ($nick,$username,$address) = ( split /[!@]/, $who );
 	my $channel = $where->[0];
 
@@ -41,7 +40,7 @@ sub irc_public {
 	my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
 	$seen->execute($address);
 
-	if ($msg =~ /^(\S+): (.+)$/ && $heap->{disp}->has_command('anon',$channel)){
+	if ($msg =~ /^(\S+): (.+)$/ && $self->disp->has_command('anon',$channel)){
 		my $_ = $1;
 		my $text = $2;
 		unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
@@ -49,14 +48,14 @@ sub irc_public {
 		}
 
 	}
-	if (parseCommand($msg,$irc,$nick,$address,$channel,$heap->{disp},$dbh)){
+	if ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
 		#Command parsed and run successfully
 	}
 }
 
 
 sub irc_msg {
-	my ($sender, $heap, $who, $where, $msg) = @_[SENDER, HEAP, ARG0 .. ARG2];
+	my ($self,$sender, $who, $where, $msg) = @_[OBJECT,SENDER, ARG0 .. ARG2];
 	my ($nick,$username,$address) = ( split /[!@]/, $who );
 	my $irc = $sender->get_heap();
 
@@ -64,7 +63,7 @@ sub irc_msg {
 	my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
 	$seen->execute($address);
 
-	if (parseCommand($msg,$irc,$nick,$address,'pm',$heap->{disp},$dbh)){
+	if ($self->parseCommand($msg,$irc,$nick,$address,'pm',$dbh)){
 		#Command parsed and run successfully
 	}else{
 		$irc->yield(notice => $nick, "unknown command");
@@ -72,7 +71,7 @@ sub irc_msg {
 }
 
 sub irc_join {
-	my ($sender, $heap, $who, $channel) = @_[SENDER, HEAP, ARG0 .. ARG1];
+	my ($self,$sender, $who, $channel) = @_[OBJECT,SENDER, ARG0 .. ARG1];
 	my ($nick,$username,$address) = ( split /[!@]/, $who );
 	my $irc = $sender->get_heap();
 
@@ -80,7 +79,7 @@ sub irc_join {
 	my $seen = $dbh->prepare_cached(q{UPDATE users SET laston = NOW() WHERE hostmask = ?});
 	$seen->execute($address);
 
-	if($heap->{disp}->has_command('voice',$channel)){
+	if($self->disp->has_command('voice',$channel)){
 		my $flags = $dbh->prepare_cached(q{
 SELECT DISTINCT flag
 FROM users u