From 23e133163ef06e0afc2000152df31c966f4929b2 Mon Sep 17 00:00:00 2001 From: Michael Andreen Date: Mon, 9 Jan 2023 23:01:13 +0100 Subject: [PATCH] Remove most of def calls --- lib/NDWeb.pm | 5 - lib/NDWeb/Controller/Calls.pm | 379 -------------------------------- lib/NDWeb/Controller/Intel.pm | 6 +- lib/NDWeb/Controller/Members.pm | 81 +------ root/lib/site/leftbar.tt2 | 7 - root/src/calls/defleeches.tt2 | 25 --- root/src/calls/edit.tt2 | 96 -------- root/src/calls/list.tt2 | 31 --- root/src/members/addincs.tt2 | 20 -- root/src/members/index.tt2 | 22 -- t/controller_Calls.t | 10 - 11 files changed, 2 insertions(+), 680 deletions(-) delete mode 100644 lib/NDWeb/Controller/Calls.pm delete mode 100644 root/src/calls/defleeches.tt2 delete mode 100644 root/src/calls/edit.tt2 delete mode 100644 root/src/calls/list.tt2 delete mode 100644 root/src/members/addincs.tt2 delete mode 100644 t/controller_Calls.t diff --git a/lib/NDWeb.pm b/lib/NDWeb.pm index 20c61d4..4bd3ac7 100644 --- a/lib/NDWeb.pm +++ b/lib/NDWeb.pm @@ -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 index 48eac7e..0000000 --- a/lib/NDWeb/Controller/Calls.pm +++ /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; diff --git a/lib/NDWeb/Controller/Intel.pm b/lib/NDWeb/Controller/Intel.pm index 990b222..9666282 100644 --- a/lib/NDWeb/Controller/Intel.pm +++ b/lib/NDWeb/Controller/Intel.pm @@ -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) }); diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm index 6afbb65..c4d2e29 100644 --- a/lib/NDWeb/Controller/Members.pm +++ b/lib/NDWeb/Controller/Members.pm @@ -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 'No user with these coords' 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 'Duplicate' if $pid; - - } - - my $message = "$1:$2:$3 $4:$5:$6 $7 $8 $amount $10"; - $irc->execute($c->user->id, $message); - $inc->{status} = 'Added'; - - } catch { - when (m(^(.*) 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 ) = @_; diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2 index 19c9703..036473a 100644 --- a/root/lib/site/leftbar.tt2 +++ b/root/lib/site/leftbar.tt2 @@ -55,7 +55,6 @@
  • Top points
  • Top ranks
  • Add intel/scans
    • -
  • Report incs
  • IRC request
  • Planet tags
    • @@ -91,12 +90,6 @@ [% 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 index 7e6bdfe..0000000 --- a/root/src/calls/defleeches.tt2 +++ /dev/null @@ -1,25 +0,0 @@ -[% META title = 'Def Leeches' %] - - - - - - - - - - - -[% FOR m IN members %] - - - - - - - - - - -[% END %] -
    UserDef PointsDef MissionsRecalled missionsCallsDefended callsValue receivedValue sent
    [% m.username %][% m.defense_points %][% m.fleets %][% m.recalled %][% m.calls %][% m.defended_calls %][% m.value %][% m.sent_value %]
    diff --git a/root/src/calls/edit.tt2 b/root/src/calls/edit.tt2 deleted file mode 100644 index 4c4cb3d..0000000 --- a/root/src/calls/edit.tt2 +++ /dev/null @@ -1,96 +0,0 @@ -[% META title = 'Edit call' %] - -
    -
    Call details, call# [% call.call %] - - - - - - -
    -
      -
    • Current DC: [% call.dc %]
      • -
    • Member: [% call.member %]
      • -
    • SMS: [% call.sms %]
      • -
    • Coords: [% call.coords %]
      • -
    • Landing at tick:
      - -
      • -
    • Current ETA: [% call.landing_tick - TICK %]
      • -
    -    		 - -
      -
    • Calc: -
      • -
    • Change Notes?
      • -
    • Status:
      • -
      • -
      • -
    -
    -
    -
    Attackers: -
    - - - - - - - - - - - - - -[% FOR a IN attackers %] - - - - - - - - - - - - - - - -[% END %] -
    CoordsPlanet statusAllianceRaceInitial ETAAmountShiptypesFleetChange/remove?
    [% a.coords %][% a.planet_status %][% a.alliance %] ([% a.relationship %])[% a.race %][% a.eta %][% a.amount %][% a.fleet %]
    -

    - - -

    -
    -
    -
    Member fleet -[% PROCESS inc/missionlist.tt2 missions=fleets %] -
    -
    Defenders -[% PROCESS inc/missionlist.tt2 missions=defenders %] -
    - -
    -[% FOR post IN posts %] -
    -[% post.username %] : [% post.time %] - [% post.message %] -
    -[% END %] - -
    New Reply - - -
    -
    diff --git a/root/src/calls/list.tt2 b/root/src/calls/list.tt2 deleted file mode 100644 index ada4f76..0000000 --- a/root/src/calls/list.tt2 +++ /dev/null @@ -1,31 +0,0 @@ -[% META title = 'Defense calls' %] - - -[% newday = game.tick %] -[% FOR call IN calls %] - [% WHILE newday - 24 > call.landing_tick %] - [% newday = newday - 24 %] - - [% END %] - - - - - - [% prio = call.defprio < minprio ? 'LowestPrio' : - (call.defprio < maxprio ? 'MediumPrio' : 'HighestPrio') %] - - - - - - - - - -[% END %] -
    CallStatusDCDef FleetsMember (defprio)Landing tickRacesAmountShiptypesETAAllianceAttackers
    New day
    [% call.call %][% call.status %][% call.dc %][% call.fleets %] - [% call.coords %] ([% call.defprio %])[% call.landing_tick %][% call.race.unique.join('/') %][% call.amount.join(' / ') %][% call.shiptype.unique.join('/') | html %][% call.curreta %] ([% call.eta.unique.join('/') %])[% call.alliance.unique.join('/') %][% FOR a IN call.attackers %] - [% a %] - [% UNLESS loop.last %]/[%END%] - [%END%]
    diff --git a/root/src/members/addincs.tt2 b/root/src/members/addincs.tt2 deleted file mode 100644 index 578de0f..0000000 --- a/root/src/members/addincs.tt2 +++ /dev/null @@ -1,20 +0,0 @@ -[% META title = 'Add new incs' %] -[% IF incs.size %] -
    -

    Added the following incs:

    - [% FOR i IN incs %] -

    [% i.status %]: [% i.message %]

    - [% END %] -
    -[% END %] - -
    Intel/scans -

    - Paste incs from overview or ingame defense page here, for use when - MailReport doesn't work. - New incs will be forwarded to irc where they will be reported. -

    - -

    -
    - diff --git a/root/src/members/index.tt2 b/root/src/members/index.tt2 index da11c52..b166e4c 100644 --- a/root/src/members/index.tt2 +++ b/root/src/members/index.tt2 @@ -51,28 +51,6 @@ [% END %] -[% IF calls %] - - - [% FOR call IN calls %] - - - - - - - - - - - - - [% END %] -
    CallStatusDCLanding tickRacesAmountShiptypesCurrent etaInital etaAttackers
    [% call.call %][% call.status %][% call.dc %][% call.landing_tick %][% call.race.unique.join('/') %][% call.amount.join('/') %][% call.shiptype.unique.join('/') | html %][% call.curreta %][% call.eta.unique.join('/') %][% FOR a IN call.attackers %] - [% a %] - [% UNLESS loop.last %]/[%END%] - [%END%]
    -[% END %]
    Account details
      diff --git a/t/controller_Calls.t b/t/controller_Calls.t deleted file mode 100644 index 191dba0..0000000 --- a/t/controller_Calls.t +++ /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' ); - - -- 2.39.2