diff --git a/project/src/callbacks/DialogueCallbacks.ts b/project/src/callbacks/DialogueCallbacks.ts index 81150ef8..6effeb17 100644 --- a/project/src/callbacks/DialogueCallbacks.ts +++ b/project/src/callbacks/DialogueCallbacks.ts @@ -8,8 +8,11 @@ import { ICancelFriendRequestData, IDeclineFriendRequestData, } from "@spt-aki/models/eft/dialog/IAcceptFriendRequestData"; +import { IAddUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IAddUserGroupMailRequest"; +import { IChangeGroupMailOwnerRequest } from "@spt-aki/models/eft/dialog/IChangeGroupMailOwnerRequest"; import { IChatServer } from "@spt-aki/models/eft/dialog/IChatServer"; import { IClearMailMessageRequest } from "@spt-aki/models/eft/dialog/IClearMailMessageRequest"; +import { ICreateGroupMailRequest } from "@spt-aki/models/eft/dialog/ICreateGroupMailRequest"; import { IDeleteFriendRequest } from "@spt-aki/models/eft/dialog/IDeleteFriendRequest"; import { IFriendRequestData } from "@spt-aki/models/eft/dialog/IFriendRequestData"; import { IFriendRequestSendResponse } from "@spt-aki/models/eft/dialog/IFriendRequestSendResponse"; @@ -24,6 +27,7 @@ import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetM import { IPinDialogRequestData } from "@spt-aki/models/eft/dialog/IPinDialogRequestData"; import { IRemoveDialogRequestData } from "@spt-aki/models/eft/dialog/IRemoveDialogRequestData"; import { IRemoveMailMessageRequest } from "@spt-aki/models/eft/dialog/IRemoveMailMessageRequest"; +import { IRemoveUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IRemoveUserGroupMailRequest"; import { ISendMessageRequest } from "@spt-aki/models/eft/dialog/ISendMessageRequest"; import { ISetDialogReadRequestData } from "@spt-aki/models/eft/dialog/ISetDialogReadRequestData"; import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; @@ -32,10 +36,6 @@ import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; import { HashUtil } from "@spt-aki/utils/HashUtil"; import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; import { TimeUtil } from "@spt-aki/utils/TimeUtil"; -import { ICreateGroupMailRequest } from "@spt-aki/models/eft/dialog/ICreateGroupMailRequest"; -import { IChangeGroupMailOwnerRequest } from "@spt-aki/models/eft/dialog/IChangeGroupMailOwnerRequest"; -import { IAddUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IAddUserGroupMailRequest"; -import { IRemoveUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IRemoveUserGroupMailRequest"; @injectable() export class DialogueCallbacks implements OnUpdate @@ -279,7 +279,7 @@ export class DialogueCallbacks implements OnUpdate public createGroupMail( url: string, info: ICreateGroupMailRequest, - sessionID: string + sessionID: string, ): IGetBodyResponseData { throw new Error("Method not implemented."); @@ -288,7 +288,7 @@ export class DialogueCallbacks implements OnUpdate public changeMailGroupOwner( url: string, info: IChangeGroupMailOwnerRequest, - sessionID: string + sessionID: string, ): IGetBodyResponseData { throw new Error("Method not implemented."); @@ -297,7 +297,7 @@ export class DialogueCallbacks implements OnUpdate public addUserToMail( url: string, info: IAddUserGroupMailRequest, - sessionID: string + sessionID: string, ): IGetBodyResponseData { throw new Error("Method not implemented."); @@ -306,7 +306,7 @@ export class DialogueCallbacks implements OnUpdate public removeUserFromMail( url: string, info: IRemoveUserGroupMailRequest, - sessionID: string + sessionID: string, ): IGetBodyResponseData { throw new Error("Method not implemented."); diff --git a/project/src/callbacks/MatchCallbacks.ts b/project/src/callbacks/MatchCallbacks.ts index 9f2f4413..5bedd35f 100644 --- a/project/src/callbacks/MatchCallbacks.ts +++ b/project/src/callbacks/MatchCallbacks.ts @@ -11,6 +11,7 @@ import { IEndOfflineRaidRequestData } from "@spt-aki/models/eft/match/IEndOfflin import { IGetGroupStatusRequestData } from "@spt-aki/models/eft/match/IGetGroupStatusRequestData"; import { IGetGroupStatusResponse } from "@spt-aki/models/eft/match/IGetGroupStatusResponse"; import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; +import { IGroupCurrentResponse } from "@spt-aki/models/eft/match/IGroupCurrentResponse"; import { IJoinMatchRequestData } from "@spt-aki/models/eft/match/IJoinMatchRequestData"; import { IJoinMatchResult } from "@spt-aki/models/eft/match/IJoinMatchResult"; import { IPutMetricsRequestData } from "@spt-aki/models/eft/match/IPutMetricsRequestData"; @@ -21,12 +22,10 @@ import { IUpdatePingRequestData } from "@spt-aki/models/eft/match/IUpdatePingReq import { DatabaseServer } from "@spt-aki/servers/DatabaseServer"; import { HttpResponseUtil } from "@spt-aki/utils/HttpResponseUtil"; import { JsonUtil } from "@spt-aki/utils/JsonUtil"; -import { IGroupCurrentResponse } from "@spt-aki/models/eft/match/IGroupCurrentResponse"; @injectable() export class MatchCallbacks { - constructor( @inject("HttpResponseUtil") protected httpResponse: HttpResponseUtil, @inject("JsonUtil") protected jsonUtil: JsonUtil, @@ -59,7 +58,7 @@ export class MatchCallbacks public groupCurrent( url: string, info: IEmptyRequestData, - sessionID: string + sessionID: string, ): IGetBodyResponseData { throw new Error("Method not implemented."); @@ -125,7 +124,7 @@ export class MatchCallbacks public transferGroup( url: string, info: ITransferGroupRequest, - sessionId: string + sessionId: string, ): IGetBodyResponseData { return this.httpResponse.getBody(true); @@ -136,7 +135,7 @@ export class MatchCallbacks public cancelAllGroupInvite( url: string, info: IEmptyRequestData, - sessionId: string + sessionId: string, ): IGetBodyResponseData { return this.httpResponse.getBody(true); @@ -207,7 +206,11 @@ export class MatchCallbacks /** Handle client/match/group/player/remove */ // eslint-disable-next-line @typescript-eslint/no-unused-vars - public removePlayerFromGroup(url: string, info: IRemovePlayerFromGroupRequest, sessionID: string): IGetBodyResponseData + public removePlayerFromGroup( + url: string, + info: IRemovePlayerFromGroupRequest, + sessionID: string, + ): IGetBodyResponseData { return this.httpResponse.getBody(true); } @@ -244,7 +247,7 @@ export class MatchCallbacks public raidReady( url: string, info: IEmptyRequestData, - sessionId: string + sessionId: string, ): IGetBodyResponseData { return this.httpResponse.getBody(true); @@ -254,7 +257,7 @@ export class MatchCallbacks public notRaidReady( url: string, info: IEmptyRequestData, - sessionId: string + sessionId: string, ): IGetBodyResponseData { return this.httpResponse.getBody(true); diff --git a/project/src/controllers/MatchController.ts b/project/src/controllers/MatchController.ts index 619ed620..de2b8caa 100644 --- a/project/src/controllers/MatchController.ts +++ b/project/src/controllers/MatchController.ts @@ -6,11 +6,9 @@ import { ProfileHelper } from "@spt-aki/helpers/ProfileHelper"; import { TraderHelper } from "@spt-aki/helpers/TraderHelper"; import { IPmcData } from "@spt-aki/models/eft/common/IPmcData"; import { Item } from "@spt-aki/models/eft/common/tables/IItem"; -import { ICreateGroupRequestData } from "@spt-aki/models/eft/match/ICreateGroupRequestData"; import { IEndOfflineRaidRequestData } from "@spt-aki/models/eft/match/IEndOfflineRaidRequestData"; import { IGetGroupStatusRequestData } from "@spt-aki/models/eft/match/IGetGroupStatusRequestData"; import { IGetGroupStatusResponse } from "@spt-aki/models/eft/match/IGetGroupStatusResponse"; -import { IGetProfileRequestData } from "@spt-aki/models/eft/match/IGetProfileRequestData"; import { IGetRaidConfigurationRequestData } from "@spt-aki/models/eft/match/IGetRaidConfigurationRequestData"; import { IJoinMatchRequestData } from "@spt-aki/models/eft/match/IJoinMatchRequestData"; import { IJoinMatchResult } from "@spt-aki/models/eft/match/IJoinMatchResult"; diff --git a/project/src/routers/static/DialogStaticRouter.ts b/project/src/routers/static/DialogStaticRouter.ts index 120cd442..37eb5159 100644 --- a/project/src/routers/static/DialogStaticRouter.ts +++ b/project/src/routers/static/DialogStaticRouter.ts @@ -1,18 +1,18 @@ import { inject, injectable } from "tsyringe"; import { DialogueCallbacks } from "@spt-aki/callbacks/DialogueCallbacks"; import { RouteAction, StaticRouter } from "@spt-aki/di/Router"; +import { IAddUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IAddUserGroupMailRequest"; +import { IChangeGroupMailOwnerRequest } from "@spt-aki/models/eft/dialog/IChangeGroupMailOwnerRequest"; import { IChatServer } from "@spt-aki/models/eft/dialog/IChatServer"; +import { ICreateGroupMailRequest } from "@spt-aki/models/eft/dialog/ICreateGroupMailRequest"; import { IFriendRequestSendResponse } from "@spt-aki/models/eft/dialog/IFriendRequestSendResponse"; import { IGetAllAttachmentsResponse } from "@spt-aki/models/eft/dialog/IGetAllAttachmentsResponse"; import { IGetFriendListDataResponse } from "@spt-aki/models/eft/dialog/IGetFriendListDataResponse"; import { IGetMailDialogViewResponseData } from "@spt-aki/models/eft/dialog/IGetMailDialogViewResponseData"; +import { IRemoveUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IRemoveUserGroupMailRequest"; import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; import { DialogueInfo } from "@spt-aki/models/eft/profile/IAkiProfile"; -import { ICreateGroupMailRequest } from "@spt-aki/models/eft/dialog/ICreateGroupMailRequest"; -import { IChangeGroupMailOwnerRequest } from "@spt-aki/models/eft/dialog/IChangeGroupMailOwnerRequest"; -import { IAddUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IAddUserGroupMailRequest"; -import { IRemoveUserGroupMailRequest } from "@spt-aki/models/eft/dialog/IRemoveUserGroupMailRequest"; @injectable() export class DialogStaticRouter extends StaticRouter diff --git a/project/src/routers/static/GameStaticRouter.ts b/project/src/routers/static/GameStaticRouter.ts index 4ac6a2c3..0b0bfb75 100644 --- a/project/src/routers/static/GameStaticRouter.ts +++ b/project/src/routers/static/GameStaticRouter.ts @@ -9,10 +9,10 @@ import { IGameLogoutResponseData } from "@spt-aki/models/eft/game/IGameLogoutRes import { IGameModeResponse } from "@spt-aki/models/eft/game/IGameModeResponse"; import { IGameStartResponse } from "@spt-aki/models/eft/game/IGameStartResponse"; import { IGetRaidTimeResponse } from "@spt-aki/models/eft/game/IGetRaidTimeResponse"; +import { ISendReportRequest } from "@spt-aki/models/eft/game/ISendReportRequest"; import { IServerDetails } from "@spt-aki/models/eft/game/IServerDetails"; import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyResponseData"; import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; -import { ISendReportRequest } from "@spt-aki/models/eft/game/ISendReportRequest"; @injectable() export class GameStaticRouter extends StaticRouter @@ -139,7 +139,12 @@ export class GameStaticRouter extends StaticRouter ), new RouteAction( "/client/report/send", - async (url: string, info: ISendReportRequest, sessionID: string, output: string): Promise => + async ( + url: string, + info: ISendReportRequest, + sessionID: string, + output: string, + ): Promise => { return null; }, diff --git a/project/src/routers/static/MatchStaticRouter.ts b/project/src/routers/static/MatchStaticRouter.ts index 965df4df..5e2612a7 100644 --- a/project/src/routers/static/MatchStaticRouter.ts +++ b/project/src/routers/static/MatchStaticRouter.ts @@ -6,8 +6,8 @@ import { IGetBodyResponseData } from "@spt-aki/models/eft/httpResponse/IGetBodyR import { INullResponseData } from "@spt-aki/models/eft/httpResponse/INullResponseData"; import { IAcceptGroupInviteResponse } from "@spt-aki/models/eft/match/IAcceptGroupInviteResponse"; import { IGetGroupStatusResponse } from "@spt-aki/models/eft/match/IGetGroupStatusResponse"; -import { IJoinMatchResult } from "@spt-aki/models/eft/match/IJoinMatchResult"; import { IGroupCurrentResponse } from "@spt-aki/models/eft/match/IGroupCurrentResponse"; +import { IJoinMatchResult } from "@spt-aki/models/eft/match/IJoinMatchResult"; @injectable() export class MatchStaticRouter extends StaticRouter @@ -55,7 +55,12 @@ export class MatchStaticRouter extends StaticRouter ), new RouteAction( "/client/match/group/delete", - async (url: string, info: any, sessionID: string, output: string): Promise> => + async ( + url: string, + info: any, + sessionID: string, + output: string, + ): Promise> => { return this.matchCallbacks.deleteGroup(url, info, sessionID); }, @@ -105,7 +110,12 @@ export class MatchStaticRouter extends StaticRouter ), new RouteAction( "/client/match/group/current", - async (url: string, info: IEmptyRequestData, sessionID: string, output: string): Promise> => + async ( + url: string, + info: IEmptyRequestData, + sessionID: string, + output: string, + ): Promise> => { return this.matchCallbacks.groupCurrent(url, info, sessionID); }, @@ -258,7 +268,12 @@ export class MatchStaticRouter extends StaticRouter ), new RouteAction( "/client/match/group/player/remove", - async (url: string, info: any, sessionID: string, output: string): Promise> => + async ( + url: string, + info: any, + sessionID: string, + output: string, + ): Promise> => { return this.matchCallbacks.removePlayerFromGroup(url, info, sessionID); },