Merge pull request #71 from codemate-oj/feat/luckycv/defined-contest

Feat/luckycv/defined contest

Author: luckycv

packages/codemate-plugin/plugins/login-limit/index.ts

@@ -15,12 +15,13 @@ export function apply(ctx: Context) {
         const udoc = await UserModel.getById(that.args['domainId'], that.session.uid);
         if (udoc.hasPriv(PRIV.PRIV_UNLIMITED_ACCESS)) return; // bypass admin
         const userIp = that.request.ip;
+        const createHost = that.request.host;
         // 处理IP白名单逻辑，以适应SSR
         const whiteListSetting: string = SystemModel.get('loginlimit.whitelist') ?? '';
         const ipWhiteList = whiteListSetting.split(',');
         if (ipWhiteList.includes(userIp)) return; // bypass server
-        // 踢掉所有其他IP
-        const tdocs = await TokenModel.getMulti(TokenModel.TYPE_SESSION, { uid: udoc._id }).toArray();
+        // 踢掉所有其他同域IP
+        const tdocs = await TokenModel.getMulti(TokenModel.TYPE_SESSION, { uid: udoc._id, createHost }).toArray();
         await Promise.all(tdocs.map(async (tdoc) => TokenModel.del(tdoc._id, TokenModel.TYPE_SESSION)));
         if (tdocs.length > 0) {
             logger.info(`User ${udoc._id} login at ${userIp}. ${tdocs.length} sessions expired.`);

packages/hydrooj/src/handler/contest.ts

@@ -545,6 +545,17 @@ export class ContestEditHandler extends Handler {
     @param('checkinEndAtDate', Types.Date)
     @param('checkinEndAtTime', Types.Time)
     @param('title', Types.Title)
+    @param('languageSubject', Types.String, true)
+    @param('category', Types.String, true)
+    @param('organizer', Types.String, true)
+    @param('stage', Types.String, true)
+    @param('totalScore', Types.Float, true)
+    @param('problemCategoryConfig', Types.String, true)
+    @param('judgementPrice', Types.Float, true)
+    @param('attendPrice', Types.Float, true)
+    @param('evalutionPrice', Types.Float, true)
+    @param('contestMode', Types.String, true)
+    @param('hasMonitor', Types.Boolean, true)
     @param('content', Types.Content)
     @param('rule', Types.Range(Object.keys(contest.RULES).filter((i) => !contest.RULES[i].hidden)))
     @param('pids', Types.Content)
@@ -570,6 +581,17 @@ export class ContestEditHandler extends Handler {
         checkinEndAtDate: string,
         checkinEndAtTime: string,
         title: string,
+        languageSubject: string,
+        category: string,
+        organizer: string,
+        stage: string,
+        totalScore: number,
+        problemCategoryConfig: string,
+        judgementPrice: number,
+        attendPrice: number,
+        evalutionPrice: number,
+        contestMode: string,
+        hasMonitor: boolean = false,
         content: string,
         rule: string,
         _pids: string,
@@ -613,6 +635,17 @@ export class ContestEditHandler extends Handler {
         if (tid) {
             await contest.edit(domainId, tid, {
                 title,
+                languageSubject,
+                category,
+                organizer,
+                stage,
+                totalScore,
+                problemCategoryConfig,
+                judgementPrice,
+                attendPrice,
+                evalutionPrice,
+                contestMode,
+                hasMonitor,
                 content,
                 rule,
                 beginAt,
@@ -637,6 +670,17 @@ export class ContestEditHandler extends Handler {
             }
         } else {
             tid = await contest.add(domainId, title, content, this.user._id, rule, beginAt, endAt, pids, rated, {
+                languageSubject,
+                category,
+                organizer,
+                stage,
+                totalScore,
+                problemCategoryConfig,
+                judgementPrice,
+                attendPrice,
+                evalutionPrice,
+                contestMode,
+                hasMonitor,
                 duration: contestDuration,
                 tag,
                 checkinBeginAt,

packages/hydrooj/src/interface.ts

@@ -433,6 +433,18 @@ export interface Tdoc extends Document {
     imageURL?: string; // 比赛封面图
     needRealName?: boolean; // 是否需要实名
 
+    languageSubject?: string; // 语言
+    category?: string; // 比赛类别
+    organizer?: string; // 主办方
+    stage?: string; // 比赛阶段
+    totalScore?: number; // 比赛折算总分
+    problemCategoryConfig?: string; // 题目排版配置及折算分数
+    judgementPrice?: number; // 付费评测
+    attendPrice?: number; // 付费参赛
+    evalutionPrice?: number; // 付费评估
+    contestMode?: string; // 比赛题目排版模式
+    hasMonitor?: boolean; // 加载防作弊系统
+
     /**
      * In hours
      * 在比赛有效时间内选择特定的 X 小时参加比赛（从首次打开比赛算起）

packages/ui-default/components/organizedProblems/index.css

@@ -0,0 +1,15 @@
+.defined-problem-category button {
+    min-width: 3rem;
+    border: 1px solid #e8e8e8;
+    padding: .5rem 1rem;
+    color: #555;
+}
+.defined-problem-category input.textbox, .defined-problem-category select.select {
+    margin-bottom: 0;
+}
+.defined-problem-category .flex-gap-align-bottom {
+    display: flex;
+    gap: 10px;
+    align-items: baseline;
+    margin-bottom: .5rem;
+}