From e4c2f309c4037cd53cffc37e30a2118db1174b63 Mon Sep 17 00:00:00 2001
From: undefined <i@undefined.moe>
Date: Sat, 25 Sep 2021 21:47:05 +0800
Subject: [PATCH] core&ui: bug fix

---
 packages/hydrooj/package.json                 |  2 +-
 packages/hydrooj/src/handler/home.ts          | 19 +------------------
 packages/hydrooj/src/model/user.ts            |  2 +-
 packages/ui-default/package.json              |  2 +-
 packages/ui-default/pages/user_detail.page.js |  4 ++--
 .../ui-default/templates/user_detail.html     |  6 +++---
 6 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 6b68448cf..1978909fb 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.39.4",
+    "version": "2.39.5",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",
diff --git a/packages/hydrooj/src/handler/home.ts b/packages/hydrooj/src/handler/home.ts
index 14d344594..f19afd07b 100644
--- a/packages/hydrooj/src/handler/home.ts
+++ b/packages/hydrooj/src/handler/home.ts
@@ -224,16 +224,11 @@ function set(s: Setting, key: string, value: any) {
 class HomeSettingsHandler extends Handler {
     @param('category', Types.Name)
     async get(domainId: string, category: string) {
-        const path = [
-            ['Hydro', 'homepage'],
-            [`home_${category}`, null],
-        ];
         this.response.template = 'home_settings.html';
         this.response.body = {
             category,
             page_name: `home_${category}`,
             current: this.user,
-            path,
         };
         if (category === 'preference') {
             this.response.body.settings = setting.PREFERENCE_SETTINGS;
@@ -281,10 +276,6 @@ class UserChangemailWithCodeHandler extends Handler {
 
 class HomeDomainHandler extends Handler {
     async get() {
-        const path = [
-            ['Hydro', 'homepage'],
-            ['home_domain', null],
-        ];
         let ddocs: DomainDoc[] = [];
         let dudict: Record<string, DomainDoc> = {};
         if (!this.user.hasPriv(PRIV.PRIV_VIEW_ALL_DOMAIN)) {
@@ -310,20 +301,12 @@ class HomeDomainHandler extends Handler {
                 || udoc.hasPriv(PRIV.PRIV_MANAGE_ALL_DOMAIN);
         }
         this.response.template = 'home_domain.html';
-        this.response.body = {
-            ddocs, dudict, canManage, path,
-        };
+        this.response.body = { ddocs, dudict, canManage };
     }
 }
 
 class HomeDomainCreateHandler extends Handler {
     async get() {
-        this.response.body = {
-            path: [
-                ['Hydro', 'homepage'],
-                ['domain_create', null],
-            ],
-        };
         this.response.template = 'domain_create.html';
     }
 
diff --git a/packages/hydrooj/src/model/user.ts b/packages/hydrooj/src/model/user.ts
index 8624c3c7e..5ab46ece3 100644
--- a/packages/hydrooj/src/model/user.ts
+++ b/packages/hydrooj/src/model/user.ts
@@ -206,7 +206,7 @@ class UserModel {
 
     @ArgMethod
     static async setById(uid: number, $set?: Partial<Udoc>, $unset?: Value<Partial<Udoc>, ''>) {
-        if (uid < 1000) return null;
+        if (uid < -999) return null;
         const op: any = {};
         if ($set && Object.keys($set).length) op.$set = $set;
         if ($unset && Object.keys($unset).length) op.$unset = $unset;
diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json
index ababff820..a198bce64 100644
--- a/packages/ui-default/package.json
+++ b/packages/ui-default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.22.6",
+  "version": "4.22.7",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
diff --git a/packages/ui-default/pages/user_detail.page.js b/packages/ui-default/pages/user_detail.page.js
index 95170ed54..9dfc0e7e7 100644
--- a/packages/ui-default/pages/user_detail.page.js
+++ b/packages/ui-default/pages/user_detail.page.js
@@ -69,8 +69,8 @@ async function initChart() {
 }
 
 const page = new NamedPage('user_detail', () => {
-  $('[name="profile_contact_copy"]').get().forEach((el) => {
-    const data = $(el).attr('data-content');
+  $('[data-copy]').get().forEach((el) => {
+    const data = $(el).attr('data-copy');
     const decoded = base64.decode(data);
     const clip = new Clipboard(el, { text: () => decoded });
     clip.on('success', () => {
diff --git a/packages/ui-default/templates/user_detail.html b/packages/ui-default/templates/user_detail.html
index 74aa2a513..c3c5b0640 100644
--- a/packages/ui-default/templates/user_detail.html
+++ b/packages/ui-default/templates/user_detail.html
@@ -41,17 +41,17 @@
                   <span class="icon icon-comment--multiple"></span>
                 </a>
               {% if udoc['mail'] %}
-                <a class="profile-header__contact-item" href="javascript:;" name="profile_contact_copy" data-content="{{ udoc['mail'] | base64_encode }}" data-tooltip="{{ _('Copy Email') }}">
+                <a class="profile-header__contact-item" href="javascript:;" data-copy="{{ udoc['mail'] | base64_encode }}" data-tooltip="{{ _('Copy Email') }}">
                   <span class="icon icon-mail"></span>
                 </a>
               {% endif %}
               {% if udoc['qq'] %}
-                <a class="profile-header__contact-item" href="javascript:;" name="profile_qq_copy" data-content="{{ udoc['qq'] | base64_encode }}" data-tooltip="{{ _('Copy QQ Number') }}">
+                <a class="profile-header__contact-item" href="javascript:;" data-copy="{{ udoc['qq'] | base64_encode }}" data-tooltip="{{ _('Copy QQ Number') }}">
                   <span class="icon icon-qq"></span>
                 </a>
               {% endif %}
               {% if udoc['wechat'] %}
-                <a class="profile-header__contact-item" href="javascript:;" name="profile_wechat_copy" data-content="{{ udoc['wechat'] | base64_encode }}" data-tooltip="{{ _('Copy WeChat Account') }}">
+                <a class="profile-header__contact-item" href="javascript:;" data-copy="{{ udoc['wechat'] | base64_encode }}" data-tooltip="{{ _('Copy WeChat Account') }}">
                   <span class="icon icon-wechat"></span>
                 </a>
               {% endif %}