From 3405baef38ba014c54498f7e4cccf7ae5d7f4c88 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Sun, 21 Apr 2019 15:50:41 +0800
Subject: [PATCH 1/5] Update README

---
 README.en.md | 4 +---
 README.md    | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.en.md b/README.en.md
index 77081c6..501c628 100644
--- a/README.en.md
+++ b/README.en.md
@@ -4,9 +4,7 @@
 
 An online judge system for algorithm competition.
 
-This project is the **official** successor and rewritten version of the original Python/Flask version of SYZOJ, which is authorized by the original author [@Chenyao2333](https://github.com/Chenyao2333).
-
-Currently maintained by [LibreOJ](https://loj.ac).
+This project is based on [@Chenyao2333](https://github.com/Chenyao2333)'s [SYZOJ](https://github.com/Zhengzhou-11-Highschool/syzoj). Currently maintained by [LibreOJ](https://loj.ac).
 
 # Deploying
 Currently, the tutorial for deploying is only available in Chinese. It's [部署指南](https://github.com/syzoj/syzoj/wiki/%E9%83%A8%E7%BD%B2%E6%8C%87%E5%8D%97) in this project's wiki.
diff --git a/README.md b/README.md
index 8c12001..1620b3f 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,7 @@
 
 一个用于算法竞赛的在线评测系统。
 
-此项目为重写过的、原 Python/Flask 版 SYZOJ 的**官方**后继版本，由原作者 [@Chenyao2333](https://github.com/Chenyao2333) 授权。
-
-目前由 [LibreOJ](https://loj.ac) 维护。
+本项目继承自 [@Chenyao2333](https://github.com/Chenyao2333) 的 [SYZOJ](https://github.com/Zhengzhou-11-Highschool/syzoj)，目前由 [LibreOJ](https://loj.ac) 维护。
 
 # 部署
 见本项目 Wiki 中的 [部署指南](https://github.com/syzoj/syzoj/wiki/%E9%83%A8%E7%BD%B2%E6%8C%87%E5%8D%97)。

From 744b91c95a18fb60cfc1905d76420e897e784ba0 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Mon, 22 Apr 2019 10:38:18 +0800
Subject: [PATCH 2/5] Fix MD5 not working on edit user page

---
 views/user_edit.ejs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/views/user_edit.ejs b/views/user_edit.ejs
index 63e8ef3..08166b3 100644
--- a/views/user_edit.ejs
+++ b/views/user_edit.ejs
@@ -44,7 +44,7 @@
 	    <div class="field">
         <label for="information">个性签名</label>
       </div>
-      
+
       </div>
       <div class="editor editor-with-border" id="information" style="width: 100%; height: 100px; margin-bottom: 1em; ">
         <%- this.showLoadingEditor(); %>
@@ -94,7 +94,14 @@
 		</form>
 	</div>
 </div>
+<script>
+var bakDefine = define;
+define = undefined;
+</script>
 <script src="<%- lib('blueimp-md5/2.10.0/js/md5.min.js') %>"></script>
+<script>
+define = bakDefine;
+</script>
 <script type="text/javascript">
 var editors = {
   information: { defaultValue: <%- serializejs(edited_user.information) %> },

From 4e99ee3231d69f1e4927e6a14d90b1521917c205 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Thu, 25 Apr 2019 10:39:50 +0800
Subject: [PATCH 3/5] Fix uncaught exception in code formatter

---
 libs/code_formatter.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/code_formatter.js b/libs/code_formatter.js
index 2b50a01..62c2996 100644
--- a/libs/code_formatter.js
+++ b/libs/code_formatter.js
@@ -35,16 +35,16 @@ module.exports = async (code, lang) => {
     }
 
     await new Promise((resolve, reject) => {
-      let exit = code => {
-        if (code === 0) resolve();
-        else reject(code);
+      let exit = () => {
+        if (process.exitCode === 0) resolve();
+        else reject(process.exitCode);
       }
 
-      if (process.exitCode !== null) exit(process.exitCode);
-      else process.on('close', exit);
+      if (process.exitCode !== null) exit();
+      else process.on('close', () => exit());
     });
   } catch (e) {
-    console.log(e.stack);
+    console.log(e);
     result = null;
   }
 

From 23c8b7dabf8f2205390a6f796529e790771db22e Mon Sep 17 00:00:00 2001
From: quank123wip <quank123wip@outlook.com>
Date: Thu, 25 Apr 2019 22:19:54 +0800
Subject: [PATCH 4/5] add username_regex

---
 config-example.json | 3 ++-
 utility.js          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config-example.json b/config-example.json
index 2c5a90b..761e168 100644
--- a/config-example.json
+++ b/config-example.json
@@ -121,5 +121,6 @@
     "type": "like-google-fonts",
     "url": "https://fonts.loli.net"
   },
-  "no_cdn": false
+  "no_cdn": false,
+  "username_regex": "^[a-zA-Z0-9\\-\\_]+$"
 }
diff --git a/utility.js b/utility.js
index f2524fa..1288106 100644
--- a/utility.js
+++ b/utility.js
@@ -255,7 +255,7 @@ module.exports = {
     return md5.digest('hex');
   },
   isValidUsername(s) {
-    return /^[a-zA-Z0-9\-\_]+$/.test(s);
+    return RegExp(syzoj.config.username_regex).test(s);
   },
   locks: [],
   lock(key, cb) {

From cc01ecc8402c7a32303461fc37bfcb3a31405945 Mon Sep 17 00:00:00 2001
From: Menci <huanghaorui301@gmail.com>
Date: Sat, 27 Apr 2019 00:46:56 +0800
Subject: [PATCH 5/5] Auto layout monaco editor on window resize

---
 static/self/monaco-editor.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/static/self/monaco-editor.js b/static/self/monaco-editor.js
index 9c0dc20..eb08911 100644
--- a/static/self/monaco-editor.js
+++ b/static/self/monaco-editor.js
@@ -584,10 +584,16 @@ require(['vs/editor/editor.main'], function () {
         });
       }
 
+      function autoLayout(editor) {
+        window.addEventListener('resize', function () {
+          editor.layout();
+        });
+      }
+
       $.getScript(window.pathSelfLib + "monaco-editor-tomorrow.js", function () {
         window.createCodeEditor = function (editorElement, langauge, content) {
           editorElement.innerHTML = '';
-          return monaco.editor.create(editorElement, {
+          var editor = monaco.editor.create(editorElement, {
             value: content,
             language: langauge,
             multicursorModifier: 'ctrlCmd',
@@ -608,6 +614,9 @@ require(['vs/editor/editor.main'], function () {
             hideCursorInOverviewRuler: true,
             contextmenu: false
           });
+
+          autoLayout(editor);
+          return editor;
         };
 
         window.createMarkdownEditor = function (wrapperElement, content, input) {
@@ -653,6 +662,8 @@ require(['vs/editor/editor.main'], function () {
             input.value = editor.getValue();
           });
 
+          autoLayout(editor);
+
           return editor;
         };