Bugfix, bring back to shortcut to .anon

[NDIRC.git] / Delling.pm

diff --git a/Delling.pm b/Delling.pm
index dc4a0b09b02dbc8049708ab02bded2272029be70..8e58883da963b0b6ccf68b638b6559dec7a2d76d 100644 (file)
--- a/Delling.pm
+++ b/Delling.pm
@@ -60,11 +60,13 @@ after irc_public => sub {
                my $text = $2;
                unless ($irc->is_channel_member($channel,$1) || /(Constructing|Researching)/){
                        $msg = ".anon $_ $text";
+                       $self->parseCommand($msg,$irc,$nick,$address,$channel,$dbh);
                }
-
-       }
-       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);
        }
 };
 
@@ -127,7 +129,7 @@ FROM users u WHERE hostmask = ?
                        if ($user->{password} eq ''){
                                $irc->yield(privmsg => $disp->targets->{members}, "$nick: Get a new random password with /msg delling !getpass . If you don't know your username, then you can get it with .points");
                        }
-                       if ($tick > 36 && not defined $user->{pid}){
+                       if ($tick > 12 && not defined $user->{pid}){
                                $irc->yield(privmsg => $disp->targets->{members}, "$nick: go to https://nd.ruin.nu/ and enter your coords.");
                        }
 
@@ -207,7 +209,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
                });