Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-17 17:36:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: fix home contest&homework query (#633)

Browse Source
This commit is contained in:
panda authored and GitHub committed 2023-08-06 02:19:26 +08:00
1 parent da9676119b
commit 20fe72a708
1 file changed
+33 -3
Download Patch File Download Diff File Expand all files Collapse all files
packages/hydrooj/src/handler/home.ts
+33 -3
View File
@@ -41,8 +41,23 @@ export class HomeHandler extends Handler {
async getHomework(domainId: string, limit = 5) {
if (!this.user.hasPerm(PERM.PERM_VIEW_HOMEWORK)) return [[], {}];
const tdocs = await contest.getMulti(domainId, { rule: 'homework' })
.limit(limit).toArray();
const groups = (await user.listGroup(domainId, this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_HOMEWORK) ? undefined : this.user._id))
.map((i) => i.name);
const tdocs = await contest.getMulti(domainId, {
rule: 'homework',
...this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_HOMEWORK)
? {}
: {
$or: [
{ maintainer: this.user._id },
{ owner: this.user._id },
{ assign: { $in: groups } },
{ assign: { $size: 0 } },
],
},
}).sort({
penaltySince: -1, endAt: -1, beginAt: -1, _id: -1,
}).limit(limit).toArray();
const tsdict = await contest.getListStatus(
domainId, this.user._id, tdocs.map((tdoc) => tdoc.docId),
);
@@ -52,7 +67,22 @@ export class HomeHandler extends Handler {
async getContest(domainId: string, limit = 10) {
if (!this.user.hasPerm(PERM.PERM_VIEW_CONTEST)) return [[], {}];
const rules = Object.keys(contest.RULES).filter((i) => !contest.RULES[i].hidden);
const tdocs = await contest.getMulti(domainId, { rule: { $in: rules } })
const groups = (await user.listGroup(domainId, this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST) ? undefined : this.user._id))
.map((i) => i.name);
const q = {
rule: { $in: rules },
...this.user.hasPerm(PERM.PERM_VIEW_HIDDEN_CONTEST)
? {}
: {
$or: [
{ maintainer: this.user._id },
{ owner: this.user._id },
{ assign: { $in: groups } },
{ assign: { $size: 0 } },
],
},
};
const tdocs = await contest.getMulti(domainId, q).sort({ endAt: -1, beginAt: -1, _id: -1 })
.limit(limit).toArray();
const tsdict = await contest.getListStatus(
domainId, this.user._id, tdocs.map((tdoc) => tdoc.docId),