OpenWF/SpaceNinjaServer
12
6
Fork 15
Code Issues 41 Pull Requests 2 Actions Packages Projects Releases Activity

chore: add alliance information to getAccountInfo (#1439)
All checks were successful
Build / build (18) (push) Successful in 40s
Details
Build / build (20) (push) Successful in 1m15s
Details
Build Docker image / docker (push) Successful in 35s
Details
Build / build (22) (push) Successful in 1m22s
Details

Browse Source 
Reviewed-on: #1439
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
This commit is contained in:
Sainan 2025-04-03 10:41:01 -07:00 committed by Sainan
parent 710470ca2d
commit abeb17ce44
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/custom/getAccountInfoController.ts
View File

@ -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;
} }