X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FMembers.pm;h=b9ae443ce5a994b3ca3e97e034f4608f41919eb6;hb=635963fffb6fb1a05e7fcf2812f9df1b006be7fd;hp=fc440a343313e0d9efaa5b163a5abc21fabf4e82;hpb=aa42aa5497f10f957d426f5777a746f3af49f534;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index fc440a3..b9ae443 100644
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -82,6 +82,12 @@ ORDER BY landing_tick DESC
 		});
 	$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 {
@@ -94,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;
@@ -114,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.");
@@ -231,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'));
@@ -245,6 +279,7 @@ sub points : Local {
 	my ( $self, $c, $order ) = @_;
 	my $dbh = $c->model;
 
+	$order //= 'total_points';
 	if ($order ~~ /^((?:defense|attack|total|humor|scan|raid)_points)$/
 			|| $order ~~ /^(defprio)$/){
 		$order = "$1 DESC";
@@ -261,7 +296,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"
 	);
@@ -273,6 +308,7 @@ sub stats : Local {
 	my ( $self, $c, $order ) = @_;
 	my $dbh = $c->model;
 
+	$order //= 'score';
 	if ($order ~~ /^(scre|value|xp|size|race)$/){
 		$order = "$1rank";
 	}else{
@@ -332,6 +368,11 @@ sub postintelmessage : Local {
 		}
 	}
 
+	my ($coords,$tick) = $c->model->selectrow_array(q{
+SELECT coords(x,y,z), tick() FROM current_planet_stats WHERE pid = $1
+		}, undef, $c->user->planet);
+
+	$c->req->param(message => "[i]Posted by $coords at tick $tick [/i]\n\n" . $c->req->param('message'));
 	$c->forward('/forum/insertThread',[12]);
 	$c->forward('/forum/insertPost',[$c->stash->{thread}]);
 	$c->flash(intelmessage => 1);
@@ -555,13 +596,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;