]> ruin.nu Git - ndwebbie.git/commitdiff
Remove most of def calls
authorMichael Andreen <michael@andreen.dev>
Mon, 9 Jan 2023 22:01:13 +0000 (23:01 +0100)
committerMichael Andreen <michael@andreen.dev>
Mon, 9 Jan 2023 22:03:52 +0000 (23:03 +0100)
lib/NDWeb.pm
lib/NDWeb/Controller/Calls.pm [deleted file]
lib/NDWeb/Controller/Intel.pm
lib/NDWeb/Controller/Members.pm
root/lib/site/leftbar.tt2
root/src/calls/defleeches.tt2 [deleted file]
root/src/calls/edit.tt2 [deleted file]
root/src/calls/list.tt2 [deleted file]
root/src/members/addincs.tt2 [deleted file]
root/src/members/index.tt2
t/controller_Calls.t [deleted file]

index 20c61d429faa6d89cd1781d24e14433a959321dd..4bd3ac7512e4c20750cfeb98dd50695c4bea0bb9 100644 (file)
@@ -106,11 +106,6 @@ __PACKAGE__->allow_access_if('/members/addReturnFleet',[qw/attack_menu/]);
 __PACKAGE__->allow_access_if('/members/matchShips',[qw/attack_menu/]);
 __PACKAGE__->deny_access_unless('/members/defenders',[qw/members_defenders/]);
 __PACKAGE__->deny_access_unless('/covop',[qw/covop/]);
