Merge branch 'master' into develop

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.22.3",
+    "version": "2.22.4",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/handler/contest.ts

@@ -413,7 +413,7 @@ class ContestCreateHandler extends ContestHandler {
     @param('beginAtDate', Types.Date)
     @param('beginAtTime', Types.Time)
     @param('duration', Types.Float)
-    @param('content', Types.Title)
+    @param('title', Types.Title)
     @param('content', Types.Content)
     @param('rule', Types.Name)
     @param('pids', Types.Content)

packages/hydrooj/src/handler/discussion.ts

@@ -326,7 +326,7 @@ class DiscussionEditHandler extends DiscussionHandler {
     }
 
     @param('did', Types.ObjectID)
-    @param('content', Types.Title)
+    @param('title', Types.Title)
     @param('content', Types.Content)
     @param('highlight', Types.Boolean)
     @param('pin', Types.Boolean)

packages/hydrooj/src/handler/homework.ts

@@ -302,7 +302,7 @@ class HomeworkEditHandler extends HomeworkHandler {
     @param('penaltySinceTime', Types.Time)
     @param('extensionDays', Types.Float)
     @param('penaltyRules', Types.Content, validatePenaltyRules, convertPenaltyRules)
-    @param('content', Types.Title)
+    @param('title', Types.Title)
     @param('content', Types.Content)
     @param('pids', Types.Content)
     @param('rated', Types.Boolean)

packages/hydrooj/src/handler/problem.ts

@@ -575,7 +575,7 @@ export class ProblemCreateHandler extends Handler {
         };
     }
 
-    @post('content', Types.Title)
+    @post('title', Types.Title)
     @post('content', Types.Content)
     @post('pid', Types.Name, true, isPid)
     @post('hidden', Types.Boolean)

packages/hydrooj/src/handler/training.ts

@@ -224,9 +224,9 @@ class TrainingEditHandler extends Handler {
     }
 
     @param('tid', Types.ObjectID)
-    @param('content', Types.Title)
+    @param('title', Types.Title)
     @param('content', Types.Content)
-    @param('dag', Types.String, isContent)
+    @param('dag', Types.Content)
     @param('description', Types.String, isDescription)
     async post(
         domainId: string, tid: ObjectID,