From cd4ada0845a20413e836836ae65da49f3ec8b225 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Tue, 29 Jun 2021 23:59:36 +0800
Subject: [PATCH] core: also disable smtp if smtp.user doesn't exist

---
 packages/hydrooj/package.json        | 2 +-
 packages/hydrooj/src/handler/user.ts | 2 +-
 packages/hydrooj/src/model/task.ts   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index c1d24fb60..18afb19bb 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.29.5",
+    "version": "2.29.6",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/handler/user.ts b/packages/hydrooj/src/handler/user.ts
index cb254c776..7b39cdb82 100644
--- a/packages/hydrooj/src/handler/user.ts
+++ b/packages/hydrooj/src/handler/user.ts
@@ -80,7 +80,7 @@ export class UserRegisterHandler extends Handler {
                 system.get('session.unsaved_expire_seconds'),
                 { mail },
             );
-            if (system.get('smtp.verify')) {
+            if (system.get('smtp.verify') && system.get('smtp.user')) {
                 const m = await this.renderHTML('user_register_mail.html', {
                     path: `register/${t[0]}`,
                     url_prefix: (this.domain.host || [])[0] || system.get('server.url'),
diff --git a/packages/hydrooj/src/model/task.ts b/packages/hydrooj/src/model/task.ts
index 0fbbacee6..5fb69da47 100644
--- a/packages/hydrooj/src/model/task.ts
+++ b/packages/hydrooj/src/model/task.ts
@@ -116,7 +116,7 @@ class TaskModel {
 
     static getFirst = getFirst;
 
-    static async getDelay(query?: FilterQuery<Task>) {
+    static async getDelay(query?: FilterQuery<Task>): Promise<[number, Date]> {
         const now = new Date();
         const res = await coll.findOne(query, { sort: { executeAfter: 1 } });
         if (res) return [Math.max(0, now.getTime() - res.executeAfter.getTime()), res.executeAfter];