Sort problems in standings by value and fix standings JSON

[gruntmaster-page.git] / lib / Plack / App / Gruntmaster.pm

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 8aab08c2c7e261f50418d9f5454d44fb25baa1a6..efcedf54a23e74f79fae336dfa64733b020df16d 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -112,7 +112,7 @@ sub dispatch_request{
 
                sub (/src/:job) {
                        return NOT_FOUND if !job;
-                       forbid job->private || job->problem->private || job->contest && job->contest->private;
+                       forbid job->private || job->problem->private || job->contest && job->contest->is_running;
                        my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => CONTENT_TYPES->{job->format});
                        [200, \@headers, [job->source]]
                },
@@ -144,14 +144,18 @@ sub dispatch_request{
                sub (/st/:contest) {
                        response st => 'Standings', {
                                st => [ contest->standings ],
-                               problems => [map { $_->problem } contest->contest_problems],
+                               problems => [
+                                       map { [$_->id, $_->name] }
+                                       sort { $a->value <=> $b->value }
+                                       map { $_->problem } contest->contest_problems],
                        }, 10
                },
 
                sub (/login) {
                        forbid !remote_user;
 
-                       [204, ['Set-Cookie' => "username=".remote_user->id], []]
+                       my $return = $env->{HTTP_REFERER} // '/';
+                       [303, ['Set-Cookie' => "username=".remote_user->id, Location => $return], []]
                },
 
                sub (/ct/:contest/log/st) { redirect "/st/$_{contest}" },
@@ -178,7 +182,11 @@ sub dispatch_request{
                        $_{contest} = $contest;
                        return NOT_FOUND if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
                        forbid problem->is_private;
-                       response pb_entry => problem->name, db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id);
+                       if (contest && contest->is_running) {
+                               forbid !remote_user;
+                               $privacy = 'private';
+                       }
+                       response pb_entry => problem->name, {%{db->problem_entry($_{problem}, $_{contest}, remote_user && remote_user->id)}, maybe contest => $_{contest}};
                },
                sub (/sol/:problem) {
                        forbid !problem->is_in_archive;
@@ -216,6 +224,7 @@ sub dispatch_request{
                        forbid !remote_user;
                        return reply 'This contest has finished' if contest && contest->is_finished;
                        return reply 'This contest has not yet started' if !admin && contest && contest->is_pending;
+                       return reply 'This problem does not belong to this contest' if !contest && !problem->is_in_archive || contest && !db->contest_problems->find($_{contest}, $_{problem});
                        return reply 'Maximum source size is 10KB' if ($prog ? $prog->size : length $_{source_code}) > 10 * 1024;
                        return reply 'You must wait 30 seconds between jobs' if !admin && time <= remote_user->lastjob + 30;
                        remote_user->update({lastjob => time});
@@ -224,7 +233,7 @@ sub dispatch_request{
                        unlink $prog->path if $prog;
                        my $newjob = db->jobs->create({
                                maybe contest => $_{contest},
-                               maybe private => problem->private,
+                               maybe private => problem->private && !$_{contest},
                                date => time,
                                extension => FORMAT_EXTENSION->{$_{prog_format}},
                                format => $_{prog_format},