X-Git-Url: https://ruin.nu/git/index.pl?a=blobdiff_plain;f=Delling.pm;h=df44711f1188df078221b8a546afd6c4fc47fda6;hb=15d058ce6833c840aa9696c9cc06a25319a4dc5c;hp=bb6b97e8b9a635541fe311cefbacc87fe33c700b;hpb=cbe172da35e963a0e3205af1337e7b5efee24c13;p=NDIRC.git

diff --git a/Delling.pm b/Delling.pm
index bb6b97e..df44711 100644
--- a/Delling.pm
+++ b/Delling.pm
@@ -61,10 +61,11 @@ after irc_public => sub {
 		unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
 			$msg = ".anon $_ $text";
 		}
-
-	}
-	if ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
+	}elsif ($self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh)){
 		#Command parsed and run successfully
+	}elsif($self->disp->has_command('teachbot',$channel)){
+		$msg =~ s/^\S+:\s*//;
+		$self->hal->learn($msg);
 	}
 };
 
@@ -207,7 +208,7 @@ FROM users u
 	JOIN fleets f USING (fid)
 	JOIN fleet_ships fs USING (fid)
 	JOIN defense_missions dm ON f.fid = dm.fleet
-	JOIN ship_stats ss ON fs.ship = ss.name
+	JOIN ship_stats ss USING (ship)
 WHERE NOT dm.announced
 GROUP BY username,call,tick,dm.fleet,p.value
 		});