From bc4d424abf72d8953edae113257db9bf1c6a59b3 Mon Sep 17 00:00:00 2001 From: undefined Date: Tue, 29 Jun 2021 21:37:19 +0800 Subject: [PATCH] ui: fix display --- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/record.ts | 2 +- packages/hydrooj/src/lib/avatar.ts | 2 +- packages/ui-default/package.json | 2 +- packages/ui-default/templates/record_main.html | 1 - packages/ui-default/templates/record_main_tr.html | 2 +- 6 files changed, 5 insertions(+), 6 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index a362b2016..c1d24fb60 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.29.4", + "version": "2.29.5", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/handler/record.ts b/packages/hydrooj/src/handler/record.ts index ccf67c68d..9b566c431 100644 --- a/packages/hydrooj/src/handler/record.ts +++ b/packages/hydrooj/src/handler/record.ts @@ -225,7 +225,7 @@ class RecordMainConnectionHandler extends ConnectionHandler { // eslint-disable-next-line prefer-const let [udoc, pdoc] = await Promise.all([ user.getById(this.domainId, rdoc.uid), - problem.get(this.domainId, rdoc.pid, null), + problem.get(this.domainId, rdoc.pid), ]); if (pdoc) { if (pdoc.hidden && !this.user.own(pdoc) && !this.user.hasPerm(PERM.PERM_VIEW_PROBLEM_HIDDEN)) pdoc = null; diff --git a/packages/hydrooj/src/lib/avatar.ts b/packages/hydrooj/src/lib/avatar.ts index cb0648772..69223f509 100644 --- a/packages/hydrooj/src/lib/avatar.ts +++ b/packages/hydrooj/src/lib/avatar.ts @@ -3,7 +3,7 @@ import { md5 } from './crypto'; type AvatarProvider = (src: string, size: number) => string; export const providers: Record = { - gravatar: (email, size) => `//gravatar.loli.net/avatar/${md5((email || '').toString().trim().toLowerCase())}?d=mm&s=${size || 32}`, + gravatar: (email, size) => `//cn.gravatar.com/avatar/${md5((email || '').toString().trim().toLowerCase())}?d=mm&s=${size || 32}`, qq: (id) => `//q1.qlogo.cn/g?b=qq&nk=${(/(\d+)/g.exec(id) || ['', ''])[1]}&s=640`, github: (id, size) => `//github.com/${id}.png?size=${Math.min(size, 460)}`, url: (url) => url, diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 78fa1f9bc..8ac05c9ce 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.12.1", + "version": "4.12.2", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js", diff --git a/packages/ui-default/templates/record_main.html b/packages/ui-default/templates/record_main.html index 94f50e26c..9eca8d3c9 100644 --- a/packages/ui-default/templates/record_main.html +++ b/packages/ui-default/templates/record_main.html @@ -48,7 +48,6 @@ - diff --git a/packages/ui-default/templates/record_main_tr.html b/packages/ui-default/templates/record_main_tr.html index 1f859cdcc..065454d1d 100644 --- a/packages/ui-default/templates/record_main_tr.html +++ b/packages/ui-default/templates/record_main_tr.html @@ -13,7 +13,7 @@ | {% endif %} - {% if pdoc and (not pdoc.hidden or handler.user.hasPerm(perm.PERM_VIEW_PROBLEM_HIDDEN)) %} + {% if pdoc and (not pdoc.hidden or handler.user.hasPerm(perm.PERM_VIEW_PROBLEM_HIDDEN) or handler.user.own(pdoc)) %} {{ problem.render_problem_title(pdoc, show_tags=false) }} {% else %} *