Remove lodash.get() calls (#259)

Author: elamperti

src/components/ScrobbleItem/ScrobbleItem.tsx

@@ -1,5 +1,4 @@
 import { Fragment } from 'react';
-import { get } from 'lodash-es';
 import { Trans } from 'react-i18next';
 import { LazyLoadImage } from 'react-lazy-load-image-component';
 
@@ -61,7 +60,7 @@ export default function ScrobbleItem({
   lazyScrollPosition,
 }: ScrobbleItemProps) {
   const { settings } = useSettings();
-  const useOriginalTimestamp = noMenu ? get(settings, 'keepOriginalTimestamp') : false;
+  const useOriginalTimestamp = noMenu ? settings?.keepOriginalTimestamp : false;
   const scrobbleAgain = useScrobbleAgain(scrobble, useOriginalTimestamp, analyticsEvent, cleanupPattern);
 
   const showAlbumArt = !compact && !noCover;
@@ -190,7 +189,7 @@ export default function ScrobbleItem({
       {scrobble.status === 'error' && (
         <div className="error px-2">
           {scrobble.errorDescription && !scrobble.errorMessage ? <Trans i18nKey={scrobble.errorDescription} /> : null}
-          {get(scrobble, 'errorMessage')}
+          {scrobble.errorMessage}
         </div>
       )}
     </div>

src/domains/scrobbleAlbum/partials/AlbumResults.tsx

@@ -1,4 +1,3 @@
-import { get } from 'lodash-es';
 import ReactGA from 'react-ga-neo';
 import { Trans } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
@@ -26,9 +25,10 @@ export default function AlbumResults({
 
   if (Array.isArray(albums)) {
     if (albums.length === 0) {
+      const albumOrArtist = (query as any)?.name ?? query;
       return (
         <div className="col-12 text-center my-4">
-          <Trans i18nKey="noAlbumsFound" values={{ albumOrArtist: get(query, 'name', query) }}>
+          <Trans i18nKey="noAlbumsFound" values={{ albumOrArtist }}>
             No albums found for <em>your search query</em>
           </Trans>
           <br />

src/domains/scrobbleSong/SongForm.tsx

@@ -1,7 +1,6 @@
 import { Suspense, useContext, useEffect, useState } from 'react';
 import addDays from 'date-fns/addDays';
 import addSeconds from 'date-fns/addSeconds';
-import { get } from 'lodash-es';
 import ReactGA from 'react-ga-neo';
 import { Trans } from 'react-i18next';
 import { lazyWithPreload } from 'react-lazy-with-preload';
@@ -285,7 +284,7 @@ export function SongForm() {
       return;
     }
     const info = await trackGetInfo({ artist, title });
-    const suggestedAlbum = get(info, 'album.title');
+    const suggestedAlbum = info?.album?.title;
 
     if (suggestedAlbum === undefined) {
       setalbumAutoFillStatus(AutoFillStatus.Fail);

src/domains/scrobbleUser/ScrobbleUserResults.tsx

@@ -1,6 +1,5 @@
 import { useEffect, useState } from 'react';
 import { keepPreviousData, useQuery } from '@tanstack/react-query';
-import { get } from 'lodash-es';
 import ReactGA from 'react-ga-neo';
 import { Trans } from 'react-i18next';
 import { useSelector } from 'react-redux';
@@ -23,8 +22,11 @@ import { UserResultsHeading } from './partials/UserResultsHeading';
 
 import { MAX_RECENT_USERS } from 'Constants';
 
+import type { AxiosError } from 'axios';
 import type { RootState } from 'store';
 
+type UserGetRecentTracksResult = Awaited<ReturnType<typeof userGetRecentTracks>>;
+
 export function ScrobbleUserResults() {
   const { username: usernameFromParams } = useParams();
   const lowercaseUsername = usernameFromParams.toLowerCase();
@@ -34,7 +36,10 @@ export function ScrobbleUserResults() {
   const [recentUsers, setRecentUsers] = useLocalStorage('recentUsers', []);
   const navigate = useNavigate();
 
-  const { data, isLoading, isFetching, isError, error, isSuccess, isPlaceholderData } = useQuery({
+  const { data, isLoading, isFetching, isError, error, isSuccess, isPlaceholderData } = useQuery<
+    UserGetRecentTracksResult,
+    AxiosError
+  >({
     queryKey: ['profile', lowercaseUsername, 'scrobbles', currentPage],
     queryFn: () => userGetRecentTracks(lowercaseUsername, currentPage),
     staleTime: 1000 * 60 * 3, // minutes
@@ -84,7 +89,7 @@ export function ScrobbleUserResults() {
 
   useEffect(() => {
     if (isError) {
-      const errNumber = get(error, 'response.data.error');
+      const errNumber = (error?.response?.data as any)?.error;
       // 6: User not found - 17: User has a private profile
       if (errNumber === 6 || errNumber === 17) {
         // ToDo: handle private profile case

src/store/reducers/scrobbleReducer.ts

@@ -1,4 +1,4 @@
-import { get, hasIn } from 'lodash-es';
+import { hasIn } from 'lodash-es';
 import shortid from 'shortid';
 
 import { scrobble } from 'utils/clients/api/methods/scrobble';
@@ -200,7 +200,7 @@ const scrobbleReducer = (state = initialState, action) => {
         }
         return overrideScrobbleProps(state, action.payload.config.headers.scrobbleUUID, {
           status: 'error',
-          errorMessage: get(action.payload, 'data.message'),
+          errorMessage: action.payload?.data?.message,
           errorDescription: 'errors.unexpectedResponse',
         });
       }

src/utils/axios.ts

@@ -1,5 +1,4 @@
 import axios from 'axios';
-import { get } from 'lodash-es';
 import qs from 'qs';
 import ReactGA from 'react-ga-neo';
 
@@ -28,7 +27,7 @@ interface ExtendedAxiosRequestConfig extends InternalAxiosRequestConfig {
  * For invalid (ERROR) responses
  */
 function axiosErrorHandler(payload, dispatch) {
-  const errorNumber = payload ? get(payload, 'data.error', payload.status) : -1;
+  const errorNumber = payload?.data?.error ?? payload?.status ?? -1;
   let newError: Partial<Alert> = {
     type: 'danger',
     persistent: false,
@@ -53,7 +52,7 @@ function axiosErrorHandler(payload, dispatch) {
       newError.persistent = true;
       showErrorNumber = true;
 
-      if (get(payload, 'config.params.method') !== 'user.getRecentTracks') {
+      if (payload?.config?.params?.method !== 'user.getRecentTracks') {
         logOut(dispatch)(newError);
       }
       break;
@@ -82,7 +81,7 @@ function axiosErrorHandler(payload, dispatch) {
     default:
       newError.title = 'unexpectedError';
       // newError.message = 'unexpectedErrorMessage';
-      newError.rawMessage = get(payload, 'data.message', null);
+      newError.rawMessage = payload?.data?.message ?? null;
       showErrorNumber = true;
   }
 

src/utils/clients/api/transformers/settings.transformer.ts

@@ -1,15 +1,13 @@
-import { get } from 'lodash-es';
-
 import type { Settings } from 'utils/types/settings';
 
-export function settingsTransformer(settings = {}): Settings {
+export function settingsTransformer(settings: any = {}): Settings {
   return {
-    lang: get(settings, 'lang', 'auto'),
-    use12Hours: !!get(settings, 'use12Hours', false),
-    catchPaste: !!get(settings, 'catchPaste', true),
-    showTrackNumbers: !!get(settings, 'showTrackNumbers', false),
-    hasActiveSubscription: !!get(settings, 'activeSubscription', false),
-    keepOriginalTimestamp: !!get(settings, 'keepOriginalTimestamp', true),
-    patreonId: get(settings, 'patreonId', ''),
+    lang: settings?.lang ?? 'auto',
+    use12Hours: !!(settings?.use12Hours ?? false),
+    catchPaste: !!(settings?.catchPaste ?? true),
+    showTrackNumbers: !!(settings?.showTrackNumbers ?? false),
+    hasActiveSubscription: !!(settings?.activeSubscription ?? false),
+    keepOriginalTimestamp: !!(settings?.keepOriginalTimestamp ?? true),
+    patreonId: settings?.patreonId ?? '',
   };
 }

src/utils/clients/discogs/transformers/topAlbumsResponse.transformer.ts

@@ -1,11 +1,9 @@
-import { get } from 'lodash-es';
-
 import { sanitizeArtistName } from './common/sanitizeArtistName';
 
 import type { Album } from 'utils/types/album';
 
 export function topAlbumsTransformer(response: any): Album[] {
-  return get(response, 'data.releases', [])
+  return (response?.data?.releases ?? [])
     .map((album) => ({
       artist: sanitizeArtistName(album.artist),
       discogsId: `${album.type === 'master' ? '' : 'release-'}${album.master_id || album.id}`,

src/utils/clients/discogs/transformers/tracksResponse.transformer.ts

@@ -1,4 +1,4 @@
-import { get, hasIn } from 'lodash-es';
+import { hasIn } from 'lodash-es';
 import shortid from 'shortid';
 
 import { sanitizeArtistName } from './common/sanitizeArtistName';
@@ -29,8 +29,8 @@ export function tracksTransformer(
     return [];
   }
 
-  const albumArtist = get(options, 'artist', '');
-  const album = get(options, 'album', '');
+  const albumArtist = options?.artist ?? '';
+  const album = options?.album ?? '';
 
   return response?.data.tracklist
     .filter(({ type_: trackType }) => {
@@ -41,7 +41,7 @@ export function tracksTransformer(
     })
     .map((track) => {
       const transformedTrack = {
-        artist: sanitizeArtistName(get(track, 'artists[0].name', options?.artist || '')),
+        artist: sanitizeArtistName((track.artists?.[0]?.name ?? options?.artist) || ''),
         title: track.title,
         album,
         albumArtist,

src/utils/clients/lastfm/methods/trackGetInfo.ts

@@ -1,5 +1,3 @@
-import { get } from 'lodash-es';
-
 import { lastfmAPI } from '../apiClient';
 
 export async function trackGetInfo(track: { mbid?: string; artist: string; title: string }) {
@@ -19,5 +17,5 @@ export async function trackGetInfo(track: { mbid?: string; artist: string; title
     },
   });
 
-  return get(response, 'data.track');
+  return response?.data?.track;
 }