Need to signal ndbot.pl instead of irssi

[ndwebbie.git] / lib / NDWeb / Controller / Members.pm

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 10e8fbddd616fc22475570ab0e4f57578ef17d00..9d7afba326683372967ff0506b66bc589983667e 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -61,6 +61,7 @@ sub index : Path : Args(0) {
        my $calls = $dbh->prepare(q{
 SELECT * FROM defcalls
 WHERE uid = $1 AND landing_tick >= tick()
+ORDER BY landing_tick DESC
                });
        $calls->execute($c->user->id);
        $c->stash(calls => $calls->fetchall_arrayref({}) );
@@ -81,6 +82,12 @@ WHERE uid = $1 AND landing_tick >= tick()
                });
        $announcements->execute($c->user->id);
        $c->stash(announcements => $announcements->fetchall_arrayref({}) );
+
+       my ($attackgroups) = $dbh->selectrow_array(q{
+SELECT array_agg(gid) FROM groupmembers WHERE gid IN ('x','y','z') AND uid = $1
+               }, undef, $c->user->id);
+       $c->stash(attackgroups => $attackgroups);
+
 }
 
 sub posthostupdate : Local {
@@ -93,6 +100,23 @@ sub posthostupdate : Local {
        $c->res->redirect($c->uri_for(''));
 }
 
+sub postattackgroups : Local {
+       my ( $self, $c ) = @_;
+       my $dbh = $c->model;
+
+       my @groups = $c->req->param('class');
+       $dbh->do(q{DELETE FROM groupmembers WHERE gid IN ('x','y','z') AND gid <> ALL($1) AND uid = $2
+               },undef, \@groups, $c->user->id);
+
+       $dbh->do(q{INSERT INTO groupmembers (uid,gid) (
+               SELECT $2, gid FROM unnest($1::text[]) AS gid WHERE gid IN ('x','y','z')
+       EXCEPT
+               SELECT uid,gid FROM groupmembers WHERE uid = $2
+               )},undef, \@groups, $c->user->id);
+
+       $c->res->redirect($c->uri_for(''));
+}
+
 sub postsmsupdate : Local {
        my ( $self, $c ) = @_;
        my $dbh = $c->model;
@@ -113,15 +137,26 @@ sub postowncoords : Local {
        if ($c->user->planet){
                $c->flash(error => 'You already have a planet set.'
                        .' Contact a HC if they need to be changed');
-       }elsif ($c->req->param('planet') =~ m/(\d+)\D+(\d+)\D+(\d+)/){
+       }elsif (my ($x,$y,$z) = $c->req->param('planet') =~ m/(\d+)\D+(\d+)\D+(\d+)/){
                my $planet = $dbh->selectrow_array(q{SELECT planetid($1,$2,$3,TICK())
-                       },undef,$1,$2,$3);
+                       },undef,$x,$y,$z);
 
                if ($planet){
-                       $dbh->do(q{UPDATE users SET planet = ? WHERE uid = ?
-                               },undef, $planet , $c->user->id);
+                       eval {
+                               $dbh->do(q{UPDATE users SET pid = ? WHERE uid = ?
+                                       },undef, $planet , $c->user->id);
+                       };
+                       given ($@){
+                               when (''){}
+                               when (/duplicate key value violates/){
+                                       $c->flash(error => "The coords $x:$y:$z are already in use. Talk to hc if these are really your coords.")
+                               }
+                               default {
+                                       $c->flash(error => $@)
+                               }
+                       }
                }else{
-                       $c->flash(error => "No planet at coords: $1:$2:$3");
+                       $c->flash(error => "No planet at coords: $x:$y:$z");
                }
        }else{
                $c->flash(error => $c->req->param('planet') . " are not valid coords.");
@@ -230,7 +265,7 @@ sub postircrequest : Local {
 INSERT INTO irc_requests (uid,channel,message) VALUES($1,$2,$3)
                });
                $query->execute($c->user->id,$c->req->param('channel'),$c->req->param('message'));
-               system 'killall','-USR1', 'irssi';
+               system 'killall','-USR1', 'ndbot.pl';
 
                $c->flash(reply => "Msg sent to: ".$c->req->param('channel'));
                $c->res->redirect($c->uri_for('ircrequest'));
@@ -260,7 +295,7 @@ SELECT username,defense_points,attack_points
        ,(attack_points+defense_points+scan_points/20)::NUMERIC(4,0) as total_points
        , count(NULLIF(rc.launched,FALSE)) AS raid_points
 FROM users_defprio u LEFT OUTER JOIN raid_claims rc USING (uid)
-WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
 GROUP BY username,defense_points,attack_points,scan_points,humor_points,defprio
 ORDER BY } . "$order $limit"
        );
@@ -423,8 +458,8 @@ sub postconfirmation : Local {
                        WHERE c.uid = ? AND r.tick+c.wave-1 = ? AND t.pid = ?
                                AND r.open AND not r.removed
                        });
-               my $finddefensetarget = $dbh->prepare(q{SELECT c.id FROM calls c
-                               JOIN users u ON c.member = u.uid
+               my $finddefensetarget = $dbh->prepare(q{SELECT call FROM calls c
+                               JOIN users u USING (uid)
                        WHERE u.pid = $1 AND c.landing_tick = $2
                });
                my $informDefChannel = $dbh->prepare(q{INSERT INTO defense_missions
@@ -524,7 +559,7 @@ sub postconfirmation : Local {
                                }
                        }elsif ($mission eq 'Defend'){
                                my $call = $findtarget->fetchrow_hashref;
-                               $informDefChannel->execute($fleet,$call->{id});
+                               $informDefChannel->execute($fleet,$call->{call});
                        }
 
                        $log->execute($c->user->id,"Pasted confirmation for $mission mission to $x:$y:$z, landing tick $tick");
@@ -554,13 +589,13 @@ SELECT uid,pid AS planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI'
        ,sms_note, call_if_needed, race, timezone
 FROM users u
        JOIN current_planet_stats p USING (pid)
-WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
-ORDER BY call_if_needed DESC, LOWER(username)
+WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
+ORDER BY call_if_needed DESC, username
                });
        $defenders->execute;
 
        my $available = $dbh->prepare(q{
-SELECT ship,amount FROM available_ships WHERE planet = $1
+SELECT ship,amount FROM available_ships WHERE pid = $1
                });
 
        my @members;