-__PACKAGE__->deny_access_unless('/calls',[qw/calls_edit/]);
-__PACKAGE__->allow_access_if('/calls/index',[qw/calls_list/]);
-__PACKAGE__->allow_access_if('/calls/list',[qw/calls_list/]);
-__PACKAGE__->allow_access_if('/calls/edit',[qw/members/]);
-__PACKAGE__->allow_access_if('/calls/findCall',[qw/members/]);
 __PACKAGE__->deny_access_unless('/raids',[qw/raids_edit/]);
 __PACKAGE__->allow_access_if('/raids/index',[qw//]);
 __PACKAGE__->allow_access_if('/raids/view',[qw//]);
diff --git a/lib/NDWeb/Controller/Calls.pm b/lib/NDWeb/Controller/Calls.pm
deleted file mode 100644 (file)
index 48eac7e..0000000
+++ /dev/null
@@ -1,379 +0,0 @@
-package NDWeb::Controller::Calls;
-
-use strict;
-use warnings;
-use parent 'Catalyst::Controller';
-
-use NDWeb::Include;
-
-=head1 NAME
-
-NDWeb::Controller::Calls - Catalyst Controller
-
-=head1 DESCRIPTION
-
-Catalyst Controller.
-
-=head1 METHODS
-
-=cut
-
-
-=head2 index 
-
-=cut
-
-sub index : Path : Args(0) {
-       my ( $self, $c) = @_;
-
-       $c->stash(template => 'calls/list.tt2');
-       $c->forward('list');
-}
-
-sub list : Local {
-       my ( $self, $c, $type ) = @_;
-       my $dbh = $c->model;
-
-       my $where = q{status = 'Open' AND landing_tick-6 > tick()};
-       my $order = q{landing_tick DESC, defprio DESC};
-       if (defined $type){
-               if ($type eq 'covered'){
-                       $where = q{status = 'Covered'};
-               }elsif ($type eq 'all'){
-                       $where = 'true';
-               }elsif ($type eq 'uncovered'){
-                       $where = q{status <> 'Covered'};
-               }elsif ($type eq 'recent'){
-                       $where = q{landing_tick >= tick()};
-                       $order = q{x,y,z};
-               }
-       }
-       my $pointlimits = $dbh->prepare(q{SELECT value :: float FROM misc WHERE id = ?});
-       $c->stash(minprio => $dbh->selectrow_array($pointlimits,undef,'DEFMINPRIO'));
-       $c->stash(maxprio => $dbh->selectrow_array($pointlimits,undef,'DEFMAXPRIO'));
-
-       my $query = $dbh->prepare(qq{
-SELECT *, pid AS planet, coords(x,y,z)
-FROM full_defcalls
-WHERE $where
-ORDER BY $order
-               });
-       $query->execute;
-       $c->stash(calls => $query->fetchall_arrayref({}));
-}
-
-sub edit : Local {
-       my ( $self, $c, $call) = @_;
-       my $dbh = $c->model;
-
-       $c->forward('findCall');
-       $call = $c->stash->{call};
-
-
-       $c->stash(cover => ($call->{covered} ? 'Uncover' : 'Cover'));
-       if ($call->{open} && !$call->{covered}){
-               $c->stash(ignore => 'Ignore');
-       }else{
-               $c->stash(ignore => 'Open');
-       }
-
-
-       my $outgoings = $dbh->prepare(q{ 
-(
-       SELECT DISTINCT ON (mission,name) 1 AS type, fid,mission,name,tick, NULL AS eta
-               ,amount, NULL AS coords, pid AS planet, NULL AS back, NULL AS recalled
-       FROM fleets f
-       WHERE pid = $1 AND tick <= $2 AND (
-                       mission = 'Full fleet'
-                       OR fid IN (SELECT fid FROM fleet_scans)
-               ) AND (
-                       mission = 'Full fleet'
-                       OR tick >= $2 - 12
-               )
-       ORDER BY mission,name,tick DESC
-) UNION (
-       SELECT 2 AS type, MAX(fid) AS fid,mission,name,landing_tick AS tick, eta, amount
-               , coords(x,y,z), pid AS planet, back
-               , (back <> landing_tick + eta - 1) AS recalled
-       FROM launch_confirmations
-               JOIN (
-                       SELECT fid,amount,name,mission FROM fleets WHERE pid = $1
-               ) f  USING (fid)
-               LEFT OUTER JOIN current_planet_stats t USING (pid)
-       WHERE back >= $2 AND landing_tick - eta - 12 < $2
-       GROUP BY mission,name,landing_tick,eta,amount,back,x,y,z,pid
-) UNION (
-       SELECT DISTINCT ON (tick,x,y,z,mission,name,amount)
-               3 AS type, NULL as fid, i.mission, i.name, i.tick,eta
-               , i.amount, coords(x,y,z), t.pid AS planet, back, NULL AS recalled
-       FROM intel i
-       LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
-       WHERE uid = -1 AND i.sender = $1 AND i.tick > $2 - 14 AND i.tick < $2 + 14
-       ORDER BY i.tick,x,y,z,mission,name,amount,back
-) ORDER BY type, mission,name,tick DESC
-       });
-       my $ships = $dbh->prepare(q{SELECT ship,amount FROM fleet_ships
-               WHERE fid = ? ORDER BY num
-               });
-       $outgoings->execute($call->{pid},$call->{landing_tick});
-       my @fleets;
-       while (my $fleet = $outgoings->fetchrow_hashref){
-               if (defined $fleet->{back} &&
-                               $fleet->{back} == $call->{landing_tick}){
-                       $fleet->{fleetcatch} = 1;
-               }
-               if ($fleet->{fid}){
-                       $ships->execute($fleet->{fid});
-                       my @ships;
-                       while (my $ship = $ships->fetchrow_hashref){
-                               push @ships,$ship;
-                       }
-                       push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
-                       $fleet->{ships} = \@ships;
-               }
-               push @fleets, $fleet;
-       }
-
-       my $available = $dbh->prepare(q{
-SELECT ship,amount from ships_home WHERE pid = $1 AND tick = $2
-               });
-       $available->execute($call->{pid}, $call->{landing_tick});
-       my $fleet = {fid => $call->{member}, mission => 'Available'
-               , name => 'At home', ships => $available->fetchall_arrayref({})
-       };
-       push @fleets, $fleet;
-
-       $c->stash(fleets => \@fleets);
-
-       my $defenders = $dbh->prepare(q{
-WITH lc AS (
-       SELECT fid,uid,back,eta,landing_tick
-       FROM launch_confirmations
-       WHERE pid = $1 AND landing_tick = $2
-), lcp AS (
-       SELECT DISTINCT ON (fid) fid,tick,value
-       FROM lc
-               JOIN users u USING (uid)
-               JOIN planet_stats USING (pid)
-       WHERE tick <= landing_tick - eta
-       ORDER BY fid,tick DESC
-), lcv AS (
-       SELECT fid,(sum(amount*(metal+crystal+eonium)) / value)::int  AS value_ratio
-       FROM lcp
-               JOIN fleet_ships fs USING (fid)
-               JOIN ship_stats s USING (ship)
-       GROUP BY fid, value
-)
-SELECT DISTINCT ON (x,y,z,pid,name,amount,back) fid,mission, name, eta
-       , amount, coords(x,y,z) AS coords, landing_tick AS tick, pid AS planet
-       ,back, (back <> landing_tick + eta - 1) AS recalled, value_ratio
-FROM fleets f
-       LEFT OUTER JOIN current_planet_stats s USING (pid)
-       JOIN lc USING (fid)
-       JOIN lcv USING (fid)
-WHERE mission IN ('Defend', 'Fake Defend')
-ORDER BY x,y,z
-       });
-
-       $defenders->execute($call->{pid},$call->{landing_tick});
-       my @defenders;
-       while (my $fleet = $defenders->fetchrow_hashref){
-               $ships->execute($fleet->{fid});
-               if ($ships->rows != 0){
-                       my @ships;
-                       while (my $ship = $ships->fetchrow_hashref){
-                               push @ships,$ship;
-                       }
-                       $fleet->{ships} = \@ships;
-               }
-               push @defenders, $fleet;
-       }
-       $c->stash(defenders => \@defenders);
-
-       my $attackers = $dbh->prepare(q{
-               SELECT coords(p.x,p.y,p.z), p.planet_status, p.race,i.eta,i.amount
-                       ,i.fleet,i.shiptype,p.relationship,p.alliance,inc,pid
-               FROM incomings i
-                       JOIN current_planet_stats p USING (pid)
-               WHERE i.call = ?
-               ORDER BY p.x,p.y,p.z
-       });
-       $attackers->execute($call->{call});
-       my @attackers;
-       while(my $attacker = $attackers->fetchrow_hashref){
-               $outgoings->execute($attacker->{pid},$call->{landing_tick});
-               my @missions;
-               while (my $mission = $outgoings->fetchrow_hashref){
-                       if ($mission->{fid}){
-                               $ships->execute($mission->{fid});
-                               my @ships;
-                               while (my $ship = $ships->fetchrow_hashref){
-                                       push @ships,$ship;
-                               }
-                               push @ships, {ship => 'No', amount => 'ships'} if @ships == 0;
-                               $mission->{ships} = \@ships;
-                       }
-                       push @missions,$mission;
-               }
-               $attacker->{missions} = \@missions;
-               push @attackers,$attacker;
-       }
-       $c->stash(attackers => \@attackers);
-
-       $c->forward('/forum/findPosts',[$call->{ftid}]);
-
-       my $statuses = $dbh->prepare(q{
-SELECT status FROM call_statuses
-               });
-       $statuses->execute;
-       $c->stash(statuses => $statuses->fetchall_arrayref({}));
-}
-
-sub defleeches : Local {
-       my ( $self, $c, $type ) = @_;
-       my $dbh = $c->model;
-
-       my $query = $dbh->prepare(q{
-SELECT username, defense_points, calls, fleets, recalled, defended_calls, value, sent_value
-FROM def_leeches
-ORDER BY value DESC NULLS LAST, defense_points
-               });
-       $query->execute;
-
-       $c->stash(members => $query->fetchall_arrayref({}) );
-}
-
-sub postcallcomment : Local {
-       my ($self, $c, $call) = @_;
-
-       $c->forward('findCall');
-       $call = $c->stash->{call};
-
-       $c->forward('/forum/insertPost',[$call->{ftid}]);
-       $c->res->redirect($c->uri_for('edit',$call->{call}));
-}
-
-sub postcallupdate : Local {
-       my ($self, $c, $call) = @_;
-       my $dbh = $c->model;
-
-       $c->forward('findCall');
-       $call = $c->stash->{call};
-
-       my $log = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message)
-               VALUES($2,$1,$3)
-               });
-
-       $dbh->begin_work;
-       if ($c->req->param('cmd') eq 'Submit'){
-               my $logmess = '';
-               if ($c->req->param('ctick')){
-                       my $tick = $c->req->param('tick');
-                       $dbh->do(q{UPDATE calls SET landing_tick = ? WHERE call = ?}
-                               ,undef,$tick,$call->{call});
-                       $logmess .= "Updated landing tick from [B] $call->{landing_tick} [/B]\n";
-               }
-               if ($c->req->param('cinfo')){
-                       my $info = $c->req->param('info');
-                       $dbh->do(q{UPDATE calls SET info = ? WHERE call = ?}
-                               ,undef,$info,$call->{call});
-                       $logmess .= "Updated info\n";
-               }
-               if ($c->req->param('ccalc')){
-                       my $calc = $c->req->param('calc');
-                       $dbh->do(q{UPDATE calls SET calc = ? WHERE call = ?}
-                               ,undef,$calc,$call->{call});
-                       $logmess .= html_escape('Updated calc to: [URL]'.$calc."[/URL]\n");
-               }
-               if ($c->req->param('cstatus')){
-                       my $status = $c->req->param('status');
-                       $dbh->do(q{UPDATE calls SET status = $1, dc = $2 WHERE call = $3}
-                               ,undef,$status,$c->user->id,$call->{call});
-                       $logmess .= "Changed status to: ".$c->req->param('status')."\n";
-               }
-               $log->execute($c->user->id,$call->{ftid},$logmess) if $log;
-       }elsif($c->req->param('cmd') =~ /^Take call$/){
-               my $extra_vars = '';
-               $dbh->do(q{UPDATE calls SET dc = ? WHERE call = ?},
-                       ,undef,$c->user->id,$call->{call});
-               $log->execute($c->user->id,$call->{ftid}
-                       ,'Changed status to: [B]'.$c->req->param('cmd').'[/B]');
-       }
-       $dbh->commit;
-
-       $c->res->redirect($c->uri_for('edit',$call->{call}));
-}
-
-
-sub postattackerupdate : Local {
-       my ($self, $c, $call) = @_;
-       my $dbh = $c->model;
-
-       $c->forward('findCall');
-       $call = $c->stash->{call};
-
-       my $log = $dbh->prepare(q{INSERT INTO forum_posts (ftid,uid,message)
-               VALUES($2,$1,$3)
-               });
-
-       $dbh->begin_work;
-       if($c->req->param('cmd') eq 'Remove'){
-               my $query = $dbh->prepare(q{DELETE FROM incomings WHERE inc = ? AND call = ?});
-               my $inc = $dbh->prepare(q{SELECT pid,eta,amount FROM incomings WHERE inc = $1});
-               for my $param ($c->req->param()){
-                       if ($param =~ /^change:(\d+)$/){
-                               my ($planet,$eta,$amount) = $dbh->selectrow_array($inc,undef,$1);
-                               $query->execute($1,$call->{call});
-                               $log->execute($c->user->id,$call->{ftid}
-                                       ,"Deleted fleet: [B] $1 [/B] ($planet:$eta:$amount)");
-                       }
-               }
-       }elsif($c->req->param('cmd') eq 'Change'){
-               my $query = $dbh->prepare(q{UPDATE incomings SET shiptype = ?
-                       WHERE inc = ? AND call = ?
-               });
-               for my $param ($c->req->param()){
-                       if ($param =~ /^change:(\d+)$/){
-                               my $shiptype = html_escape($c->req->param("shiptype:$1"));
-                               $query->execute($shiptype,$1,$call->{call});
-                               $log->execute($c->user->id,$call->{ftid}
-                                       ,"set fleet: [B] $1 [/B] to: [B] $shiptype [/B]");
-                       }
-               }
-       }
-       $dbh->commit;
-
-       $c->res->redirect($c->uri_for('edit',$call->{call}));
-}
-
-sub findCall : Private {
-       my ( $self, $c, $call) = @_;
-       my $dbh = $c->model;
-
-       my $query = $dbh->prepare(q{
-               SELECT call, coords(p.x,p.y,p.z), c.landing_tick, c.info, status
-                       ,dc.username AS dc, u.defense_points,c.uid
-                       ,p.pid, u.username AS member, u.sms,c.ftid,calc
-               FROM calls c
-               JOIN users u USING (uid)
-               JOIN current_planet_stats p USING (pid)
-               LEFT OUTER JOIN users dc ON c.dc = dc.uid
-               WHERE call = ?
-               });
-       $call = $dbh->selectrow_hashref($query,undef,$call);
-
-       $c->assert_user_roles(qw/calls_edit/) unless $c->user->id == $call->{uid};
-       $c->stash(call => $call);
-}
-
-=head1 AUTHOR
-
-Michael Andreen (harv@ruin.nu)
-
-=head1 LICENSE
-
-GPL 2.0, or later.
-
-=cut
-
-1;
index 990b2225e9f07fef9b1afc0ff028b1150f5f955a..9666282e1f805c31fafac2af5784a77866f8f269 100644 (file)
@@ -269,7 +269,7 @@ sub member : Local {
        my $dbh = $c->model;
 
        my $query = $dbh->prepare(q{
-               SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched, inc.landing_tick
+               SELECT coords(t.x,t.y,t.z), i.eta, i.tick, rt.id AS ndtarget, rc.launched
                FROM users u
                LEFT OUTER JOIN (SELECT DISTINCT eta,tick,sender,target,mission,name FROM intel WHERE amount IS NULL) i ON i.sender = u.pid
                LEFT OUTER JOIN current_planet_stats t ON i.target = t.pid
@@ -277,10 +277,6 @@ sub member : Local {
                                JOIN raid_targets rt ON r.id = rt.raid) rt ON rt.pid = i.target
                        AND (rt.tick + 12) > i.tick AND rt.tick <= i.tick
                LEFT OUTER JOIN raid_claims rc ON rt.id = rc.target AND rc.uid = u.uid AND i.tick = rt.tick + rc.wave - 1
-               LEFT OUTER JOIN (SELECT pid, eta, landing_tick FROM calls c
-                                       JOIN incomings i USING (call)) inc ON inc.pid = i.target
-                               AND (inc.landing_tick + inc.eta) >= i.tick 
-                               AND (inc.landing_tick - inc.eta - 1) <= (i.tick - i.eta)
                WHERE u.uid = $1 AND i.mission = 'Attack'
                ORDER BY (i.tick - i.eta)
                });
index 6afbb6511d058b02ad5511d087b890515388ea9e..c4d2e2974038f541854d907d5ef7bae19bcf32a0 100644 (file)
@@ -59,14 +59,6 @@ sub index : Path : Args(0) {
                        },undef,$c->user->planet)
        );
 
