返回提交历史
Modified
src/controllers/api/setDojoComponentMessageController.ts
+7
-3
Modified
src/services/guildService.ts
+1
-1
XFEstudio/XFESpaceNinjaServer
fix: respect BuildLabel when responding to setDojoComponentMessage (#3424)
Closes #3419 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/3424 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
653dc1e1
代码差异
2 个文件
+8
-4
@@ -1,8 +1,12 @@
1
1
import type { RequestHandler } from "express";
2
import { getDojoClient, getGuildForRequest } from "../../services/guildService.ts";
2
import { getDojoClient, getGuildForRequestEx } from "../../services/guildService.ts";
3
import { getAccountForRequest } from "../../services/loginService.ts";
4
import { getInventory } from "../../services/inventoryService.ts";
3
5
4
6
export const setDojoComponentMessageController: RequestHandler = async (req, res) => {
5
const guild = await getGuildForRequest(req);
7
const account = await getAccountForRequest(req);
8
const inventory = await getInventory(account._id.toString(), "GuildId");
9
const guild = await getGuildForRequestEx(req, inventory);
6
10
// At this point, we know that a member of the guild is making this request. Assuming they are allowed to change the message.
7
11
const component = guild.DojoComponents.id(req.query.componentId as string)!;
8
12
const payload = JSON.parse(String(req.body)) as SetDojoComponentMessageRequest;
@@ -12,7 +16,7 @@ export const setDojoComponentMessageController: RequestHandler = async (req, res
12
16
component.Message = payload.Message;
13
17
}
14
18
await guild.save();
15
res.json(await getDojoClient(guild, 0, component._id));
19
res.json(await getDojoClient(guild, 0, component._id, account.BuildLabel));
16
20
};
17
21
18
22
type SetDojoComponentMessageRequest = { Name: string } | { Message: string };
@@ -40,7 +40,7 @@ import gameToBuildVersion from "../constants/gameToBuildVersion.ts";
40
40
41
41
export const getGuildForRequest = async (req: Request): Promise<TGuildDatabaseDocument> => {
42
42
const accountId = await getAccountIdForRequest(req);
43
const inventory = await getInventory(accountId);
43
const inventory = await getInventory(accountId, "GuildId");
44
44
return await getGuildForRequestEx(req, inventory);
45
45
};
46
46