diff --git a/project/src/callbacks/DialogueCallbacks.ts b/project/src/callbacks/DialogueCallbacks.ts index 5b0e620b..582d9901 100644 --- a/project/src/callbacks/DialogueCallbacks.ts +++ b/project/src/callbacks/DialogueCallbacks.ts @@ -3,6 +3,7 @@ import { inject, injectable } from "tsyringe"; import { DialogueController } from "@spt-aki/controllers/DialogueController"; import { OnUpdate } from "@spt-aki/di/OnUpdate"; import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUidRequestData"; import { IAcceptFriendRequestData, ICancelFriendRequestData, @@ -247,14 +248,14 @@ export class DialogueCallbacks implements OnUpdate /** Handle client/friend/ignore/set */ // eslint-disable-next-line @typescript-eslint/no-unused-vars - public ignoreFriend(url: string, request: { uid: string; }, sessionID: string): INullResponseData + public ignoreFriend(url: string, request: IUIDRequestData, sessionID: string): INullResponseData { return this.httpResponse.nullResponse(); } /** Handle client/friend/ignore/remove */ // eslint-disable-next-line @typescript-eslint/no-unused-vars - public unIgnoreFriend(url: string, request: { uid: string; }, sessionID: string): INullResponseData + public unIgnoreFriend(url: string, request: IUIDRequestData, sessionID: string): INullResponseData { return this.httpResponse.nullResponse(); } diff --git a/project/src/callbacks/GameCallbacks.ts b/project/src/callbacks/GameCallbacks.ts index 2a6cb781..d3413663 100644 --- a/project/src/callbacks/GameCallbacks.ts +++ b/project/src/callbacks/GameCallbacks.ts @@ -3,6 +3,7 @@ import { inject, injectable } from "tsyringe"; import { GameController } from "@spt-aki/controllers/GameController"; import { OnLoad } from "@spt-aki/di/OnLoad"; import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUidRequestData"; import { ICheckVersionResponse } from "@spt-aki/models/eft/game/ICheckVersionResponse"; import { ICurrentGroupResponse } from "@spt-aki/models/eft/game/ICurrentGroupResponse"; import { IGameConfigResponse } from "@spt-aki/models/eft/game/IGameConfigResponse"; @@ -12,7 +13,6 @@ import { IGameLogoutResponseData } from "@spt-aki/models/eft/game/IGameLogoutRes import { IGameStartResponse } from "@spt-aki/models/eft/game/IGameStartResponse"; import { IGetRaidTimeRequest } from "@spt-aki/models/eft/game/IGetRaidTimeRequest"; import { IGetRaidTimeResponse } from "@spt-aki/models/eft/game/IGetRaidTimeResponse"; -import { IReportNicknameRequestData } from "@spt-aki/models/eft/game/IReportNicknameRequestData"; import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; import { IVersionValidateRequestData } from "@spt-aki/models/eft/game/IVersionValidateRequestData"; import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; @@ -145,7 +145,7 @@ export class GameCallbacks implements OnLoad return this.httpResponse.noBody({ Version: this.watermark.getInGameVersionLabel() }); } - public reportNickname(url: string, info: IReportNicknameRequestData, sessionID: string): INullResponseData + public reportNickname(url: string, info: IUIDRequestData, sessionID: string): INullResponseData { return this.httpResponse.nullResponse(); } diff --git a/project/src/callbacks/NotifierCallbacks.ts b/project/src/callbacks/NotifierCallbacks.ts index 595cde68..96229780 100644 --- a/project/src/callbacks/NotifierCallbacks.ts +++ b/project/src/callbacks/NotifierCallbacks.ts @@ -3,9 +3,9 @@ import { inject, injectable } from "tsyringe"; import { NotifierController } from "@spt-aki/controllers/NotifierController"; import { HttpServerHelper } from "@spt-aki/helpers/HttpServerHelper"; import { IEmptyRequestData } from "@spt-aki/models/eft/common/IEmptyRequestData"; +import { IUIDRequestData } from "@spt-aki/models/eft/common/request/IUidRequestData"; import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; import { INotifierChannel } from "@spt-aki/models/eft/notifier/INotifier"; -import { ISelectProfileRequestData } from "@spt-aki/models/eft/notifier/ISelectProfileRequestData"; import { ISelectProfileResponse } from "@spt-aki/models/eft/notifier/ISelectProfileResponse"; import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; import { JsonUtil } from "@spt-aki/utils/JsonUtil"; @@ -68,7 +68,7 @@ export class NotifierCallbacks // eslint-disable-next-line @typescript-eslint/no-unused-vars public selectProfile( url: string, - info: ISelectProfileRequestData, + info: IUIDRequestData, sessionID: string, ): IGetBodyResponseData { diff --git a/project/src/models/eft/common/request/IUIDRequestData.ts b/project/src/models/eft/common/request/IUIDRequestData.ts new file mode 100644 index 00000000..9c248b22 --- /dev/null +++ b/project/src/models/eft/common/request/IUIDRequestData.ts @@ -0,0 +1,4 @@ +export interface IUIDRequestData +{ + uid: string; +} diff --git a/project/src/models/eft/game/IReportNicknameRequestData.ts b/project/src/models/eft/game/IReportNicknameRequestData.ts deleted file mode 100644 index bbce9814..00000000 --- a/project/src/models/eft/game/IReportNicknameRequestData.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface IReportNicknameRequestData -{ - uid: string; -} diff --git a/project/src/models/eft/notifier/ISelectProfileRequestData.ts b/project/src/models/eft/notifier/ISelectProfileRequestData.ts deleted file mode 100644 index d5d8b98b..00000000 --- a/project/src/models/eft/notifier/ISelectProfileRequestData.ts +++ /dev/null @@ -1,4 +0,0 @@ -export interface ISelectProfileRequestData -{ - uid: string; -}