From d5e67de7addc0c94c291abe8fa906717b0392d67 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sat, 29 May 2021 14:31:13 +0800
Subject: [PATCH] core: add null check

---
 .eslintignore                                       | 1 -
 packages/hydrooj/package.json                       | 2 +-
 packages/hydrooj/src/model/problem.ts               | 2 +-
 packages/ui-default/components/DOMAttachedObject.js | 8 ++------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 0cfc242bc..8b90310b9 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -2,4 +2,3 @@ dist
 *.d.ts
 node_modules
 public
-packages/ui-default/
diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 40a7de267..8bb76121a 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.28.8",
+    "version": "2.28.9",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/model/problem.ts b/packages/hydrooj/src/model/problem.ts
index 36aad870e..0e6f0d87b 100644
--- a/packages/hydrooj/src/model/problem.ts
+++ b/packages/hydrooj/src/model/problem.ts
@@ -247,7 +247,7 @@ export class ProblemModel {
         const l = {};
         const ddocs = await Promise.all(Object.keys(parsed).map((i) => domain.get(i)));
         const f = ddocs.filter((i) => !(
-            i._id === domainId
+            i?._id === domainId
             || i?.share === '*'
             || (`,${(i?.share || '').replace(/，/g, ',').split(',').map((q) => q.trim()).join(',')},`).includes(`,${domainId},`)
         ));
diff --git a/packages/ui-default/components/DOMAttachedObject.js b/packages/ui-default/components/DOMAttachedObject.js
index 59e381c14..fbe251e82 100644
--- a/packages/ui-default/components/DOMAttachedObject.js
+++ b/packages/ui-default/components/DOMAttachedObject.js
@@ -111,15 +111,11 @@ export default class DOMAttachedObject {
   }
 
   constructor($dom, monitorDetach = false) {
-    if ($dom == null) {
-      return null;
-    }
+    if ($dom == null) return null;
     this.$dom = $dom;
     this.id = ++DOMAttachedObject.uniqueIdCounter;
     this.eventNS = `vj4obj_${this.id}`;
     this.detached = false;
-    if (monitorDetach) {
-      monitorResource(this);
-    }
+    if (monitorDetach) monitorResource(this);
   }
 }