From c423d23912611bda9e2fd9c18a09cdfce8af4c66 Mon Sep 17 00:00:00 2001 From: Chlod Alejandro Date: Wed, 18 Jan 2023 14:14:23 +0800 Subject: [PATCH] rename API to Dispatch --- src/Deputy.ts | 8 ++++---- src/api/{DeputyAPI.ts => DeputyDispatch.ts} | 2 +- src/models/ContributionSurveyRow.ts | 8 +++++--- 3 files changed, 10 insertions(+), 8 deletions(-) rename src/api/{DeputyAPI.ts => DeputyDispatch.ts} (98%) diff --git a/src/Deputy.ts b/src/Deputy.ts index fe684c73..896b7493 100644 --- a/src/Deputy.ts +++ b/src/Deputy.ts @@ -4,7 +4,7 @@ import DeputyCommunications from './DeputyCommunications'; import DeputySession from './session/DeputySession'; import DeputyCasePage from './wiki/DeputyCasePage'; import normalizeTitle from './wiki/util/normalizeTitle'; -import DeputyAPI from './api/DeputyAPI'; +import DeputyDispatch from './api/DeputyDispatch'; import sectionHeadingName from './wiki/util/sectionHeadingName'; import ContributionSurveyRow from './models/ContributionSurveyRow'; import getPageContent from './wiki/util/getPageContent'; @@ -42,7 +42,7 @@ class Deputy { * @private */ static instance: Deputy; - readonly DeputyAPI = DeputyAPI; + readonly DeputyDispatch = DeputyDispatch; readonly DeputyStorage = DeputyStorage; readonly DeputySession = DeputySession; readonly DeputyPreferences = DeputyPreferences; @@ -81,7 +81,7 @@ class Deputy { // Components - api: DeputyAPI; + dispatch: DeputyDispatch; storage: DeputyStorage; prefs: DeputyPreferences; comms: DeputyCommunications; @@ -158,7 +158,7 @@ class Deputy { this.storage = new DeputyStorage(); await this.storage.init(); // Initialize the Deputy API interface - this.api = new DeputyAPI(); + this.dispatch = new DeputyDispatch(); // Initialize the Deputy preferences instance this.prefs = new DeputyPreferences(); // Initialize communications diff --git a/src/api/DeputyAPI.ts b/src/api/DeputyDispatch.ts similarity index 98% rename from src/api/DeputyAPI.ts rename to src/api/DeputyDispatch.ts index fa984e93..9fb3b479 100644 --- a/src/api/DeputyAPI.ts +++ b/src/api/DeputyDispatch.ts @@ -4,7 +4,7 @@ import Requester from '../util/Requester'; /** * API communication class */ -export default class DeputyAPI { +export default class DeputyDispatch { /** * Token used for authentication on the server side. Allows access to deleted diff --git a/src/models/ContributionSurveyRow.ts b/src/models/ContributionSurveyRow.ts index f7d6b1f3..9be0fe44 100644 --- a/src/models/ContributionSurveyRow.ts +++ b/src/models/ContributionSurveyRow.ts @@ -313,7 +313,7 @@ export default class ContributionSurveyRow { } } if ( toCache.length > 0 ) { - const expandedData = await window.deputy.api.getExpandedRevisionData( toCache ); + const expandedData = await window.deputy.dispatch.getExpandedRevisionData( toCache ); for ( const revisionID in expandedData ) { revisionData.set( +revisionID, @@ -355,10 +355,11 @@ export default class ContributionSurveyRow { * * @return The comment with the status indicator removed. */ - getActualComment() { + getActualComment(): string { if ( this.originalStatus === ContributionSurveyRowStatus.Unfinished ) { return ''; - } else if ( this.statusIsolated === false || + } else if ( + this.statusIsolated === false || this.originalStatus === ContributionSurveyRowStatus.Unknown ) { return this.comment; @@ -377,6 +378,7 @@ export default class ContributionSurveyRow { '' ).trim(); } + return ''; } }