[C-2719] Clean up and document non v1 usage (#3520)

AudiusProject · Jun 7, 2023 · e2896fe · e2896fe
1 parent 2cf5bb7
commit e2896fe
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 330 deletions.
diff --git a/packages/common/src/services/audius-backend/AudiusBackend.ts b/packages/common/src/services/audius-backend/AudiusBackend.ts
diff --git a/packages/common/src/services/explore/Explore.ts b/packages/common/src/services/explore/Explore.ts
@@ -3,7 +3,8 @@ import {
   FeedFilter,
   ID,
   UserCollectionMetadata,
-  UserTrack
+  UserTrack,
+  UserTrackMetadata
 } from '../../models'
 import { encodeHashId, removeNullable } from '../../utils'
 import {
@@ -24,10 +25,6 @@ type TopUserListen = {
   trackId: number
 }
 
-type UserListens = {
-  [key: number]: number
-}
-
 type ExploreConfig = {
   audiusBackendInstance: AudiusBackend
   apiClient: AudiusAPIClient
@@ -63,27 +60,7 @@ export class Explore {
     }
   }
 
-  async getUserListens(trackIds: ID[]): Promise<UserListens> {
-    try {
-      const { data, signature } = await this.audiusBackendInstance.signData()
-      const idQuery = trackIds.map((id) => `&trackIdList=${id}`).join('')
-      return fetch(
-        `${this.audiusBackendInstance.identityServiceUrl}/users/listens?${idQuery}`,
-        {
-          headers: {
-            [AuthHeaders.Message]: data,
-            [AuthHeaders.Signature]: signature
-          }
-        }
-      )
-        .then((res) => res.json())
-        .then((res) => res.listenMap)
-    } catch (e) {
-      console.error(e)
-      return {}
-    }
-  }
-
+  // TODO(C-2719)
   async getTopFolloweeTracksFromWindow(
     userId: ID,
     window: string,
@@ -105,22 +82,30 @@ export class Explore {
     }
   }
 
-  async getFeedNotListenedTo(limit = 25) {
+  async getFeedNotListenedTo(currentUserId: ID, limit = 25) {
     try {
-      const lineupItems = await this.audiusBackendInstance.getSocialFeed({
-        filter: FeedFilter.ORIGINAL,
+      const lineupItems = (await this.apiClient.getSocialFeed({
         offset: 0,
-        limit: 100,
-        withUsers: true,
-        tracksOnly: true
-      })
+        limit,
+        with_users: true,
+        filter: FeedFilter.ORIGINAL,
+        tracks_only: true,
+        current_user_id: currentUserId
+      })) as UserTrackMetadata[] | null
+      if (!lineupItems) return []
 
       const tracks = lineupItems.filter(
         (lineupItem): lineupItem is UserTrack => 'track_id' in lineupItem
       )
-      const trackIds = tracks.map((track) => track.track_id)
 
-      const listens: any = await this.getUserListens(trackIds)
+      // Imperfect solution. Ideally we use an endpoint that gives us true/false
+      // if a user has listened to a passed in array of tracks.
+      const history = await this.apiClient.getUserTrackHistory({
+        currentUserId,
+        userId: currentUserId,
+        limit: 50
+      })
+      const listens = history.map((item) => item.track?.track_id)
 
       const notListenedToTracks = tracks.filter(
         (track) => !listens[track.track_id]
@@ -146,6 +131,7 @@ export class Explore {
     }
   }
 
+  // TODO(C-2719)
   async getTopFolloweeSaves(limit = 25) {
     try {
       const libs = await this.audiusBackendInstance.getAudiusLibs()
@@ -158,6 +144,7 @@ export class Explore {
     }
   }
 
+  // TODO(C-2719)
   async getMostLovedTracks(userId: ID, limit = 25) {
     try {
       const encodedUserId = encodeHashId(userId)
@@ -175,6 +162,7 @@ export class Explore {
     }
   }
 
+  // TODO(C-2719)
   async getFeelingLuckyTracks(userId: ID | null, limit = 25) {
     try {
       let tracks: APITrack[]
@@ -200,18 +188,8 @@ export class Explore {
     }
   }
 
-  async getLatestTrackID(): Promise<number> {
-    try {
-      const libs = await this.audiusBackendInstance.getAudiusLibs()
-      const latestTrackID = await libs.discoveryProvider.getLatest('track')
-      return latestTrackID
-    } catch (e) {
-      console.error(e)
-      return 0
-    }
-  }
-
   /** PLAYLIST ENDPOINTS */
+  // TODO(C-2719)
   async getTopCollections(
     type?: 'playlist' | 'album',
     followeesOnly?: boolean,

diff --git a/packages/common/src/services/wallet-client/WalletClient.ts b/packages/common/src/services/wallet-client/WalletClient.ts
@@ -155,15 +155,6 @@ export class WalletClient {
     }
   }
 
-  async claim(): Promise<void> {
-    try {
-      await this.audiusBackendInstance.makeDistributionClaim()
-    } catch (err) {
-      console.error(err)
-      throw err
-    }
-  }
-
   async sendTokens(address: WalletAddress, amount: BNWei): Promise<void> {
     if (amount.lt(MIN_TRANSFERRABLE_WEI)) {
       throw new Error('Insufficient Audio to transfer')

diff --git a/packages/web/src/common/store/cache/tracks/sagas.js b/packages/web/src/common/store/cache/tracks/sagas.js
@@ -249,10 +249,7 @@ function* deleteTrackAsync(action) {
   const handle = yield select(getUserHandle)
 
   // Before deleting, check if the track is set as the artist pick & delete if so
-  const socials = yield call(
-    audiusBackendInstance.getCreatorSocialHandle,
-    handle
-  )
+  const socials = yield call(audiusBackendInstance.getSocialHandles, handle)
   if (socials.pinnedTrackId === action.trackId) {
     yield put(
       cacheActions.update(Kind.USERS, [

diff --git a/packages/web/src/common/store/cache/users/sagas.js b/packages/web/src/common/store/cache/users/sagas.js
@@ -331,7 +331,7 @@ export function* fetchUserSocials({ handle }) {
   }
   user = yield call(waitForValue, getUser, { handle })
   const socials = yield call(
-    audiusBackendInstance.getCreatorSocialHandle,
+    audiusBackendInstance.getSocialHandles,
     user.handle
   )
 

diff --git a/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts b/packages/web/src/common/store/pages/token-dashboard/getAccountMetadataCID.ts
@@ -7,11 +7,14 @@ const { getUserId } = accountSelectors
 
 export function* getAccountMetadataCID() {
   yield* waitForRead()
-  const audiusBackendInstance = yield* getContext('audiusBackendInstance')
+  const apiClient = yield* getContext('apiClient')
   const accountUserId = yield* select(getUserId)
   if (!accountUserId) return null
 
-  const users = yield* call(audiusBackendInstance.getCreators, [accountUserId])
+  const users = yield* call([apiClient, apiClient.getUser], {
+    userId: accountUserId,
+    currentUserId: accountUserId
+  })
   if (users.length !== 1) return null
   return users[0].metadata_multihash
 }
diff --git a/packages/web/src/common/store/smart-collection/sagas.ts b/packages/web/src/common/store/smart-collection/sagas.ts
@@ -108,7 +108,11 @@ function* fetchBestNewReleases() {
 
 function* fetchUnderTheRadar() {
   const explore = yield* getContext('explore')
-  const tracks = yield* call([explore, 'getFeedNotListenedTo'])
+  const currentUserId = yield* select(getUserId)
+  if (currentUserId == null) {
+    return
+  }
+  const tracks = yield* call([explore, 'getFeedNotListenedTo'], currentUserId)
 
   const trackIds = tracks
     .filter((track: UserTrack) => !track.user.is_deactivated)

diff --git a/packages/web/src/components/notification/Notification/utils.ts b/packages/web/src/components/notification/Notification/utils.ts
@@ -41,7 +41,7 @@ export const getRankSuffix = (rank: number) => {
 }
 
 export const getTwitterHandleByUserHandle = async (userHandle: string) => {
-  const { twitterHandle } = await audiusBackendInstance.getCreatorSocialHandle(
+  const { twitterHandle } = await audiusBackendInstance.getSocialHandles(
     userHandle
   )
   return twitterHandle || ''

diff --git a/packages/web/src/pages/upload-page/components/ShareBanner.tsx b/packages/web/src/pages/upload-page/components/ShareBanner.tsx
@@ -61,7 +61,7 @@ const getContinuePage = (uploadType: UploadType) => {
 }
 
 const getTwitterHandleByUserHandle = async (userHandle: string) => {
-  const { twitterHandle } = await audiusBackendInstance.getCreatorSocialHandle(
+  const { twitterHandle } = await audiusBackendInstance.getSocialHandles(
     userHandle
   )
   return twitterHandle || ''

diff --git a/packages/web/src/store/errors/reportToSentry.ts b/packages/web/src/store/errors/reportToSentry.ts
@@ -17,6 +17,7 @@ export const reportToSentry = async ({
   error,
   name
 }: ReportToSentryArgs) => {
+  console.debug(error, level)
   try {
     Sentry.withScope((scope) => {
       if (level) {