返回提交历史
Modified
src/controllers/custom/getAccountInfoController.ts
+15
-2
XFEstudio/SpaceNinjaServer
chore: add alliance information to getAccountInfo (#1439)
Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1439 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
abeb17ce
代码差异
1 个文件
+15
-2
@@ -1,4 +1,4 @@
1
import { Guild, GuildMember } from "@/src/models/guildModel";
1
import { AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
2
2
import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
3
3
import { RequestHandler } from "express";
4
4
@@ -12,9 +12,19 @@ export const getAccountInfoController: RequestHandler = async (req, res) => {
12
12
}
13
13
const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
14
14
if (guildMember) {
15
const guild = (await Guild.findById(guildMember.guildId, "Ranks"))!;
15
const guild = (await Guild.findById(guildMember.guildId, "Ranks AllianceId"))!;
16
16
info.GuildId = guildMember.guildId.toString();
17
17
info.GuildPermissions = guild.Ranks[guildMember.rank].Permissions;
18
info.GuildRank = guildMember.rank;
19
if (guild.AllianceId) {
20
//const alliance = (await Alliance.findById(guild.AllianceId))!;
21
const allianceMember = (await AllianceMember.findOne({
22
allianceId: guild.AllianceId,
23
guildId: guild._id
24
}))!;
25
info.AllianceId = guild.AllianceId.toString();
26
info.AlliancePermissions = allianceMember.Permissions;
27
}
18
28
}
19
29
res.json(info);
20
30
};
@@ -24,4 +34,7 @@ interface IAccountInfo {
24
34
IsAdministrator?: boolean;
25
35
GuildId?: string;
26
36
GuildPermissions?: number;
37
GuildRank?: number;
38
AllianceId?: string;
39
AlliancePermissions?: number;
27
40
}