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

core: domain-join: bug fixes & add i18n

Browse Source 
Co-authored-by: panda <panda_dtdyy@outlook.com>
This commit is contained in:
undefinedandpanda committed 2025-03-20 17:55:10 +00:00
1 parent b9dbdc39ca
commit e9c5bf5900
6 files changed
+70 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/src/model/domain.ts
+5 -4
View File
@@ -59,7 +59,7 @@ class DomainModel {
};
await bus.parallel('domain/create', ddoc);
await coll.insertOne(ddoc);
await DomainModel.setUserRole(domainId, owner, 'root');
await DomainModel.setUserRole(domainId, owner, 'root', true);
return domainId;
}
@@ -133,9 +133,10 @@ class DomainModel {
}
@ArgMethod
static async setUserRole(domainId: string, uid: MaybeArray<number>, role: string) {
static async setUserRole(domainId: string, uid: MaybeArray<number>, role: string, autojoin = false) {
const update = { $set: { role, ...(autojoin ? { join: true } : {}) } };
if (!(uid instanceof Array)) {
const res = await collUser.findOneAndUpdate({ domainId, uid }, { $set: { role } }, { upsert: true, returnDocument: 'after' });
const res = await collUser.findOneAndUpdate({ domainId, uid }, update, { upsert: true, returnDocument: 'after' });
const udoc = await UserModel.getById(domainId, uid);
deleteUserCache(udoc);
return res;
@@ -144,7 +145,7 @@ class DomainModel {
.project<{ _id: number, mail: string, uname: string }>({ mail: 1, uname: 1 })
.toArray();
for (const udoc of affected) deleteUserCache(udoc);
return await collUser.updateMany({ domainId, uid: { $in: uid } }, { $set: { role } }, { upsert: true });
return await collUser.updateMany({ domainId, uid: { $in: uid } }, update, { upsert: true });
}
static async getRoles(domainId: string, count?: boolean): Promise<any[]>;