chore: add alliance information to getAccountInfo
All checks were successful
Build / build (22) (push) Successful in 36s
Build / build (20) (push) Successful in 1m10s
Build / build (20) (pull_request) Successful in 1m10s
Build / build (22) (pull_request) Successful in 1m7s
Build / build (18) (push) Successful in 1m2s
Build / build (18) (pull_request) Successful in 38s
All checks were successful
Build / build (22) (push) Successful in 36s
Build / build (20) (push) Successful in 1m10s
Build / build (20) (pull_request) Successful in 1m10s
Build / build (22) (pull_request) Successful in 1m7s
Build / build (18) (push) Successful in 1m2s
Build / build (18) (pull_request) Successful in 38s
This commit is contained in:
parent
d4d887a5a4
commit
85cc949c4c
@ -1,4 +1,4 @@
|
|||||||
import { Guild, GuildMember } from "@/src/models/guildModel";
|
import { AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
|
||||||
import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
|
import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
|
||||||
import { RequestHandler } from "express";
|
import { RequestHandler } from "express";
|
||||||
|
|
||||||
@ -12,9 +12,19 @@ export const getAccountInfoController: RequestHandler = async (req, res) => {
|
|||||||
}
|
}
|
||||||
const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
|
const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
|
||||||
if (guildMember) {
|
if (guildMember) {
|
||||||
const guild = (await Guild.findById(guildMember.guildId, "Ranks"))!;
|
const guild = (await Guild.findById(guildMember.guildId, "Ranks AllianceId"))!;
|
||||||
info.GuildId = guildMember.guildId.toString();
|
info.GuildId = guildMember.guildId.toString();
|
||||||
info.GuildPermissions = guild.Ranks[guildMember.rank].Permissions;
|
info.GuildPermissions = guild.Ranks[guildMember.rank].Permissions;
|
||||||
|
info.GuildRank = guildMember.rank;
|
||||||
|
if (guild.AllianceId) {
|
||||||
|
//const alliance = (await Alliance.findById(guild.AllianceId))!;
|
||||||
|
const allianceMember = (await AllianceMember.findOne({
|
||||||
|
allianceId: guild.AllianceId,
|
||||||
|
guildId: guild._id
|
||||||
|
}))!;
|
||||||
|
info.AllianceId = guild.AllianceId.toString();
|
||||||
|
info.AlliancePermissions = allianceMember.Permissions;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
res.json(info);
|
res.json(info);
|
||||||
};
|
};
|
||||||
@ -24,4 +34,7 @@ interface IAccountInfo {
|
|||||||
IsAdministrator?: boolean;
|
IsAdministrator?: boolean;
|
||||||
GuildId?: string;
|
GuildId?: string;
|
||||||
GuildPermissions?: number;
|
GuildPermissions?: number;
|
||||||
|
GuildRank?: number;
|
||||||
|
AllianceId?: string;
|
||||||
|
AlliancePermissions?: number;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user