返回提交历史
Modified
src/controllers/api/inboxController.ts
+10
-6
XFEstudio/XFESpaceNinjaServer
chore: reuse account document in inboxController (#3227)
Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/3227 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
95e2943d
代码差异
1 个文件
+10
-6
@@ -1,4 +1,4 @@
1
import type { Request, RequestHandler } from "express";
1
import type { RequestHandler } from "express";
2
2
import { Inbox } from "../../models/inboxModel.ts";
3
3
import {
4
4
createMessage,
@@ -9,7 +9,12 @@ import {
9
9
getMessage,
10
10
type IMessageCreationTemplate
11
11
} from "../../services/inboxService.ts";
12
import { getAccountForRequest, getAccountFromSuffixedName, getSuffixedName } from "../../services/loginService.ts";
12
import {
13
getAccountForRequest,
14
getAccountFromSuffixedName,
15
getSuffixedName,
16
type TAccountDocument
17
} from "../../services/loginService.ts";
13
18
import {
14
19
addItems,
15
20
combineInventoryChanges,
@@ -113,7 +118,7 @@ export const inboxController: RequestHandler = async (req, res) => {
113
118
await inventory.save();
114
119
res.json({ InventoryChanges: inventoryChanges });
115
120
} else if (latestClientMessageId) {
116
await createNewEventMessages(req);
121
await createNewEventMessages(account);
117
122
const messages = await Inbox.find({ ownerId: accountId }).sort({ date: 1 });
118
123
119
124
const latestClientMessage = messages.find(m => m._id.toString() === parseOid(latestClientMessageId as string));
@@ -133,15 +138,14 @@ export const inboxController: RequestHandler = async (req, res) => {
133
138
res.json({ Inbox: newMessages });
134
139
} else {
135
140
//newly created event messages must be newer than account.LatestEventMessageDate
136
await createNewEventMessages(req);
141
await createNewEventMessages(account);
137
142
const messages = await getAllMessagesSorted(accountId);
138
143
const inbox = messages.map(m => m.toJSON());
139
144
res.json({ Inbox: inbox });
140
145
}
141
146
};
142
147
143
const createNewEventMessages = async (req: Request): Promise<void> => {
144
const account = await getAccountForRequest(req);
148
const createNewEventMessages = async (account: TAccountDocument): Promise<void> => {
145
149
const newEventMessages: IMessageCreationTemplate[] = [];
146
150
147
151
// Baro