返回提交历史
Modified
src/controllers/api/addPendingFriendController.ts
+19
-11
XFEstudio/XFESpaceNinjaServer
fix: addPendingFriend response for u8 (#3590)
Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/3590 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
11e453c9
代码差异
1 个文件
+19
-11
@@ -1,4 +1,4 @@
1
import { toMongoDate, toOid } from "../../helpers/inventoryHelpers.ts";
1
import { toMongoDate2, toOid2, version_compare } from "../../helpers/inventoryHelpers.ts";
2
2
import { getJSONfromString } from "../../helpers/stringHelpers.ts";
3
3
import { Friendship } from "../../models/friendModel.ts";
4
4
import { Account } from "../../models/loginModel.ts";
@@ -8,6 +8,7 @@ import { getAccountForRequest, getUnicodeName, type TAccountDocument } from "../
8
8
import type { IFriendInfo } from "../../types/friendTypes.ts";
9
9
import type { RequestHandler, Response } from "express";
10
10
import { logger } from "../../utils/logger.ts";
11
import gameToBuildVersion from "../../constants/gameToBuildVersion.ts";
11
12
12
13
export const addPendingFriendPostController: RequestHandler = async (req, res) => {
13
14
const account = await getAccountForRequest(req);
@@ -60,14 +61,21 @@ const sendFriendRequest = async (
60
61
return;
61
62
}
62
63
63
const friendInfo: IFriendInfo = {
64
_id: toOid(requesteeAccount._id),
65
DisplayName: getUnicodeName(requesteeAccount, requesterAccount.BuildLabel),
66
LastLogin: toMongoDate(requesteeAccount.LastLogin),
67
Note: message
68
};
69
await addInventoryDataToFriendInfo(friendInfo);
70
res.json({
71
Friend: friendInfo
72
});
64
if (
65
!requesterAccount.BuildLabel ||
66
version_compare(requesterAccount.BuildLabel, gameToBuildVersion["13.0.0"]) >= 0
67
) {
68
const friendInfo: IFriendInfo = {
69
_id: toOid2(requesteeAccount._id, requesterAccount.BuildLabel),
70
DisplayName: getUnicodeName(requesteeAccount, requesterAccount.BuildLabel),
71
LastLogin: toMongoDate2(requesteeAccount.LastLogin, requesterAccount.BuildLabel),
72
Note: message
73
};
74
await addInventoryDataToFriendInfo(friendInfo);
75
res.json({
76
Friend: friendInfo
77
});
78
} else {
79
res.send(requesteeAccount._id.toString());
80
}
73
81
};