♻️ [api] use userinfo instead of credits api

LSS-Manager · Jul 13, 2024 · 2f9ab7b · 2f9ab7b
1 parent b498eb5
commit 2f9ab7b
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 18 deletions.
diff --git a/src/modules/creditsextension/creditsextension.vue b/src/modules/creditsextension/creditsextension.vue
@@ -196,8 +196,8 @@ import { mapState } from 'pinia';
 import { defineAPIStore, useAPIStore } from '@stores/api';
 import { defineRootStore, useRootStore } from '@stores/index';
 
-import type { CreditsInfo } from 'typings/api/Credits';
 import type { IconDefinition } from '@fortawesome/fontawesome-svg-core';
+import type { UserInfo } from 'typings/api/UserInfo';
 import type VueI18n from 'vue-i18n';
 
 export default Vue.extend<
@@ -230,7 +230,7 @@ export default Vue.extend<
         highlight(): void;
     },
     {
-        creditsAPI: CreditsInfo;
+        creditsAPI: UserInfo;
         credits: number;
         creditsLocalized: string;
         coins: number;
@@ -299,7 +299,7 @@ export default Vue.extend<
     computed: {
         ...mapState(defineRootStore, ['credits', 'coins']),
         ...mapState(defineAPIStore, {
-            creditsAPI: 'credits',
+            creditsAPI: 'userinfo',
         }),
         creditsLocalized() {
             return this.credits.toLocaleString();
@@ -382,7 +382,7 @@ export default Vue.extend<
             'alerts'
         ).then(({ value: alerts }) => {
             if (!alerts.length)
-                return useAPIStore().getCredits('creditsextension-initial');
+                return useAPIStore().getUserInfo('creditsextension-initial');
 
             const alertValues = alerts.map(({ credits }) => credits).sort();
 
@@ -403,7 +403,7 @@ export default Vue.extend<
             });
 
             useAPIStore()
-                .getCredits('creditsextension-alerts-initial')
+                .getUserInfo('creditsextension-alerts-initial')
                 .then(
                     ({ credits_user_current }) =>
                         (this.alertProgressPercentage =

diff --git a/src/modules/redesign/components/coins/list.vue b/src/modules/redesign/components/coins/list.vue
@@ -141,7 +141,7 @@ export default Vue.extend<
     data() {
         moment.locale(this.lightbox.rootStore.locale);
         const apiStore = useAPIStore();
-        apiStore.getCredits('redesign/coins/list').then();
+        apiStore.getUserInfo('redesign/coins/list').then();
         return {
             moment,
             search: '',
@@ -247,7 +247,7 @@ export default Vue.extend<
             }).toString();
         },
         timestamps() {
-            let lastCoins = this.apiStore.credits.coins_user_current;
+            let lastCoins = this.apiStore.userinfo.coins_user_current;
 
             const timestamps: [number, number][] = [[Date.now(), lastCoins]];
 

diff --git a/src/modules/redesign/components/lightbox.vue b/src/modules/redesign/components/lightbox.vue
@@ -713,7 +713,7 @@ export default Vue.extend<
         const mountFeature = 'redesign-lightbox-mount';
         this.apiStore.getAllianceInfo(mountFeature).then();
         this.apiStore.getBuildings(mountFeature).then();
-        this.apiStore.getCredits(mountFeature).then();
+        this.apiStore.getUserInfo(mountFeature).then();
         this.apiStore.getVehicles(mountFeature).then();
     },
     mounted() {

diff --git a/src/modules/telemetry/main.ts b/src/modules/telemetry/main.ts
@@ -168,7 +168,7 @@ export default (
     };
 
     LSSM.$stores.api
-        .getCredits('telemetry')
+        .getUserInfo('telemetry')
         .then(async ({ user_directplay_registered }) => {
             if (user_directplay_registered) return;
 

diff --git a/src/stores/api.ts b/src/stores/api.ts
@@ -33,10 +33,10 @@ import MissionsWorker, {
 
 import type { AllianceInfo } from 'typings/api/AllianceInfo';
 import type { Building } from 'typings/Building';
-import type { CreditsInfo } from 'typings/api/Credits';
 import type { Mission } from 'typings/Mission';
 import type { Schooling } from 'typings/api/Schoolings';
 import type { Settings } from 'typings/api/Settings';
+import type { UserInfo } from 'typings/api/UserInfo';
 import type { Vehicle } from 'typings/Vehicle';
 import type { BuildingMarkerAdd, RadioMessage } from 'typings/Ingame';
 
@@ -46,7 +46,7 @@ export interface APIs {
     buildings: Record<Building['id'], Building>;
     alliance_buildings: Record<Building['id'], Building>;
     allianceinfo: AllianceInfo;
-    credits: CreditsInfo;
+    userinfo: UserInfo;
     settings: Settings;
     schoolings: Schooling[];
     alliance_schoolings: Schooling[];
@@ -92,7 +92,7 @@ export const defineAPIStore = defineStore('api', () => {
             finance_active: false,
             users: [],
         }),
-        credits: ref<APIs['credits']>({
+        userinfo: ref<APIs['userinfo']>({
             credits_user_current: 0,
             credits_user_total: 0,
             user_name: '',
@@ -857,8 +857,9 @@ export const defineAPIStore = defineStore('api', () => {
         // allianceinfo
         getAllianceInfo: (feature: string) =>
             _getStoredOrFetch('allianceinfo', feature),
-        // credits API
-        getCredits: (feature: string) => _getStoredOrFetch('credits', feature),
+        // userinfo API
+        getUserInfo: (feature: string) =>
+            _getStoredOrFetch('userinfo', feature),
         // settings API
         getSettings: (feature: string) =>
             _getStoredOrFetch('settings', feature),

diff --git a/src/stores/index.ts b/src/stores/index.ts
@@ -92,15 +92,15 @@ export const defineRootStore = defineStore('root', {
             const old = this.credits;
             this.credits = credits;
             const apiStore = useAPIStore();
-            if (apiStore.credits) {
-                apiStore.credits.credits_user_current = credits;
+            if (apiStore.userinfo) {
+                apiStore.userinfo.credits_user_current = credits;
                 const diff = credits - old;
                 window.dispatchEvent(
                     new CustomEvent(`${PREFIX}_credits_update`, {
                         detail: { old, new: credits, diff },
                     })
                 );
-                if (diff > 0) apiStore.credits.credits_user_total += diff;
+                if (diff > 0) apiStore.userinfo.credits_user_total += diff;
             }
         },
         updateCoins(coins: number) {

diff --git a/typings/api/Credits.d.ts → typings/api/UserInfo.ts b/typings/api/Credits.d.ts → typings/api/UserInfo.ts
@@ -2,7 +2,7 @@
  * @file Types for in game credits API `api/credits`.
  */
 
-export interface CreditsInfo {
+export interface UserInfo {
     credits_user_current: number;
     credits_user_total: number;
     credits_alliance_current?: number;