-       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({}) );
-
        $c->stash(fleets => member_fleets($dbh, $c->user->id,$c->user->planet));
 
        my $announcements = $dbh->prepare(q{SELECT ft.ftid, u.username,ft.subject,
@@ -386,7 +378,7 @@ sub insertintel : Private {
        });
        my @intel;
        while ($intel =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)
-               \*?\s+(A|D)\s+(.+?)\s+(?:(?:Ter|Cat|Xan|Zik|Etd)\s+)?(\d+)\s+(\d+)/gx){
+               \*?\s+(A|D)\s+(.+?)\s+(?:(?:\w+)\s+)?(\d+)\s+(\d+)/gx){
                my $ingal = ($1 == $4 && $2 == $5) || 0;
                my $lt = $tick + $10;
                my $back = ($ingal ? $lt + 4 : undef);
@@ -405,77 +397,6 @@ sub insertintel : Private {
        $c->flash(scans => \@scans);
 }
 
-sub addincs : Local {
-       my ( $self, $c ) = @_;
-       $c->stash(incs => $c->flash->{incs});
-
-}
-
-sub postincs : Local {
-       my ( $self, $c ) = @_;
-       my $dbh = $c->model;
-
-       my @incs;
-
-       my $user = $dbh->prepare(q{
-SELECT uid FROM users u
-WHERE pid = planetid($1,$2,$3,tick())
-       AND uid IN (SELECT uid FROM groupmembers WHERE gid = 'M')
-               });
-       my $call = $dbh->prepare(q{
-SELECT call
-FROM calls WHERE uid = $1 AND landing_tick = tick() + $2
-               });
-       my $fleet = $dbh->prepare(q{
-SELECT pid
-FROM incomings i
-WHERE pid = planetid($1,$2,$3,tick()) AND amount = $4 and fleet = $5 AND call = $6
-               });
-       my $irc = $dbh->prepare(q{
-INSERT INTO irc_requests (uid,channel,message) VALUES($1,'def',$2)
-               });
-
-       my $msg = $c->req->param('message');
-       while ($msg =~ m/(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\*?\s+A\s+(.+?)\s+(Ter|Cat|Xan|Zik|Etd)\s+(\d+)\s+(\d+)/gc
-                       ||$msg =~ /expand\s+(\d+):(\d+):(\d+)\*?\s+(\d+):(\d+):(\d+)\s+([^:]*\S+)\s+(Ter|Cat|Xan|Zik|Etd)\s+([\d,]+)\s+(\d+)/gc
-                       || $msg =~ /(\d+):(\d+):(\d+)\s+(\d+):(\d+):(\d+)\s+\((Ter|Cat|Xan|Zik|Etd)\)\s+([^,]*\S+)\s+([\d,]+)\s+(\d+)\s+\(\d+\)/gc){
-
-               my $inc = {message => $&};
-               my $amount = $9;
-               {
-                       $amount =~ s/,//g;
-               }
-               try {
-                       my $uid = $dbh->selectrow_array($user,undef,$1,$2,$3);
-                       die '<i>No user with these coords</i>' unless $uid;
-
-                       my $call = $dbh->selectrow_array($call,undef,$uid,$10);
-                       if ($call){
-                               my $pid = $dbh->selectrow_hashref($fleet,undef,$4,$5,$6,$amount,$7,$call);
-                               die '<i>Duplicate</i>' if $pid;
-
-                       }
-
-                       my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10";
-                       $irc->execute($c->user->id, $message);
-                       $inc->{status} = '<b>Added</b>';
-
-               } catch {
-                       when (m(^(<i>.*</i>) at )){
-                               $inc->{status} = $1;
-                       }
-                       default {
-                               $inc->{status} = $_;
-                       }
-               };
-               push @incs, $inc;
-       }
-
-       $c->signal_bots if @incs;
-       $c->flash(incs => \@incs);
-       $c->res->redirect($c->uri_for('addincs'));
-}
-
 sub launchConfirmation : Local {
        my ( $self, $c ) = @_;
 
index 19c9703498f49049fb91f535a53192f136ae9518..036473a349a5c55a114731063a3b6abe8b058d18 100644 (file)
@@ -55,7 +55,6 @@
        <li><a href="/members/points">Top points</a></li>
        <li><a href="/members/stats">Top ranks</a></li>
        <li><a href="/members/addintel">Add intel/scans</a></li>
-       <li><a href="/members/addincs">Report incs</a></li>
        <li><a href="/members/ircrequest">IRC request</a></li>
        <li><a href="/stats/tags">Planet tags</a></li>
 </ul>
 <ul class="linkbar">
        <li><a href="/users/sms">Send SMS</a></li>
        <li><a href="/members/defenders">Available defenders</a></li>
-       <li><a href="/calls/defleeches">Def Leeches</a></li>
-       <li><a href="/calls/list">Active calls</a></li>
-       <li><a href="/calls/list/recent">Recent calls</a></li>
-       <li><a href="/calls/list/uncovered">Not covered calls</a></li>
-       <li><a href="/calls/list/covered">Covered calls</a></li>
-       <li><a href="/calls/list/all">All calls</a></li>
 </ul>
 [% END %]
 [% IF c.check_user_roles("bc_menu") %]
diff --git a/root/src/calls/defleeches.tt2 b/root/src/calls/defleeches.tt2
deleted file mode 100644 (file)
index 7e6bdfe..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-[% META title = 'Def Leeches' %]
-<table>
-       <tr>
-       <th>User</th>
-       <th>Def Points</th>
-       <th>Def Missions</th>
-       <th>Recalled missions</th>
-       <th>Calls</th>
-       <th>Defended calls</th>
-       <th title="Compared to own value at the time">Value received</th>
-       <th title="Compared to own value at the time">Value sent</th>
-       </tr>
-[% FOR m IN members %]
-       <tr align="right" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-       <td align="left">[% m.username %]</td>
-       <td>[% m.defense_points %]</td>
-       <td>[% m.fleets %]</td>
-       <td>[% m.recalled %]</td>
-       <td>[% m.calls %]</td>
-       <td>[% m.defended_calls %]</td>
-       <td>[% m.value %]</td>
-       <td>[% m.sent_value %]</td>
-       </tr>
-[% END %]
-</table>
diff --git a/root/src/calls/edit.tt2 b/root/src/calls/edit.tt2
deleted file mode 100644 (file)
index 4c4cb3d..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-[% META title = 'Edit call' %]
-
-<form action="[% c.uri_for('postcallupdate',call.call) %]" method="post">
-<fieldset> <legend>Call details, call# [% call.call %]</legend>
-<table>
-<tr>
-<td>
-<ul>
-       <li>Current DC: [% call.dc %]</li>
-       <li>Member: [% call.member %] </li>
-       <li>SMS: [% call.sms %] </li>
-       <li>Coords: <a href="[% c.uri_for('/stats/planet', call.pid) %]">[% call.coords %]</a></li>
-       <li>Landing at tick: <br>
-               <input type="text" name="tick" value="[% call.landing_tick %]">
-               <input type="checkbox" name="ctick"></li>
-       <li>Current ETA: [% call.landing_tick - TICK %]</li>
-</ul>
-</td>
-<td>
-       <textarea rows="8" cols="40" name="info">[% call.info | html %]</textarea>
-</td>
-<td><ul>
-       <li>Calc: <input type="text" name="calc" value="[% call.calc | html %]">
-               <input type="checkbox" name="ccalc"></li>
-       <li>Change Notes? <input type="checkbox" name="cinfo"></li>
-       <li>Status: <select name="status">[% FOR s IN statuses %]
-               <option value="[% s.status %]"[% IF s.status == call.status %] selected[% END %]>[% s.status %]</option>
-               [% END %]</select><input type="checkbox" name="cstatus"></li>
-       <li><input type="submit" name="cmd" value="Submit"></li>
-       <li><input type="submit" name="cmd" value="Take call"></li>
-</ul></td>
-</tr>
-</table>
-</fieldset>
-</form>
-<fieldset><legend>Attackers:</legend>
-<form action="[% c.uri_for('postattackerupdate',call.call) %]" method="post">
-       <table>
-       <tr>
-       <th></th>
-       <th>Coords</th>
-       <th>Planet status</th>
-       <th>Alliance</th>
-       <th>Race</th>
-       <th>Initial ETA</th>
-       <th>Amount</th>
-       <th>Shiptypes</th>
-       <th>Fleet</th>
-       <th>Change/remove?</th>
-       </tr>
-[% FOR a IN attackers %]
-       <tr class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-               <td><input type="button" onclick="$('#attacker[% a.inc %]').toggle()" value="&dArr;" title="Show fleets"></td>
-               <td><a href="[% c.uri_for('/stats/planet',a.pid) %]">[% a.coords %]</a></td>
-               <td class="[% a.planet_status %]">[% a.planet_status %]</td>
-               <td class="[% a.relationship %]">[% a.alliance %] ([% a.relationship %])</td>
-               <td>[% a.race %]</td>
-               <td>[% a.eta %]</td>
-               <td>[% a.amount %]</td>
-               <td><input class="coord" type="text" name="shiptype:[% a.inc %]" value="[% a.shiptype %]"></td>
-               <td>[% a.fleet %]</td>
-               <td><input type="checkbox" name="change:[% a.inc %]"></td>
-       </tr>
-       <tr id="attacker[% a.inc %]" class="hidden">
-       <td></td>
-       <td colspan="8">
-       [% PROCESS inc/missionlist.tt2 missions=a.missions %]
-       </td></tr>
-[% END %]
-       </table>
-       <p>
-       <input type="submit" name="cmd" value="Change">
-       <input type="submit" name="cmd" value="Remove">
-       </p>
-</form>
-</fieldset>
-<fieldset><legend>Member fleet</legend>
-[% PROCESS inc/missionlist.tt2 missions=fleets %]
-</fieldset>
-<fieldset><legend>Defenders</legend>
-[% PROCESS inc/missionlist.tt2 missions=defenders %]
-</fieldset>
-
-<div>
-[% FOR post IN posts %]
-<fieldset class="forum-post">
-<legend class="unread:[% post.unread %]"><b>[% post.username %]</b> : [% post.time %]</legend>
-       [% post.message %]
-</fieldset>
-[% END %]
-
-<form action="[% c.uri_for('postcallcomment', call.call) %]" method="post"><fieldset class="forum-post"> <legend>New Reply</legend>
-       <textarea rows="10" cols="60" name="message"></textarea>
-       <input type="submit" value="Submit">
-</fieldset></form>
-</div>
diff --git a/root/src/calls/list.tt2 b/root/src/calls/list.tt2
deleted file mode 100644 (file)
index ada4f76..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[% META title = 'Defense calls' %]
-<table>
-       <tr><th>Call</th><th>Status</th><th>DC</th><th>Def Fleets</th><th>Member (defprio)</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>ETA</th><th>Alliance</th><th>Attackers</th></tr>
-[% newday = game.tick %]
-[% FOR call IN calls %]
-       [% WHILE newday - 24 > call.landing_tick %]
-               [%      newday = newday - 24 %]
-       <tr align="center"><td colspan="4">New day</td></tr>
-       [% END %]
-       <tr align="center" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-               <td class="[% UNLESS call.dc %]Hostile[%END%]"><a href="[% c.uri_for('edit',call.call) %]">[% call.call %]</a></td>
-               <td>[% call.status %]</td>
-               <td>[% call.dc %]</td>
-               <td>[% call.fleets %]</td>
-               [% prio = call.defprio < minprio ? 'LowestPrio' :
-                       (call.defprio < maxprio ? 'MediumPrio' : 'HighestPrio') %]
-               <td class="[% prio %]"><a href="[% c.uri_for('/stats/planet',call.planet) %]">
-                       [% call.coords %] ([% call.defprio %])</a></td>
-               <td>[% call.landing_tick %]</td>
-               <td>[% call.race.unique.join('/') %]</td>
-               <td>[% call.amount.join(' / ') %]</td>
-               <td>[% call.shiptype.unique.join('/') | html %]</td>
-               <td>[% call.curreta %] ([% call.eta.unique.join('/') %])</td>
-               <td>[% call.alliance.unique.join('/') %]</td>
-               <td>[% FOR a IN call.attackers %]
-                       <a href="[% c.uri_for('/stats/find',a) %]">[% a %]</a>
-                       [% UNLESS loop.last %]/[%END%]
-               [%END%]</td>
-       </tr>
-[% END %]
-</table>
diff --git a/root/src/members/addincs.tt2 b/root/src/members/addincs.tt2
deleted file mode 100644 (file)
index 578de0f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-[% META title = 'Add new incs' %]
-[% IF incs.size %]
-<div class="leftinfo">
-<h3>Added the following incs:</h3>
-       [% FOR i IN incs %]
-<p>[% i.status %]: [% i.message %]</p>
-       [% END %]
-</div>
-[% END %]
-
-<form action="[% c.uri_for('postincs') %]" method="post"><fieldset> <legend>Intel/scans</legend>
-       <p>
-               Paste incs from overview or ingame defense page here, for use when
-               <a href="/wiki/Members:MailReport">MailReport</a> doesn't work.
-               New incs will be forwarded to irc where they will be reported.
-       </p>
-       <textarea rows="20" cols="50" name="message"></textarea>
-       <p><input type="submit" name="cmd" value="Submit"></p>
-</fieldset></form>
-
index da11c5230c0a128135592773a97024c67598f571..b166e4cfb596edfeb79b499662859f4b59ca8789 100644 (file)
        </tr>
 </table>
 [% END %]
-[% IF calls %]
-<table>
-       <tr><th>Call</th><th>Status</th><th>DC</th><th>Landing tick</th><th>Races</th><th>Amount</th><th>Shiptypes</th><th>Current eta</th><th>Inital eta</th><th>Attackers</th></tr>
-       [% FOR call IN calls %]
-       <tr align="center" class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
-               <td class="[% UNLESS call.dc %]Hostile[%END%]"><a href="[% c.uri_for('/calls/edit',call.call) %]">[% call.call %]</a></td>
-               <td>[% call.status %]</td>
-               <td>[% call.dc %]</td>
-               <td>[% call.landing_tick %]</td>
-               <td>[% call.race.unique.join('/') %]</td>
-               <td>[% call.amount.join('/') %]</td>
-               <td>[% call.shiptype.unique.join('/') | html %]</td>
-               <td>[% call.curreta %]</td>
-               <td>[% call.eta.unique.join('/') %]</td>
-               <td>[% FOR a IN call.attackers %]
-                       <a href="[% c.uri_for('/stats/find',a) %]">[% a %]</a>
-                       [% UNLESS loop.last %]/[%END%]
-               [%END%]</td>
-       </tr>
-       [% END %]
-</table>
-[% END %]
 <div class="leftinfo">
 <fieldset class="forum-post"> <legend>Account details</legend>
        <ul>
diff --git a/t/controller_Calls.t b/t/controller_Calls.t
deleted file mode 100644 (file)
index 191dba0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-use Test::More tests => 3;
-
-BEGIN { use_ok 'Catalyst::Test', 'NDWeb' }
-BEGIN { use_ok 'NDWeb::Controller::Calls' }
-
-ok( request('/calls')->is_success, 'Request should succeed' );
-
-