添加html支持

packages/hydrooj/src/handler/problem.ts

@@ -1,5 +1,5 @@
 import { isSafeInteger, flatten } from 'lodash';
-import yaml from 'js-yaml';
+import yaml, { safeLoad } from 'js-yaml';
 import { ObjectID } from 'mongodb';
 import {
     NoProblemError, ProblemDataNotFoundError, BadRequestError,
@@ -360,7 +360,7 @@ class ProblemSettingsHandler extends ProblemManageHandler {
     async postConfig(domainId: string, pid: string | number, cfg: string) {
         const pdoc = await problem.get(domainId, pid);
         // TODO validate
-        const config = yaml.safeLoad(cfg);
+        const config = yaml.safeLoad(cfg) as any;
         await problem.edit(domainId, pdoc.docId, { config });
         this.back();
     }

packages/hydrooj/src/interface.ts

@@ -141,11 +141,12 @@ export interface Pdoc {
     hidden: boolean,
     config: ProblemConfig,
     acMsg?: string,
+    html?: boolean,
 
     difficulty?: number,
     difficultyAlgo?: number,
     difficultyAdmin?: number,
-    difficultySetting?: number,
+    difficultySetting?: any,
 }
 
 export type Pdict = NumericDictionary<Pdoc>;

packages/hydrooj/src/model/problem.ts

@@ -1,5 +1,6 @@
-import { ObjectID } from 'mongodb';
+import { ObjectID, FilterQuery } from 'mongodb';
 import { Dictionary } from 'lodash';
+import { safeLoad } from 'js-yaml';
 import { STATUS } from './builtin';
 import * as file from './file';
 import * as document from './document';
@@ -29,6 +30,7 @@ export const pdocHidden: Pdoc = {
     owner: 1,
     title: '*',
     content: '',
+    html: false,
     nSubmit: 0,
     nAccept: 0,
     difficulty: 0,
@@ -75,11 +77,11 @@ export function getMulti(domainId: string, query: object) {
     return document.getMulti(domainId, document.TYPE_PROBLEM, query);
 }
 
-export function getMultiStatus(domainId: string, query: object) {
+export function getMultiStatus(domainId: string, query: FilterQuery<Pdoc>) {
     return document.getMultiStatus(domainId, document.TYPE_PROBLEM, query);
 }
 
-export function edit(domainId: string, _id: number, $set: any): Promise<Pdoc> {
+export function edit(domainId: string, _id: number, $set: Partial<Pdoc>): Promise<Pdoc> {
     return document.set(domainId, document.TYPE_PROBLEM, _id, $set);
 }
 
@@ -158,7 +160,7 @@ export async function setTestdata(domainId: string, _id: number, filePath: strin
     const config = await testdataConfig.readConfig(filePath);
     const id = await file.add(filePath, 'data.zip', 1);
     if (pdoc.data instanceof ObjectID) file.del(pdoc.data);
-    return await edit(domainId, _id, { data: id, config });
+    return await edit(domainId, _id, { data: id, config: safeLoad(config) as any });
 }
 
 global.Hydro.model.problem = {