From 652c25df26f32e1029410496ccd11d0d046d7d34 Mon Sep 17 00:00:00 2001 From: object <110488133+oobjectt@users.noreply.github.com> Date: Sat, 25 Nov 2023 20:21:16 +0100 Subject: [PATCH] Moderation | Change name variables --- .../CloseIssueDefaultActionMessageComposer.ts | 4 +- .../DefaultSanctionMessageComposer.ts | 8 ++-- .../moderation/ModAlertMessageComposer.ts | 8 ++-- .../moderation/ModBanMessageComposer.ts | 8 ++-- .../moderation/ModKickMessageComposer.ts | 8 ++-- .../moderation/ModMessageMessageComposer.ts | 12 +++--- .../moderation/ModMuteMessageComposer.ts | 8 ++-- .../moderation/ModToolPreferencesComposer.ts | 4 +- .../moderation/ModToolSanctionComposer.ts | 4 +- .../ModTradingLockMessageComposer.ts | 8 ++-- .../ModeratorActionMessageComposer.ts | 8 ++-- .../parser/moderation/CfhChatlogData.ts | 12 +++--- .../moderation/IssueDeletedMessageParser.ts | 4 +- .../moderation/IssueInfoMessageParser.ts | 38 +++++++++---------- .../IssuePickFailedMessageParser.ts | 16 ++++---- .../messages/parser/moderation/ModRoomData.ts | 12 +++--- .../ModeratorToolPreferencesMessageParser.ts | 10 ++--- .../parser/moderation/PatternMatchData.ts | 8 ++-- .../parser/moderation/RoomModerationData.ts | 14 +++---- .../parser/moderation/RoomVisitData.ts | 10 ++--- .../parser/moderation/RoomVisitsData.ts | 10 ++--- 21 files changed, 107 insertions(+), 107 deletions(-) diff --git a/src/nitro/communication/messages/outgoing/moderation/CloseIssueDefaultActionMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/CloseIssueDefaultActionMessageComposer.ts index 781c4f8dd..630acccc8 100644 --- a/src/nitro/communication/messages/outgoing/moderation/CloseIssueDefaultActionMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/CloseIssueDefaultActionMessageComposer.ts @@ -4,9 +4,9 @@ export class CloseIssueDefaultActionMessageComposer implements IMessageComposer< { private _data: number[]; - constructor(k: number, issueIds: number[], _arg_2: number) + constructor(issueId: number, issueIds: number[], topicId: number) { - this._data = [k, issueIds.length, ...issueIds, _arg_2]; + this._data = [issueId, issueIds.length, ...issueIds, topicId]; } public getMessageArray() diff --git a/src/nitro/communication/messages/outgoing/moderation/DefaultSanctionMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/DefaultSanctionMessageComposer.ts index 207b08141..e85586f4a 100644 --- a/src/nitro/communication/messages/outgoing/moderation/DefaultSanctionMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/DefaultSanctionMessageComposer.ts @@ -5,12 +5,12 @@ export class DefaultSanctionMessageComposer implements IMessageComposer; - constructor(k: number, _arg_2: number, _arg_3: string, _arg_4: number = -1) + constructor(userId: number, selectedTopic: number, message: string, issueState: number = -1) { - this._data = [k, _arg_2, _arg_3]; - if(_arg_4 != ModBanMessageComposer.NO_ISSUE_ID) + this._data = [userId, selectedTopic, message]; + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(_arg_4); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModAlertMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModAlertMessageComposer.ts index 4b91007e5..190709773 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModAlertMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModAlertMessageComposer.ts @@ -5,12 +5,12 @@ export class ModAlertMessageComposer implements IMessageComposer; - constructor(k: number, arg2: string, arg3: number, arg4: number = -1) + constructor(userId: number, message: string, categoryId: number, issueState: number = -1) { - this._data = [k, arg2, arg3]; - if(arg4 != ModBanMessageComposer.NO_ISSUE_ID) + this._data = [userId, message, categoryId]; + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(arg4); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModBanMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModBanMessageComposer.ts index 4b32fd079..654193cf2 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModBanMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModBanMessageComposer.ts @@ -6,12 +6,12 @@ export class ModBanMessageComposer implements IMessageComposer; - constructor(k: number, arg2: string, arg3: number, arg4: number, arg5: boolean, arg6: number = -1) + constructor(userId: number, message: string, categoryId: number, selectedAction: number, isBan100Years: boolean, issueState: number = -1) { - this._data = [k, arg2, arg3, arg4, arg5]; - if(arg6 != ModBanMessageComposer.NO_ISSUE_ID) + this._data = [userId, message, categoryId, selectedAction, isBan100Years]; + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(arg6); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts index c3500f7ce..c132cd76b 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModKickMessageComposer.ts @@ -5,13 +5,13 @@ export class ModKickMessageComposer implements IMessageComposer; - constructor(k: number, arg2: string, arg3: number, arg4: number = -1) + constructor(userId: number, message: string, categoryId: number, issueState: number = -1) { - this._data = [k, arg2, arg3]; + this._data = [userId, message, categoryId]; - if(arg4 != ModBanMessageComposer.NO_ISSUE_ID) + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(arg4); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModMessageMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModMessageMessageComposer.ts index 0c1c8fa3c..6a217b704 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModMessageMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModMessageMessageComposer.ts @@ -5,16 +5,16 @@ export class ModMessageMessageComposer implements IMessageComposer { private _data: any[] = []; - constructor(k: number, arg2: string, arg3: number, arg4: number = -1) + constructor(userId: number, message: string, categoryId: number, issueState: number = -1) { - this._data.push(k); - this._data.push(arg2); + this._data.push(userId); + this._data.push(message); this._data.push(''); this._data.push(''); - this._data.push(arg3); - if(arg4 != ModBanMessageComposer.NO_ISSUE_ID) + this._data.push(categoryId); + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(arg4); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts index 4ccdf7f63..12044905a 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModMuteMessageComposer.ts @@ -5,12 +5,12 @@ export class ModMuteMessageComposer implements IMessageComposer; - constructor(k: number, arg2: string, arg3: number, arg4: number = -1) + constructor(userId: number, message: string, categoryId: number, issueState: number = -1) { - this._data = [k, arg2, arg3]; - if(arg4 != ModBanMessageComposer.NO_ISSUE_ID) + this._data = [userId, message, categoryId]; + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(arg4); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModToolPreferencesComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModToolPreferencesComposer.ts index d35094066..3001c50ea 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModToolPreferencesComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModToolPreferencesComposer.ts @@ -4,9 +4,9 @@ export class ModToolPreferencesComposer implements IMessageComposer; - constructor(k: number, _arg_2: number, _arg_3: number, _arg_4: number) + constructor(lastWindowX: number, lastWindowY: number, lastWindowWidth: number, lastWindowHeight: number) { - this._data = [k, _arg_2, _arg_3, _arg_4]; + this._data = [lastWindowX, lastWindowY, lastWindowWidth, lastWindowHeight]; } public getMessageArray() diff --git a/src/nitro/communication/messages/outgoing/moderation/ModToolSanctionComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModToolSanctionComposer.ts index 81965c395..171aa0fcc 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModToolSanctionComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModToolSanctionComposer.ts @@ -4,9 +4,9 @@ export class ModToolSanctionComposer implements IMessageComposer; - constructor(k: number, _arg_2: number, _arg_3: number) + constructor(issueId: number, userId: number, sanctionId: number) { - this._data = [k, _arg_2, _arg_3]; + this._data = [issueId, userId, sanctionId]; } public getMessageArray() diff --git a/src/nitro/communication/messages/outgoing/moderation/ModTradingLockMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModTradingLockMessageComposer.ts index 568d33e7d..1c83fbbcf 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModTradingLockMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModTradingLockMessageComposer.ts @@ -5,13 +5,13 @@ export class ModTradingLockMessageComposer implements IMessageComposer; - constructor(k: number, arg2: string, arg3: number, arg4: number, arg5: number = -1) + constructor(userId: number, message: string, numSeconds: number, categoryId: number, issueState: number = -1) { - this._data = [k, arg2, arg3, arg4]; + this._data = [userId, message, numSeconds, categoryId]; - if(arg5 != ModBanMessageComposer.NO_ISSUE_ID) + if(issueState != ModBanMessageComposer.NO_ISSUE_ID) { - this._data.push(arg5); + this._data.push(issueState); } } diff --git a/src/nitro/communication/messages/outgoing/moderation/ModeratorActionMessageComposer.ts b/src/nitro/communication/messages/outgoing/moderation/ModeratorActionMessageComposer.ts index a693b976a..58922f543 100644 --- a/src/nitro/communication/messages/outgoing/moderation/ModeratorActionMessageComposer.ts +++ b/src/nitro/communication/messages/outgoing/moderation/ModeratorActionMessageComposer.ts @@ -9,11 +9,11 @@ export class ModeratorActionMessageComposer implements IMessageComposer private _data: any[] = []; - constructor(k: number, arg2: string, arg3: string) + constructor(actionState: number, message: string, value: string) { - this._data.push(k); - this._data.push(arg2); - this._data.push(arg3); + this._data.push(actionState); + this._data.push(message); + this._data.push(value); } public getMessageArray() diff --git a/src/nitro/communication/messages/parser/moderation/CfhChatlogData.ts b/src/nitro/communication/messages/parser/moderation/CfhChatlogData.ts index b9cc8bdcd..fe886285a 100644 --- a/src/nitro/communication/messages/parser/moderation/CfhChatlogData.ts +++ b/src/nitro/communication/messages/parser/moderation/CfhChatlogData.ts @@ -9,13 +9,13 @@ export class CfhChatlogData private _chatRecordId: number; private _chatRecord: ChatRecordData; - constructor(k: IMessageDataWrapper) + constructor(wrapper: IMessageDataWrapper) { - this._issueId = k.readInt(); - this._callerUserId = k.readInt(); - this._reportedUserId = k.readInt(); - this._chatRecordId = k.readInt(); - this._chatRecord = new ChatRecordData(k); + this._issueId = wrapper.readInt(); + this._callerUserId = wrapper.readInt(); + this._reportedUserId = wrapper.readInt(); + this._chatRecordId = wrapper.readInt(); + this._chatRecord = new ChatRecordData(wrapper); } public get issueId(): number diff --git a/src/nitro/communication/messages/parser/moderation/IssueDeletedMessageParser.ts b/src/nitro/communication/messages/parser/moderation/IssueDeletedMessageParser.ts index 0471b0977..e54610c4c 100644 --- a/src/nitro/communication/messages/parser/moderation/IssueDeletedMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/IssueDeletedMessageParser.ts @@ -9,9 +9,9 @@ export class IssueDeletedMessageParser implements IMessageParser return true; } - public parse(k: IMessageDataWrapper): boolean + public parse(wrapper: IMessageDataWrapper): boolean { - this._issueId = parseInt(k.readString()); + this._issueId = parseInt(wrapper.readString()); return true; } diff --git a/src/nitro/communication/messages/parser/moderation/IssueInfoMessageParser.ts b/src/nitro/communication/messages/parser/moderation/IssueInfoMessageParser.ts index 766095a51..3b0bb72dc 100644 --- a/src/nitro/communication/messages/parser/moderation/IssueInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/IssueInfoMessageParser.ts @@ -18,30 +18,30 @@ export class IssueInfoMessageParser implements IMessageParser return true; } - public parse(k: IMessageDataWrapper): boolean + public parse(wrapper: IMessageDataWrapper): boolean { - const issueId: number = k.readInt(); - const state: number = k.readInt(); - const categoryId: number = k.readInt(); - const reportedCategoryId: number = k.readInt(); - const issueAgeInMs: number = k.readInt(); - const priority: number = k.readInt(); - const groupingId: number = k.readInt(); - const reporterUserId: number = k.readInt(); - const reporterUsername: string = k.readString(); - const reportedUserId: number = k.readInt(); - const reportedUsername: string = k.readString(); - const pickerUserId: number = k.readInt(); - const pickerUsername: string = k.readString(); - const message: string = k.readString(); - const chatRecordId: number = k.readInt(); - - const patternsCount: number = k.readInt(); + const issueId: number = wrapper.readInt(); + const state: number = wrapper.readInt(); + const categoryId: number = wrapper.readInt(); + const reportedCategoryId: number = wrapper.readInt(); + const issueAgeInMs: number = wrapper.readInt(); + const priority: number = wrapper.readInt(); + const groupingId: number = wrapper.readInt(); + const reporterUserId: number = wrapper.readInt(); + const reporterUsername: string = wrapper.readString(); + const reportedUserId: number = wrapper.readInt(); + const reportedUsername: string = wrapper.readString(); + const pickerUserId: number = wrapper.readInt(); + const pickerUsername: string = wrapper.readString(); + const message: string = wrapper.readString(); + const chatRecordId: number = wrapper.readInt(); + + const patternsCount: number = wrapper.readInt(); const patterns: PatternMatchData[] = []; for(let i = 0; i < patternsCount; i++) { - patterns.push(new PatternMatchData(k)); + patterns.push(new PatternMatchData(wrapper)); } this._issueData = new IssueMessageData(issueId, state, categoryId, reportedCategoryId, issueAgeInMs, diff --git a/src/nitro/communication/messages/parser/moderation/IssuePickFailedMessageParser.ts b/src/nitro/communication/messages/parser/moderation/IssuePickFailedMessageParser.ts index 1c81cb422..1728a548e 100644 --- a/src/nitro/communication/messages/parser/moderation/IssuePickFailedMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/IssuePickFailedMessageParser.ts @@ -13,23 +13,23 @@ export class IssuePickFailedMessageParser implements IMessageParser return true; } - public parse(k: IMessageDataWrapper): boolean + public parse(wrapper: IMessageDataWrapper): boolean { this._issues = []; - const count = k.readInt(); + const count = wrapper.readInt(); for(let i = 0; i < count; i++) { - const _local_4 = k.readInt(); - const _local_5 = k.readInt(); - const _local_6 = k.readString(); - const _local_7 = new IssueMessageData(_local_4, 0, 0, 0, 0, 0, 0, 0, null, 0, null, _local_5, _local_6, null, 0, []); + const issueId = wrapper.readInt(); + const userId = wrapper.readInt(); + const userName = wrapper.readString(); + const _local_7 = new IssueMessageData(issueId, 0, 0, 0, 0, 0, 0, 0, null, 0, null, userId, userName, null, 0, []); this._issues.push(_local_7); } - this._retryEnabled = k.readBoolean(); - this._retryCount = k.readInt(); + this._retryEnabled = wrapper.readBoolean(); + this._retryCount = wrapper.readInt(); return true; } diff --git a/src/nitro/communication/messages/parser/moderation/ModRoomData.ts b/src/nitro/communication/messages/parser/moderation/ModRoomData.ts index 1c67e2c29..893522e6a 100644 --- a/src/nitro/communication/messages/parser/moderation/ModRoomData.ts +++ b/src/nitro/communication/messages/parser/moderation/ModRoomData.ts @@ -8,22 +8,22 @@ export class ModRoomData implements IDisposable private _tags: string[]; private _disposed: boolean; - constructor(k: IMessageDataWrapper) + constructor(wrapper: IMessageDataWrapper) { this._tags = []; - this._exists = k.readBoolean(); + this._exists = wrapper.readBoolean(); if(!this.exists) { return; } - this._name = k.readString(); - this._desc = k.readString(); + this._name = wrapper.readString(); + this._desc = wrapper.readString(); - const tagCount = k.readInt(); + const tagCount = wrapper.readInt(); for(let i = 0; i < tagCount; i++) { - this._tags.push(k.readString()); + this._tags.push(wrapper.readString()); } } diff --git a/src/nitro/communication/messages/parser/moderation/ModeratorToolPreferencesMessageParser.ts b/src/nitro/communication/messages/parser/moderation/ModeratorToolPreferencesMessageParser.ts index daade995d..777a58bec 100644 --- a/src/nitro/communication/messages/parser/moderation/ModeratorToolPreferencesMessageParser.ts +++ b/src/nitro/communication/messages/parser/moderation/ModeratorToolPreferencesMessageParser.ts @@ -16,12 +16,12 @@ export class ModeratorToolPreferencesMessageParser implements IMessageParser return true; } - public parse(k: IMessageDataWrapper): boolean + public parse(wrapper: IMessageDataWrapper): boolean { - this._windowX = k.readInt(); - this._windowY = k.readInt(); - this._windowWidth = k.readInt(); - this._windowHeight = k.readInt(); + this._windowX = wrapper.readInt(); + this._windowY = wrapper.readInt(); + this._windowWidth = wrapper.readInt(); + this._windowHeight = wrapper.readInt(); return true; } diff --git a/src/nitro/communication/messages/parser/moderation/PatternMatchData.ts b/src/nitro/communication/messages/parser/moderation/PatternMatchData.ts index de99ee2e3..0b96a70bc 100644 --- a/src/nitro/communication/messages/parser/moderation/PatternMatchData.ts +++ b/src/nitro/communication/messages/parser/moderation/PatternMatchData.ts @@ -7,11 +7,11 @@ export class PatternMatchData implements IDisposable private _endIndex: number; private _disposed: boolean = false; - constructor(k: IMessageDataWrapper) + constructor(wrapper: IMessageDataWrapper) { - this._pattern = k.readString(); - this._startIndex = k.readInt(); - this._endIndex = k.readInt(); + this._pattern = wrapper.readString(); + this._startIndex = wrapper.readInt(); + this._endIndex = wrapper.readInt(); } public dispose(): void diff --git a/src/nitro/communication/messages/parser/moderation/RoomModerationData.ts b/src/nitro/communication/messages/parser/moderation/RoomModerationData.ts index 5c194cfb0..8354f15b2 100644 --- a/src/nitro/communication/messages/parser/moderation/RoomModerationData.ts +++ b/src/nitro/communication/messages/parser/moderation/RoomModerationData.ts @@ -11,14 +11,14 @@ export class RoomModerationData implements IDisposable private _room: ModRoomData; private _disposed: boolean; - constructor(k: IMessageDataWrapper) + constructor(wrapper: IMessageDataWrapper) { - this._flatId = k.readInt(); - this._userCount = k.readInt(); - this._ownerInRoom = k.readBoolean(); - this._ownerId = k.readInt(); - this._ownerName = k.readString(); - this._room = new ModRoomData(k); + this._flatId = wrapper.readInt(); + this._userCount = wrapper.readInt(); + this._ownerInRoom = wrapper.readBoolean(); + this._ownerId = wrapper.readInt(); + this._ownerName = wrapper.readString(); + this._room = new ModRoomData(wrapper); } public get flatId(): number diff --git a/src/nitro/communication/messages/parser/moderation/RoomVisitData.ts b/src/nitro/communication/messages/parser/moderation/RoomVisitData.ts index f97d792d3..3de6a214e 100644 --- a/src/nitro/communication/messages/parser/moderation/RoomVisitData.ts +++ b/src/nitro/communication/messages/parser/moderation/RoomVisitData.ts @@ -7,12 +7,12 @@ export class RoomVisitData private _enterHour: number; private _enterMinute: number; - constructor(k: IMessageDataWrapper) + constructor(wrapper: IMessageDataWrapper) { - this._roomId = k.readInt(); - this._roomName = k.readString(); - this._enterHour = k.readInt(); - this._enterMinute = k.readInt(); + this._roomId = wrapper.readInt(); + this._roomName = wrapper.readString(); + this._enterHour = wrapper.readInt(); + this._enterMinute = wrapper.readInt(); } public get roomId(): number diff --git a/src/nitro/communication/messages/parser/moderation/RoomVisitsData.ts b/src/nitro/communication/messages/parser/moderation/RoomVisitsData.ts index 7fd873c1b..0db7907d2 100644 --- a/src/nitro/communication/messages/parser/moderation/RoomVisitsData.ts +++ b/src/nitro/communication/messages/parser/moderation/RoomVisitsData.ts @@ -7,16 +7,16 @@ export class RoomVisitsData private _userName: string; private _rooms: RoomVisitData[]; - constructor(k: IMessageDataWrapper) + constructor(wrapper: IMessageDataWrapper) { this._rooms = []; - this._userId = k.readInt(); - this._userName = k.readString(); - const _local_2 = k.readInt(); + this._userId = wrapper.readInt(); + this._userName = wrapper.readString(); + const _local_2 = wrapper.readInt(); let _local_3 = 0; while(_local_3 < _local_2) { - this._rooms.push(new RoomVisitData(k)); + this._rooms.push(new RoomVisitData(wrapper)); _local_3++; } }