record_main & record_detail

hydro/error.js

@@ -21,7 +21,7 @@ class ForbiddenError extends UserFacingError {
 }
 class NotFoundError extends UserFacingError {
     constructor(type) {
-        super(type);
+        super(type || 'NotFoundError');
         this.code = 404;
     }
 }
@@ -107,7 +107,7 @@ class ContestNotFoundError extends NotFoundError {
 module.exports = {
     BadRequestError, ForbiddenError, NotFoundError,
     LoginError, UserAlreadyExistError, InvalidTokenError,
-    UserNotFoundError, VerifyPasswordError, 
+    UserNotFoundError, VerifyPasswordError,
     OpcountExceededError, PermissionError, NoProblemError,
     ValidationError, ProblemNotFoundError, TrainingNotFoundError,
     ContestNotFoundError, RecordNotFoundError

hydro/handler/base.js

@@ -44,6 +44,7 @@ MIDDLEWARE(async (ctx, next) => {
                 }
             }
         };
+        ctx.csrf_token = await token.add(token.TYPE_CSRF_TOKEN, 600, ctx.path);
         console.log(ctx.session.uid);
         await next();
         if (ctx.session.sid)

hydro/handler/problem.js

@@ -41,9 +41,18 @@ GET('/p/:pid', requirePerm(PERM_VIEW_PROBLEM), async ctx => {
     ctx.templateName = 'problem_detail.html';
     ctx.body = { pdoc, udoc, title: pdoc.title };
 });
+GET('/p/:pid/submit', requirePerm(PERM_SUBMIT_PROBLEM), async ctx => {
+    let uid = ctx.state.user._id,
+        pid = ctx.params.pid;
+    let pdoc = await problem.get({ pid, uid });
+    if (pdoc.hidden) ctx.checkPerm(PERM_VIEW_PROBLEM_HIDDEN);
+    let udoc = await user.getById(pdoc.owner);
+    ctx.templateName = 'problem_submit.html';
+    ctx.body = { pdoc, udoc, title: pdoc.title };
+});
 POST('/p/:pid/submit', requirePerm(PERM_SUBMIT_PROBLEM), async ctx => {
     let rid = await record.add({
-        creator: ctx.state.user._id,
+        uid: ctx.state.user._id,
         lang: ctx.request.body.language,
         code: ctx.request.body.code,
         pid: ctx.params.pid

hydro/handler/record.js

@@ -3,19 +3,28 @@ const
     { constants } = require('../options'),
     { GET } = require('../service/server'),
     record = require('../model/record'),
+    user = require('../model/user'),
+    problem = require('../model/problem'),
     { PERM_READ_RECORD_CODE, PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD } = require('../permission');
 
 GET('/r', async ctx => {
     let q = {},
         page = ctx.query.page || 1;
     let rdocs = await record.getMany(q, { rid: 1 }, page, constants.RECORD_PER_PAGE);
-    ctx.body = { page, rdocs };
+    let pdict, udict;
+    for (let rdoc in rdocs) {
+        udict[rdoc.uid] = await user.getById(rdoc.uid);
+        pdict[rdoc.pid] = await problem.get({ pid: rdoc.pid, uid: ctx.state.user._id });
+    }
+    ctx.templateName = 'record_main.html';
+    ctx.body = { page, rdocs, pdict, udict };
 });
 GET('/r/:rid', async ctx => {
     let uid = ctx.state.user._id, rid = new bson.ObjectID(ctx.params.rid);
     let rdoc = await record.get(rid);
     if (rdoc.hidden) ctx.checkPerm(PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
-    if (rdoc.creator != uid && !ctx.state.user.hasPerm(PERM_READ_RECORD_CODE)) rdoc.code = null;
+    if (rdoc.uid != uid && !ctx.state.user.hasPerm(PERM_READ_RECORD_CODE)) rdoc.code = null;
+    ctx.templateName = 'record_detail.html';
     ctx.body = { rdoc };
 });
 

hydro/handler/ui.js

@@ -70,7 +70,8 @@ MIDDLEWARE(async (ctx, next) => {
     ctx.render = async (name, context) => {
         ctx.user = ctx.state.user;
         ctx.translate = str => {
-            return str.translate(ctx.state.user.language);
+            if (!str) return '';
+            return str.toString().translate(ctx.state.user.language);
         };
         ctx.has_perm = perm => ctx.state.user.hasPerm(perm);
         ctx.body = await new Promise((resolve, reject) => {
@@ -87,15 +88,18 @@ MIDDLEWARE(async (ctx, next) => {
     try {
         try {
             await next();
-            if (!ctx.body) throw new NotFoundError();
-            if (ctx.query.template || ctx.templateName) {
-                Object.assign(ctx.body, JSON.parse(ctx.query.data || '{}'));
-                await ctx.render(ctx.query.template || ctx.templateName, ctx.body);
-            } else if (ctx.setRedirect) {
-                ctx.response.type = 'application/octet-stream';
-                ctx.redirect(ctx.setRedirect);
-            }
+            if (ctx.body || ctx.templateName) {
+                if (ctx.query.template || ctx.templateName) {
+                    ctx.body = ctx.body || {};
+                    Object.assign(ctx.body, JSON.parse(ctx.query.data || '{}'));
+                    await ctx.render(ctx.query.template || ctx.templateName, ctx.body);
+                } else if (ctx.setRedirect) {
+                    ctx.response.type = 'application/octet-stream';
+                    ctx.redirect(ctx.setRedirect);
+                }
+            } else throw new NotFoundError();
         } catch (error) {
+            console.log(error);
             if (error.toString().startsWith('Template render error')) throw error;
             await ctx.render('error.html', { error });
         }

hydro/handler/user.js

@@ -1,5 +1,5 @@
 const
-    { GET, POST, CONTEXT } = require('../service/server.js'),
+    { GET, POST } = require('../service/server.js'),
     user = require('../model/user'),
     token = require('../model/token'),
     system = require('../model/system'),
@@ -30,7 +30,8 @@ POST('/login', async ctx => {
     ctx.session.uid = udoc._id;
     ctx.session.rememberme = rememberme;
     ctx.body = {};
-    ctx.setRedirect = ctx.request.headers.referer || '/';
+    let referer = ctx.request.headers.referer || '/';
+    ctx.setRedirect = referer.endsWith('/login') ? '/' : referer;
 });
 POST('/logout', requirePerm(PERM_LOGGEDIN), async ctx => {
     ctx.session = { uid: 1 };

hydro/model/builtin.js

@@ -177,6 +177,40 @@ const FOOTER_EXTRA_HTMLS = [];
 const VIEW_LANGS = [
     { code: 'zh-CN', name: 'zh-CN' }
 ];
+const LANGS = [
+    { id: 'cc', name: 'cpp' }
+];
+const LANG_TEXTS = {
+    c: 'C',
+    cc: 'C++',
+    cs: 'C#',
+    pas: 'Pascal',
+    java: 'Java',
+    py: 'Python',
+    py3: 'Python 3',
+    php: 'PHP',
+    rs: 'Rust',
+    hs: 'Haskell',
+    js: 'JavaScript',
+    go: 'Go',
+    rb: 'Ruby',
+};
+const LANG_HIGHLIGHT_ID = {
+    c: 'c',
+    cc: 'cpp',
+    cs: 'csharp',
+    pas: 'pascal',
+    java: 'java',
+    py: 'python',
+    py3: 'python',
+    php: 'php',
+    rs: 'rust',
+    hs: 'haskell',
+    js: 'javascript',
+    go: 'go',
+    rb: 'ruby',
+};
 module.exports = {
-    BUILTIN_USERS, BUILTIN_ROLES, CATEGORIES, VIEW_LANGS, FOOTER_EXTRA_HTMLS
+    BUILTIN_USERS, BUILTIN_ROLES, CATEGORIES, VIEW_LANGS, FOOTER_EXTRA_HTMLS, LANGS,
+    LANG_TEXTS, LANG_HIGHLIGHT_ID
 };

hydro/model/token.js

@@ -4,6 +4,7 @@ const
 
 module.exports = {
     TYPE_SESSION: 0,
+    TYPE_CSRF_TOKEN: 1,
     TYPE_REGISTER: 2,
     /**
      * Add a token.