From 8389519249286a73816cdfee78f1c962b2e81895 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Tue, 4 Aug 2020 14:12:03 +0800
Subject: [PATCH] bug fix

---
 packages/hydrooj/package.json         |  2 +-
 packages/hydrooj/src/check.ts         | 11 -----------
 packages/hydrooj/src/entry/worker.ts  |  3 +--
 packages/hydrooj/src/lib/validator.ts |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index ba2dc8cf0..8c84fa049 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.12.1",
+    "version": "2.12.2",
     "main": "dist/loader.js",
     "bin": "bin/hydrooj.js",
     "repository": "https://github.com/hydro-dev/Hydro.git",
diff --git a/packages/hydrooj/src/check.ts b/packages/hydrooj/src/check.ts
index de92c833c..00e604ecb 100644
--- a/packages/hydrooj/src/check.ts
+++ b/packages/hydrooj/src/check.ts
@@ -38,17 +38,6 @@ const checks: Dictionary<CheckItem> = {
         const from = await system.get('smtp.from');
         if (!from) warn('SMTP account was not provided, email verification disabled.');
     },
-    async checkProxy(ctx, log, warn) {
-        const [github, google, proxy] = await system.getMany([
-            'oauth.githubappid', 'oauth.googleappid', 'proxy',
-        ]);
-        if (proxy) {
-            superagent.get('https://www.google.com/').timeout(10000).proxy(proxy)
-                .catch(() => warn('The proxy configured seem to be invalid.'));
-        } else if (github || google) {
-            warn('OAuth enabled. But for well-known reasons, a proxy is required.');
-        }
-    },
     async checkIpHeader(ctx, log, warn) {
         const header = await system.get('server.xff');
         if (header && !ctx.request.ip) warn('IP header seems incorrect.\nCheck dashboard>settings>server.');
diff --git a/packages/hydrooj/src/entry/worker.ts b/packages/hydrooj/src/entry/worker.ts
index 4e745b53c..d10886382 100644
--- a/packages/hydrooj/src/entry/worker.ts
+++ b/packages/hydrooj/src/entry/worker.ts
@@ -6,7 +6,7 @@ import {
 } from './common';
 
 export async function load() {
-    let pending = global.addons;
+    const pending = global.addons;
     const fail = [];
     const active = [];
     require('../lib/i18n');
@@ -49,7 +49,6 @@ export async function load() {
     for (const i of builtinScript) require(`../script/${i}`);
     await script(pending, fail, active);
     for (const postInit of global.Hydro.postInit) await postInit();
-    pending = [];
     await server.start();
     setInterval(() => {
         process.send({ event: 'stat', count: global.Hydro.stat.reqCount });
diff --git a/packages/hydrooj/src/lib/validator.ts b/packages/hydrooj/src/lib/validator.ts
index 7e9cbee41..ebd154cd7 100644
--- a/packages/hydrooj/src/lib/validator.ts
+++ b/packages/hydrooj/src/lib/validator.ts
@@ -2,7 +2,7 @@
 import { ValidationError } from '../error';
 
 const RE_UID = /^-?\d+$/i;
-const RE_PID = /^([a-zA-Z]+[a-zA-Z0-9]*)|$/i;
+const RE_PID = /^[a-zA-Z]+[a-zA-Z0-9]*$/i;
 const RE_UNAME = /[^\s\u3000](.{,254}[^\s\u3000])?$/i;
 const RE_ROLE = /^[_0-9A-Za-z]{1,256}$/i;
 const RE_MAIL = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)+$/i;