Resolve the next part of type issues

nukeop · Feb 5, 2025 · 23eebe3 · 23eebe3
1 parent a104624
commit 23eebe3
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 16 deletions.
diff --git a/packages/app/app/actions/importfavs.ts b/packages/app/app/actions/importfavs.ts
@@ -4,6 +4,7 @@ import { rest, store } from '@nuclear/core';
 import globals from '../globals';
 import * as FavoritesActions from './favorites';
 import { ImportFavs } from './actionTypes';
+import { ScrobblingState } from '../reducers/scrobbling';
 
 const MAX_TRACKS_PER_PAGE = 1000;
 export function FavImportInit() {
@@ -40,7 +41,7 @@ function FmSuccessFinal(count) {
 }
 
 export function fetchAllFmFavorites() {
-  const storage = store.get('lastFm');
+  const storage = store.get('lastFm') as ScrobblingState;
   if (storage) {
     return async dispatch => {
       dispatch({ type: ImportFavs.LASTFM_FAV_IMPORT_START });

diff --git a/packages/app/app/actions/plugins.tsx b/packages/app/app/actions/plugins.tsx
@@ -6,6 +6,7 @@ import UserPlugin from '../structs/userPlugin';
 import { error } from './toasts';
 import { createApi } from '@nuclear/core';
 import { find, forEach, isNil } from 'lodash';
+import { PluginsState } from '../reducers/plugins';
 
 export const CREATE_PLUGINS = 'CREATE_PLUGINS';
 export const SELECT_STREAM_PROVIDER = 'SELECT_STREAM_PROVIDER';
@@ -158,7 +159,7 @@ export function serializePlugins(plugins) {
 
 export function deserializePlugins() {
   return dispatch => {
-    const plugins = store.get('plugins') || [];
+    const plugins = (store.get('plugins') || []) as PluginsState['userPlugins'];
     forEach(plugins, plugin => {
       dispatch(loadUserPlugin(plugin.path));
     });

diff --git a/packages/app/app/actions/scrobbling.ts b/packages/app/app/actions/scrobbling.ts
@@ -4,21 +4,21 @@ import { rest } from '@nuclear/core';
 
 import { Scrobbling } from './actionTypes';
 import globals from '../globals';
+import { ScrobblingState } from '../reducers/scrobbling';
 
 const lastfm = new rest.LastFmApi(globals.lastfmApiKey, globals.lastfmApiSecret);
 
 export function lastFmReadSettings() {
   return dispatch => {
-    const settings = store.get('lastFm') || {};
+    const settings = (store.get('lastFm') as ScrobblingState);
     if (settings) {
       dispatch({
         type: Scrobbling.LASTFM_READ_SETTINGS,
         payload: {
           lastFmName: settings.lastFmName,
           lastFmAuthToken: settings.lastFmAuthToken,
           lastFmSessionKey: settings.lastFmSessionKey,
-          lastFmScrobblingEnabled: settings.lastFmScrobblingEnabled,
-          lastFmFavImportStatus: settings.lastFmFavImportStatus
+          lastFmScrobblingEnabled: settings.lastFmScrobblingEnabled
         }
       });
     } else {
@@ -50,7 +50,7 @@ export function lastFmConnectAction() {
   };
 }
 
-export function lastFmLoginAction(authToken) {
+export function lastFmLoginAction(authToken: string) {
   return dispatch => {
     dispatch({
       type: 'FAV_IMPORT_INIT',

diff --git a/packages/app/app/actions/toasts.ts b/packages/app/app/actions/toasts.ts
@@ -53,7 +53,7 @@ function generateNotification(title: string, details: string, icon?:  Node | Rea
     },
     type)));
 
-    const timeout = get(settings, 'notificationTimeout') ?? 3;
+    const timeout = get(settings, 'notificationTimeout') as number ?? 3;
     setTimeout(() => dispatch(removeNotification(id)), timeout * 1000);
   };
 }
diff --git a/packages/app/app/components/PluginsView/UserPluginsSection/index.tsx b/packages/app/app/components/PluginsView/UserPluginsSection/index.tsx
@@ -16,8 +16,8 @@ type UserPlugin = {
   description: string;
   image: string | null;
   author: string;
-  loading: boolean;
-  error: boolean;
+  loading?: boolean;
+  error?: boolean;
 }
 
 type UserPluginsSectionProps = {

diff --git a/packages/app/app/components/Settings/Integrations/LastFmSocialIntegration.tsx b/packages/app/app/components/Settings/Integrations/LastFmSocialIntegration.tsx
@@ -16,7 +16,7 @@ type LastFmSocialIntegrationProps = {
     enableScrobbling: Function;
     disableScrobbling: Function;
     lastFmConnectAction: React.MouseEventHandler;
-    lastFmLoginAction: React.MouseEventHandler;
+    lastFmLoginAction: (authToken: string) => void;
     lastFmLogOut: React.MouseEventHandler;
   };
   scrobbling: ReturnType<typeof ScrobblingReducer>;

diff --git a/packages/app/app/components/Settings/index.tsx b/packages/app/app/components/Settings/index.tsx
@@ -31,7 +31,7 @@ export type SettingsProps = {
     enableScrobbling: Function;
     disableScrobbling: Function;
     lastFmConnectAction: React.MouseEventHandler;
-    lastFmLoginAction: React.MouseEventHandler;
+    lastFmLoginAction: (authToken: string) => void;
     lastFmLogOut: React.MouseEventHandler;
   };
   mastodonActions: {

diff --git a/packages/app/app/reducers/plugins.ts b/packages/app/app/reducers/plugins.ts
@@ -19,6 +19,9 @@ type UserPlugin = {
   name: string;
   description: string;
   image: string;
+  author: string;
+  loading?: boolean;
+  error?: boolean;
 }
 
 type PluginKey = keyof typeof config.plugins;
@@ -32,9 +35,7 @@ export type PluginsState = {
   selected: {
     [key in PluginKey]?: string;
   };
-  userPlugins: {
-    [key: string]: UserPlugin;
-  };
+  userPlugins: Record<string, UserPlugin>;
 }
 
 const initialState: PluginsState = {

diff --git a/packages/app/app/reducers/scrobbling.ts b/packages/app/app/reducers/scrobbling.ts
@@ -1,13 +1,20 @@
 import { Scrobbling } from '../actions/actionTypes';
 
-const initialState = {
+export type ScrobblingState = {
+  lastFmName: string | null;
+  lastFmAuthToken: string | null;
+  lastFmSessionKey: string | null;
+  lastFmScrobblingEnabled: boolean;
+};
+
+const initialState: ScrobblingState = {
   lastFmName: null,
   lastFmAuthToken: null,
   lastFmSessionKey: null,
   lastFmScrobblingEnabled: false
 };
 
-export default function ScrobblingReducer(state=initialState, action) {
+export default function ScrobblingReducer(state=initialState, action): ScrobblingState {
   switch (action.type) {
   case Scrobbling.LASTFM_CONNECT:
     return Object.assign({}, state, {