diff --git a/packages/common/src/adapters/accessConditionsFromSDK.ts b/packages/common/src/adapters/accessConditionsFromSDK.ts index 5b9b976416b..18d6f0e9b68 100644 --- a/packages/common/src/adapters/accessConditionsFromSDK.ts +++ b/packages/common/src/adapters/accessConditionsFromSDK.ts @@ -1,4 +1,4 @@ -import type { AccessGate, full } from '@audius/sdk' +import type { AccessGate } from '@audius/sdk' import { instanceOfExtendedPurchaseGate, instanceOfFollowGate, @@ -7,9 +7,9 @@ import { import { AccessConditions } from '~/models' -/** Accepts default API AccessGate or full API AccessGate (e.g. from playlists). */ +/** Accepts default API AccessGate (e.g. from playlists). */ export const accessConditionsFromSDK = ( - input: AccessGate | full.AccessGate + input: AccessGate ): AccessConditions | null => { if (instanceOfFollowGate(input)) { return { follow_user_id: input.followUserId } diff --git a/packages/common/src/adapters/activity.ts b/packages/common/src/adapters/activity.ts index 31e7641c556..c9e6b7f4b15 100644 --- a/packages/common/src/adapters/activity.ts +++ b/packages/common/src/adapters/activity.ts @@ -1,51 +1,56 @@ -import { full } from '@audius/sdk' +import type { + Activity, + Playlist, + Track +} from '@audius/sdk' +import { ActivityItemTypeEnum } from '@audius/sdk' import { userCollectionMetadataFromSDK } from './collection' import { userTrackMetadataFromSDK } from './track' -export const activityFromSDK = (input: full.ActivityFull) => { +export const activityFromSDK = (input: Activity) => { const { timestamp, itemType: item_type, item } = input - if (item_type === full.ActivityFullItemTypeEnum.Track) { + if (item_type === ActivityItemTypeEnum.Track) { return { timestamp, item_type, - item: userTrackMetadataFromSDK(item as full.TrackFull) + item: userTrackMetadataFromSDK(item as Track) } - } else if (item_type === full.ActivityFullItemTypeEnum.Playlist) { + } else if (item_type === ActivityItemTypeEnum.Playlist) { return { timestamp, item_type, - item: userCollectionMetadataFromSDK(item as full.PlaylistFull) + item: userCollectionMetadataFromSDK(item as Playlist) } } return undefined } -export const trackActivityFromSDK = (input: full.ActivityFull) => { +export const trackActivityFromSDK = (input: Activity) => { const { timestamp, itemType: item_type, item } = input - if (item_type === full.ActivityFullItemTypeEnum.Track) { + if (item_type === ActivityItemTypeEnum.Track) { return { timestamp, item_type, - item: userTrackMetadataFromSDK(item as full.TrackFull) + item: userTrackMetadataFromSDK(item as Track) } } return undefined } -export const repostActivityFromSDK = (input: full.ActivityFull) => { +export const repostActivityFromSDK = (input: Activity) => { const { timestamp, itemType: item_type, item } = input - if (item_type === full.ActivityFullItemTypeEnum.Track) { + if (item_type === ActivityItemTypeEnum.Track) { return { timestamp, item_type, - item: userTrackMetadataFromSDK(full.TrackFullFromJSON(item)) + item: userTrackMetadataFromSDK(item as Track) } - } else if (item_type === full.ActivityFullItemTypeEnum.Playlist) { + } else if (item_type === ActivityItemTypeEnum.Playlist) { return { timestamp, item_type, - item: userCollectionMetadataFromSDK(full.PlaylistFullFromJSON(item)) + item: userCollectionMetadataFromSDK(item as Playlist) } } return undefined diff --git a/packages/common/src/adapters/audioTransactions.ts b/packages/common/src/adapters/audioTransactions.ts index bef28f321be..d6fa1e78455 100644 --- a/packages/common/src/adapters/audioTransactions.ts +++ b/packages/common/src/adapters/audioTransactions.ts @@ -1,4 +1,4 @@ -import { full } from '@audius/sdk' +import type { TransactionDetails as SdkTransactionDetails } from '@audius/sdk' import { TransactionDetails, @@ -7,7 +7,7 @@ import { } from '~/store/ui/transaction-details/types' export const audioTransactionFromSdk = ( - tx: full.TransactionDetails + tx: SdkTransactionDetails ): TransactionDetails => { const transactionTypeMap: Record = { purchase_stripe: TransactionType.PURCHASE, diff --git a/packages/common/src/adapters/collection.ts b/packages/common/src/adapters/collection.ts index f01e7307c5f..9017f33f674 100644 --- a/packages/common/src/adapters/collection.ts +++ b/packages/common/src/adapters/collection.ts @@ -1,11 +1,15 @@ import { + type AccessGate, + type AccountCollection as SdkAccountCollection, type CreateAlbumRequestBody, type CreatePlaylistRequestBody, - full, Id, OptionalHashId, type Playlist, type PlaylistAddedTimestamp, + type SearchPlaylist, + type Track, + type SearchTrack, UpdateAlbumRequest, type UpdateAlbumRequestBody, type UpdatePlaylistRequestBody @@ -51,18 +55,14 @@ const addedTimestampToPlaylistTrackId = ({ } export const userCollectionMetadataFromSDK = ( - input: - | full.PlaylistFullWithoutTracks - | full.SearchPlaylistFull - | full.PlaylistFull - | Playlist + input: Playlist | SearchPlaylist ): UserCollectionMetadata | undefined => { try { const decodedPlaylistId = OptionalHashId.parse(input.id) const decodedOwnerId = OptionalHashId.parse( 'userId' in input && input.userId != null ? input.userId : input.user.id ) - const user = userMetadataFromSDK(input.user as unknown as full.UserFull) + const user = userMetadataFromSDK(input.user) if (!decodedPlaylistId || !decodedOwnerId || !user) { return undefined } @@ -127,10 +127,7 @@ export const userCollectionMetadataFromSDK = ( ? accessConditionsFromSDK(input.streamConditions) : null, tracks: transformAndCleanList( - ('tracks' in input ? (input.tracks ?? []) : []) as unknown as ( - | full.TrackFull - | full.SearchTrackFull - )[], + ('tracks' in input ? (input.tracks ?? []) : []) as (Track | SearchTrack)[], userTrackMetadataFromSDK ), user, @@ -152,7 +149,7 @@ export const userCollectionMetadataFromSDK = ( } export const accountCollectionFromSDK = ( - input: full.AccountCollection + input: SdkAccountCollection ): AccountCollection | undefined => { const playlistId = OptionalHashId.parse(input.id) const userId = OptionalHashId.parse(input.user.id) @@ -223,7 +220,9 @@ export const albumMetadataForCreateWithSDK = ( streamConditions: input.stream_conditions != null && isContentUSDCPurchaseGated(input.stream_conditions) - ? usdcPurchaseConditionsToSDK(input.stream_conditions) + ? (usdcPurchaseConditionsToSDK( + input.stream_conditions + ) as unknown as AccessGate) : null, isStreamGated: input.is_stream_gated ?? false, isScheduledRelease: input.is_scheduled_release ?? false, diff --git a/packages/common/src/adapters/favorite.ts b/packages/common/src/adapters/favorite.ts index 140c4b2c9c8..a7f9f3d0249 100644 --- a/packages/common/src/adapters/favorite.ts +++ b/packages/common/src/adapters/favorite.ts @@ -1,10 +1,10 @@ -import { full, OptionalHashId } from '@audius/sdk' +import { OptionalHashId, type Favorite as SdkFavorite } from '@audius/sdk' import { omit } from 'lodash' import snakecaseKeys from 'snakecase-keys' import { Favorite, FavoriteType } from '~/models/Favorite' -export const favoriteFromSDK = (input: full.Favorite): Favorite | undefined => { +export const favoriteFromSDK = (input: SdkFavorite): Favorite | undefined => { const decodedSaveItemId = typeof input.favoriteItemId === 'string' ? OptionalHashId.parse(input.favoriteItemId) @@ -22,6 +22,7 @@ export const favoriteFromSDK = (input: full.Favorite): Favorite | undefined => { ...omit(snakecaseKeys(input), ['favorite_item_id', 'favorite_type']), save_item_id: decodedSaveItemId, save_type: input.favoriteType as FavoriteType, - user_id: decodedUserId + user_id: decodedUserId, + created_at: input.createdAt } } diff --git a/packages/common/src/adapters/feed.ts b/packages/common/src/adapters/feed.ts index 90f0f1f9d54..98078c993a1 100644 --- a/packages/common/src/adapters/feed.ts +++ b/packages/common/src/adapters/feed.ts @@ -1,4 +1,4 @@ -import { full } from '@audius/sdk' +import type { UserFeedItem as SdkUserFeedItem } from '@audius/sdk' import { UserCollectionMetadata, UserTrackMetadata } from '~/models' @@ -11,7 +11,7 @@ type UserFeedItem = { } export const userFeedItemFromSDK = ( - input: full.UserFeedItem + input: SdkUserFeedItem ): UserFeedItem | undefined => { const item = input.type === 'track' diff --git a/packages/common/src/adapters/grant.ts b/packages/common/src/adapters/grant.ts index 7facebe9a7c..a660689c877 100644 --- a/packages/common/src/adapters/grant.ts +++ b/packages/common/src/adapters/grant.ts @@ -1,8 +1,8 @@ -import { full, HashId } from '@audius/sdk' +import { HashId, type Grant as SdkGrant } from '@audius/sdk' import { Grant } from '~/models/Grant' -export const grantFromSDK = (input: full.Grant): Grant => { +export const grantFromSDK = (input: SdkGrant): Grant => { return { grantee_address: input.granteeAddress, user_id: HashId.parse(input.userId) ?? null, diff --git a/packages/common/src/adapters/imageSize.ts b/packages/common/src/adapters/imageSize.ts index 45c48551279..d10d7039d1e 100644 --- a/packages/common/src/adapters/imageSize.ts +++ b/packages/common/src/adapters/imageSize.ts @@ -1,4 +1,8 @@ -import type { full } from '@audius/sdk' +import type { + CoverArt, + CoverPhoto, + ProfilePicture +} from '@audius/sdk' import { CoverArtSizesCids, @@ -9,7 +13,7 @@ import { } from '~/models/ImageSizes' export const coverPhotoSizesCIDsFromSDK = ( - input: full.CoverPhoto + input: CoverPhoto ): CoverPhotoSizesCids => { return [WidthSizes.SIZE_640, WidthSizes.SIZE_2000].reduce((out, size) => { out[size] = input[size] ?? null @@ -18,7 +22,7 @@ export const coverPhotoSizesCIDsFromSDK = ( } export const coverArtSizesCIDsFromSDK = ( - input: full.CoverArt + input: CoverArt ): CoverArtSizesCids => { return [ SquareSizes.SIZE_1000_BY_1000, @@ -31,7 +35,7 @@ export const coverArtSizesCIDsFromSDK = ( } export const profilePictureSizesCIDsFromSDK = ( - input: full.ProfilePicture + input: ProfilePicture ): ProfilePictureSizesCids => { return [ SquareSizes.SIZE_1000_BY_1000, diff --git a/packages/common/src/adapters/notification.ts b/packages/common/src/adapters/notification.ts index 3716378fd5e..e5f83d6a5ad 100644 --- a/packages/common/src/adapters/notification.ts +++ b/packages/common/src/adapters/notification.ts @@ -1,4 +1,15 @@ -import { full, HashId, OptionalHashId } from '@audius/sdk' +import { + HashId, + OptionalHashId, + type Notification as SdkNotification, + RepostNotificationActionDataTypeEnum, + RepostOfRepostNotificationActionDataTypeEnum, + SaveNotificationActionDataTypeEnum, + SaveOfRepostNotificationActionDataTypeEnum, + instanceOfCreatePlaylistNotificationActionData, + instanceOfPlaylistMilestoneNotificationActionData, + instanceOfTrackMilestoneNotificationActionData +} from '@audius/sdk' import dayjs from 'dayjs' import { BadgeTier, type ID } from '~/models' @@ -26,7 +37,7 @@ const getTimeAgo = (date: number) => { return 'A few moments ago' } -function formatBaseNotification(notification: full.Notification) { +function formatBaseNotification(notification: SdkNotification) { const timestamp = notification.actions[0].timestamp return { groupId: notification.groupId, @@ -39,11 +50,10 @@ function formatBaseNotification(notification: full.Notification) { const toEntityType = ( type: - | full.SaveOfRepostNotificationActionDataTypeEnum - | full.SaveNotificationActionDataTypeEnum - | full.RepostNotificationActionDataTypeEnum - | full.RepostOfRepostNotificationActionDataTypeEnum - | full.SaveOfRepostNotificationActionDataTypeEnum + | SaveOfRepostNotificationActionDataTypeEnum + | SaveNotificationActionDataTypeEnum + | RepostNotificationActionDataTypeEnum + | RepostOfRepostNotificationActionDataTypeEnum ) => { if (type === 'track') { return Entity.Track @@ -60,7 +70,7 @@ const toEntityType = ( * and other nuanced things on a per notification basis. */ export const notificationFromSDK = ( - notification: full.Notification + notification: SdkNotification ): Notification | undefined => { switch (notification.type) { case 'follow': { @@ -200,7 +210,7 @@ export const notificationFromSDK = ( const entityIds = notification.actions .map((action) => { const data = action.data - if (full.instanceOfCreatePlaylistNotificationActionData(data)) { + if (instanceOfCreatePlaylistNotificationActionData(data)) { entityType = data.isAlbum ? Entity.Album : Entity.Playlist // Future proofing for when playlistId is fixed to be a string return HashId.parse( @@ -295,7 +305,7 @@ export const notificationFromSDK = ( } case 'milestone': { const data = notification.actions[0].data - if (full.instanceOfTrackMilestoneNotificationActionData(data)) { + if (instanceOfTrackMilestoneNotificationActionData(data)) { let achievement: Achievement if (data.type === 'track_repost_count') { achievement = Achievement.Reposts @@ -312,7 +322,7 @@ export const notificationFromSDK = ( achievement, ...formatBaseNotification(notification) } - } else if (full.instanceOfPlaylistMilestoneNotificationActionData(data)) { + } else if (instanceOfPlaylistMilestoneNotificationActionData(data)) { let achievement: Achievement if (data.type === 'playlist_repost_count') { achievement = Achievement.Reposts @@ -641,5 +651,7 @@ export const notificationFromSDK = ( ...formatBaseNotification(notification) } } + default: + return undefined } } diff --git a/packages/common/src/adapters/playlistLibrary.ts b/packages/common/src/adapters/playlistLibrary.ts index 0ba9d54bfc8..c539e90f794 100644 --- a/packages/common/src/adapters/playlistLibrary.ts +++ b/packages/common/src/adapters/playlistLibrary.ts @@ -1,4 +1,8 @@ -import { OptionalHashId, type full } from '@audius/sdk' +import { + OptionalHashId, + type PlaylistLibrary as SdkPlaylistLibrary, + type PlaylistUpdate as SdkPlaylistUpdate +} from '@audius/sdk' import { PlaylistLibrary, @@ -40,7 +44,7 @@ const playlistItemFromSDK = (input: any): PlaylistLibraryItem | null => { } export const playlistLibraryFromSDK = ( - input?: full.PlaylistLibrary + input?: SdkPlaylistLibrary ): PlaylistLibrary | undefined => { if (!input) return undefined return { @@ -49,7 +53,7 @@ export const playlistLibraryFromSDK = ( } export const playlistUpdateFromSDK = ( - input: full.PlaylistUpdate + input: SdkPlaylistUpdate ): PlaylistUpdate | undefined => { const playlist_id = OptionalHashId.parse(input.playlistId) return playlist_id diff --git a/packages/common/src/adapters/purchase.ts b/packages/common/src/adapters/purchase.ts index 1448c42a0ac..d9b1e952c9c 100644 --- a/packages/common/src/adapters/purchase.ts +++ b/packages/common/src/adapters/purchase.ts @@ -1,4 +1,4 @@ -import { full, HashId } from '@audius/sdk' +import { HashId, type Purchase } from '@audius/sdk' import { PurchaseAccess } from '~/models/PurchaseContent' import { @@ -7,7 +7,7 @@ import { } from '~/models/USDCTransactions' import { StringUSDC } from '~/models/Wallet' -export const purchaseFromSDK = (input: full.Purchase): USDCPurchaseDetails => { +export const purchaseFromSDK = (input: Purchase): USDCPurchaseDetails => { const { contentId, contentType, diff --git a/packages/common/src/adapters/remix.ts b/packages/common/src/adapters/remix.ts index a28f9db3ea5..cf23494a224 100644 --- a/packages/common/src/adapters/remix.ts +++ b/packages/common/src/adapters/remix.ts @@ -1,11 +1,11 @@ -import { full, OptionalHashId } from '@audius/sdk' +import { OptionalHashId, type Remix as SdkRemix } from '@audius/sdk' import snakecaseKeys from 'snakecase-keys' import { Remix } from '~/models/Track' import { userMetadataFromSDK } from './user' -export const remixFromSDK = (input: full.FullRemix): Remix | undefined => { +export const remixFromSDK = (input: SdkRemix): Remix | undefined => { const decodedTrackId = OptionalHashId.parse(input.parentTrackId) const user = userMetadataFromSDK(input.user) if (!decodedTrackId || !user) { diff --git a/packages/common/src/adapters/repost.ts b/packages/common/src/adapters/repost.ts index cfba34b1139..8df8a21d77e 100644 --- a/packages/common/src/adapters/repost.ts +++ b/packages/common/src/adapters/repost.ts @@ -1,9 +1,9 @@ -import { full, OptionalHashId } from '@audius/sdk' +import { OptionalHashId, type Repost as SdkRepost } from '@audius/sdk' import snakecaseKeys from 'snakecase-keys' import { Repost } from '~/models/Repost' -export const repostFromSDK = (input: full.Repost): Repost | undefined => { +export const repostFromSDK = (input: SdkRepost): Repost | undefined => { const decodedRepostItemId = OptionalHashId.parse(input.repostItemId) const decodedUserId = OptionalHashId.parse(input.userId) if (!decodedRepostItemId || !decodedUserId) { diff --git a/packages/common/src/adapters/search.ts b/packages/common/src/adapters/search.ts index b6aa91b5950..6b79db45996 100644 --- a/packages/common/src/adapters/search.ts +++ b/packages/common/src/adapters/search.ts @@ -1,4 +1,4 @@ -import { full } from '@audius/sdk' +import type { SearchModel } from '@audius/sdk' import { type QueryClient } from '@tanstack/react-query' import { primeCollectionData } from '~/api/tan-query/utils/primeCollectionData' @@ -27,7 +27,7 @@ export type SearchResults = { } export const searchResultsFromSDK = ( - input?: full.SearchModel, + input?: SearchModel, queryClient?: QueryClient ): SearchResults => { if (!input) { diff --git a/packages/common/src/adapters/track.ts b/packages/common/src/adapters/track.ts index 30833e1d7bb..9100427edc5 100644 --- a/packages/common/src/adapters/track.ts +++ b/packages/common/src/adapters/track.ts @@ -1,9 +1,12 @@ import { - type full, type CrossPlatformFile, Genre, Mood, type NativeFile, + type Track, + type TrackSegment as SdkTrackSegment, + type SearchTrack, + type Stem, type UpdateTrackRequestBody, HashId, Id, @@ -59,14 +62,14 @@ function toSdkMood( export const trackSegmentFromSDK = ({ duration, multihash -}: full.TrackSegment): TrackSegment => ({ +}: SdkTrackSegment): TrackSegment => ({ // Client code expects duration as a string duration: `${duration}`, multihash }) export const userTrackMetadataFromSDK = ( - input: full.TrackFull | full.SearchTrackFull + input: Track | SearchTrack ): UserTrackMetadata | undefined => { const decodedTrackId = OptionalHashId.parse(input.id) const decodedOwnerId = OptionalHashId.parse(input.userId) @@ -193,7 +196,7 @@ export const userTrackMetadataFromSDK = ( } export const stemTrackMetadataFromSDK = ( - input: full.StemFull + input: Stem ): StemTrackMetadata | undefined => { const [id, parentId, ownerId] = [input.id, input.parentId, input.userId].map( (id) => HashId.parse(id) diff --git a/packages/common/src/adapters/trending.ts b/packages/common/src/adapters/trending.ts index 992c4f30c2e..1381a1e830d 100644 --- a/packages/common/src/adapters/trending.ts +++ b/packages/common/src/adapters/trending.ts @@ -1,4 +1,4 @@ -import { full, HashId } from '@audius/sdk' +import { HashId, type TrendingTimesIds } from '@audius/sdk' import { removeNullable } from '~/utils' @@ -6,7 +6,7 @@ const makeIdList = (input: { id: string }[]) => { return input.map(({ id }) => HashId.parse(id)).filter(removeNullable) } -export const trendingIdsFromSDK = (input: full.TrendingTimesIds) => { +export const trendingIdsFromSDK = (input: TrendingTimesIds) => { return { week: makeIdList(input.week ?? []), month: makeIdList(input.month ?? []), diff --git a/packages/common/src/adapters/user.ts b/packages/common/src/adapters/user.ts index 502c1ef9ed7..4e353d01b63 100644 --- a/packages/common/src/adapters/user.ts +++ b/packages/common/src/adapters/user.ts @@ -1,7 +1,10 @@ import { HashId, OptionalHashId, - type full, + type User, + type UserManager, + type ManagedUser, + type Account, type UserPlaylistLibrary, Id, type UpdateUserRequestBody @@ -30,9 +33,9 @@ import { import { playlistLibraryFromSDK } from './playlistLibrary' import { transformAndCleanList } from './utils' -/** Converts a SDK `full.UserFull` response to a UserMetadata. Note: Will _not_ include the "current user" fields as those aren't returned by the Users API */ +/** Converts a SDK User response to a UserMetadata. Note: Will _not_ include the "current user" fields as those aren't returned by the Users API */ export const userMetadataFromSDK = ( - input: full.UserFull + input: User ): UserMetadata | undefined => { const decodedUserId = OptionalHashId.parse(input.id) if (!decodedUserId) { @@ -76,12 +79,17 @@ export const userMetadataFromSDK = ( } : {}, profile_picture: input.profilePicture - ? { - '150x150': input.profilePicture._150x150, - '480x480': input.profilePicture._480x480, - '1000x1000': input.profilePicture._1000x1000, - mirrors: input.profilePicture.mirrors - } + ? (() => { + const pic = input.profilePicture! + const mirrors = + 'mirrors' in pic && Array.isArray(pic.mirrors) ? pic.mirrors : undefined + return { + '150x150': pic._150x150, + '480x480': pic._480x480, + '1000x1000': pic._1000x1000, + ...(mirrors != null && { mirrors }) + } + })() : {}, // Required Nullable fields bio: input.bio ?? null, @@ -108,11 +116,11 @@ export const userMetadataFromSDK = ( return newUser } -export const userMetadataListFromSDK = (input?: full.UserFull[]) => +export const userMetadataListFromSDK = (input?: User[]) => input ? input.map((d) => userMetadataFromSDK(d)).filter(removeNullable) : [] export const managedUserFromSDK = ( - input: full.ManagedUser + input: ManagedUser ): ManagedUserMetadata | undefined => { const user = userMetadataFromSDK(input.user) if (!user) { @@ -124,11 +132,11 @@ export const managedUserFromSDK = ( } } -export const managedUserListFromSDK = (input?: full.ManagedUser[]) => +export const managedUserListFromSDK = (input?: ManagedUser[]) => input ? input.map((d) => managedUserFromSDK(d)).filter(removeNullable) : [] export const userManagerFromSDK = ( - input: full.UserManager + input: UserManager ): UserManagerMetadata | undefined => { const manager = userMetadataFromSDK(input.manager) if (!manager) { @@ -140,11 +148,11 @@ export const userManagerFromSDK = ( } } -export const userManagerListFromSDK = (input?: full.UserManager[]) => +export const userManagerListFromSDK = (input?: UserManager[]) => input ? input.map((d) => userManagerFromSDK(d)).filter(removeNullable) : [] export const accountFromSDK = ( - input: full.AccountFull + input: Account ): AccountUserMetadata | undefined => { const user = userMetadataFromSDK(input.user) if (!user) { diff --git a/packages/common/src/api/tan-query/batchers/__tests__/getCollectionsBatcher.test.ts b/packages/common/src/api/tan-query/batchers/__tests__/getCollectionsBatcher.test.ts index d74ccc5bc64..c6d1ea1e19f 100644 --- a/packages/common/src/api/tan-query/batchers/__tests__/getCollectionsBatcher.test.ts +++ b/packages/common/src/api/tan-query/batchers/__tests__/getCollectionsBatcher.test.ts @@ -1,5 +1,5 @@ import { - full, + type Playlist, GetBulkPlaylistsRequest, HashId, Id, @@ -15,7 +15,7 @@ import { getCollectionsBatcher } from '../getCollectionsBatcher' import type { BatchContext } from '../types' describe('getCollectionsBatcher', () => { - const createMockSdkCollection = (id: number): full.PlaylistFull => ({ + const createMockSdkCollection = (id: number): Playlist => ({ id: Id.parse(id), userId: Id.parse(1), playlistName: `Test Collection ${id}`, @@ -72,8 +72,7 @@ describe('getCollectionsBatcher', () => { profilePicture: { _150x150: '', _480x480: '', - _1000x1000: '', - mirrors: [] + _1000x1000: '' }, repostCount: 0, trackCount: 0, @@ -107,24 +106,22 @@ describe('getCollectionsBatcher', () => { allowAiAttribution: false, supporterCount: 0, supportingCount: 0, - artistCoinBadge: undefined, - splUsdcWallet: undefined, + artistCoinBadge: {}, + splUsdcWallet: '', hasCollectibles: false } }) const mockSdk = { - full: { - playlists: { - getBulkPlaylists: vi - .fn() + playlists: { + getBulkPlaylists: vi + .fn() .mockImplementation((params: GetBulkPlaylistsRequest) => { const collections = params.id?.map((collectionId) => createMockSdkCollection(HashId.parse(collectionId)) ) return Promise.resolve({ data: collections }) }) - } } } as unknown as BatchContext['sdk'] @@ -144,7 +141,7 @@ describe('getCollectionsBatcher', () => { const id = 1 const result = await batcher.fetch(id) - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenCalledWith({ + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenCalledWith({ id: [Id.parse(id)], userId: OptionalId.parse(null) }) @@ -165,8 +162,8 @@ describe('getCollectionsBatcher', () => { const results = await Promise.all(ids.map((id) => batcher.fetch(id))) // Verify single bulk request was made - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenCalledTimes(1) - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenCalledWith({ + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenCalledTimes(1) + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenCalledWith({ id: ids.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) @@ -202,12 +199,12 @@ describe('getCollectionsBatcher', () => { ) // Verify two separate bulk requests were made - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenCalledTimes(2) - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenNthCalledWith(1, { + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenCalledTimes(2) + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenNthCalledWith(1, { id: firstBatchIds.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenNthCalledWith(2, { + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenNthCalledWith(2, { id: secondBatchIds.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) @@ -244,10 +241,10 @@ describe('getCollectionsBatcher', () => { const missingId = 999 // Mock API to only return data for existingId - const mockBulkPlaylists = mockSdk.full.playlists + const mockBulkPlaylists = mockSdk.playlists .getBulkPlaylists as unknown as MockInstance< [GetBulkPlaylistsRequest], - Promise<{ data: full.PlaylistFull[] }> + Promise<{ data: Playlist[] }> > mockBulkPlaylists.mockImplementationOnce( (params: GetBulkPlaylistsRequest) => { @@ -278,8 +275,8 @@ describe('getCollectionsBatcher', () => { expect(missingResult).toBeNull() // Verify single batch request was made with both IDs - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenCalledTimes(1) - expect(mockSdk.full.playlists.getBulkPlaylists).toHaveBeenCalledWith({ + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenCalledTimes(1) + expect(mockSdk.playlists.getBulkPlaylists).toHaveBeenCalledWith({ id: [missingId, existingId].map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) diff --git a/packages/common/src/api/tan-query/batchers/__tests__/getTracksBatcher.test.ts b/packages/common/src/api/tan-query/batchers/__tests__/getTracksBatcher.test.ts index c72ff26aeba..6e1d7b14da1 100644 --- a/packages/common/src/api/tan-query/batchers/__tests__/getTracksBatcher.test.ts +++ b/packages/common/src/api/tan-query/batchers/__tests__/getTracksBatcher.test.ts @@ -1,4 +1,10 @@ -import { full, GetBulkTracksRequest, HashId, Id, OptionalId } from '@audius/sdk' +import { + type Track, + GetBulkTracksRequest, + HashId, + Id, + OptionalId +} from '@audius/sdk' import { QueryClient } from '@tanstack/react-query' import { omit } from 'lodash' import { describe, it, expect, beforeEach, vi, MockInstance } from 'vitest' @@ -9,7 +15,7 @@ import { getTracksBatcher } from '../getTracksBatcher' import type { BatchContext } from '../types' describe('getTracksBatcher', () => { - const createMockSdkTrack = (id: number): full.TrackFull => ({ + const createMockSdkTrack = (id: number): Track => ({ id: Id.parse(id), title: `Test Track ${id}`, userId: Id.parse(1), @@ -21,10 +27,9 @@ describe('getTracksBatcher', () => { artwork: { _150x150: '', _480x480: '', - _1000x1000: '', - mirrors: [] + _1000x1000: '' }, - releaseDate: '', + releaseDate: new Date(), isrc: undefined, iswc: undefined, license: '', @@ -88,8 +93,7 @@ describe('getTracksBatcher', () => { bio: '', coverPhoto: { _640x: '', - _2000x: '', - mirrors: [] + _2000x: '' }, followeeCount: 0, followerCount: 0, @@ -109,8 +113,7 @@ describe('getTracksBatcher', () => { profilePicture: { _150x150: '', _480x480: '', - _1000x1000: '', - mirrors: [] + _1000x1000: '' }, repostCount: 0, trackCount: 0, @@ -141,7 +144,12 @@ describe('getTracksBatcher', () => { profilePictureCids: undefined, profilePictureLegacy: undefined, playlistLibrary: undefined, - allowAiAttribution: false + allowAiAttribution: false, + artistCoinBadge: {}, + splUsdcWallet: '', + supporterCount: 0, + supportingCount: 0, + hasCollectibles: false }, origFileCid: undefined, origFilename: undefined, @@ -157,17 +165,15 @@ describe('getTracksBatcher', () => { }) const mockSdk = { - full: { - tracks: { - getBulkTracks: vi - .fn() - .mockImplementation((params: GetBulkTracksRequest) => { - const tracks = params.id?.map((trackId) => - createMockSdkTrack(HashId.parse(trackId)) - ) - return Promise.resolve({ data: tracks }) - }) - } + tracks: { + getBulkTracks: vi + .fn() + .mockImplementation((params: GetBulkTracksRequest) => { + const tracks = params.id?.map((trackId) => + createMockSdkTrack(HashId.parse(trackId)) + ) + return Promise.resolve({ data: tracks }) + }) } } as unknown as BatchContext['sdk'] @@ -187,7 +193,7 @@ describe('getTracksBatcher', () => { const id = 1 const result = await batcher.fetch(id) - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenCalledWith({ + expect(mockSdk.tracks.getBulkTracks).toHaveBeenCalledWith({ id: [Id.parse(id)], userId: OptionalId.parse(null) }) @@ -204,8 +210,8 @@ describe('getTracksBatcher', () => { const results = await Promise.all(ids.map((id) => batcher.fetch(id))) // Verify single bulk request was made - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenCalledTimes(1) - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenCalledWith({ + expect(mockSdk.tracks.getBulkTracks).toHaveBeenCalledTimes(1) + expect(mockSdk.tracks.getBulkTracks).toHaveBeenCalledWith({ id: ids.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) @@ -237,12 +243,12 @@ describe('getTracksBatcher', () => { ) // Verify two separate bulk requests were made - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenCalledTimes(2) - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenNthCalledWith(1, { + expect(mockSdk.tracks.getBulkTracks).toHaveBeenCalledTimes(2) + expect(mockSdk.tracks.getBulkTracks).toHaveBeenNthCalledWith(1, { id: firstBatchIds.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenNthCalledWith(2, { + expect(mockSdk.tracks.getBulkTracks).toHaveBeenNthCalledWith(2, { id: secondBatchIds.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) @@ -273,10 +279,10 @@ describe('getTracksBatcher', () => { const missingId = 999 // Mock API to only return data for existingId - const mockBulkTracks = mockSdk.full.tracks + const mockBulkTracks = mockSdk.tracks .getBulkTracks as unknown as MockInstance< [GetBulkTracksRequest], - Promise<{ data: full.TrackFull[] }> + Promise<{ data: Track[] }> > mockBulkTracks.mockImplementationOnce((params: GetBulkTracksRequest) => { const tracks = @@ -301,8 +307,8 @@ describe('getTracksBatcher', () => { expect(missingResult).toBeNull() // Verify single batch request was made with both IDs - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenCalledTimes(1) - expect(mockSdk.full.tracks.getBulkTracks).toHaveBeenCalledWith({ + expect(mockSdk.tracks.getBulkTracks).toHaveBeenCalledTimes(1) + expect(mockSdk.tracks.getBulkTracks).toHaveBeenCalledWith({ id: [missingId, existingId].map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) diff --git a/packages/common/src/api/tan-query/batchers/__tests__/getUsersBatcher.test.ts b/packages/common/src/api/tan-query/batchers/__tests__/getUsersBatcher.test.ts index d6852521e84..4a123e567a5 100644 --- a/packages/common/src/api/tan-query/batchers/__tests__/getUsersBatcher.test.ts +++ b/packages/common/src/api/tan-query/batchers/__tests__/getUsersBatcher.test.ts @@ -1,4 +1,10 @@ -import { full, GetBulkUsersRequest, HashId, Id, OptionalId } from '@audius/sdk' +import { + type User, + GetBulkUsersRequest, + HashId, + Id, + OptionalId +} from '@audius/sdk' import { QueryClient } from '@tanstack/react-query' import { describe, it, expect, beforeEach, vi, MockInstance } from 'vitest' @@ -8,7 +14,7 @@ import { getUsersBatcher } from '../getUsersBatcher' import type { BatchContext } from '../types' describe('getUsersBatcher', () => { - const createMockSdkUser = (id: number): full.UserFull => ({ + const createMockSdkUser = (id: number): User => ({ id: Id.parse(id), handle: `test-user-${id}`, name: `Test User ${id}`, @@ -57,13 +63,17 @@ describe('getUsersBatcher', () => { blocknumber: 0, isStorageV2: false, doesCurrentUserSubscribe: false, - allowAiAttribution: false + allowAiAttribution: false, + artistCoinBadge: {}, + splUsdcWallet: '', + supporterCount: 0, + supportingCount: 0, + hasCollectibles: false }) const mockSdk = { - full: { - users: { - getBulkUsers: vi + users: { + getBulkUsers: vi .fn() .mockImplementation((params: GetBulkUsersRequest) => { const users = params.id?.map((userId) => @@ -71,7 +81,6 @@ describe('getUsersBatcher', () => { ) return Promise.resolve({ data: users }) }) - } } } as unknown as BatchContext['sdk'] @@ -91,7 +100,7 @@ describe('getUsersBatcher', () => { const id = 1 const result = await batcher.fetch(id) - expect(mockSdk.full.users.getBulkUsers).toHaveBeenCalledWith({ + expect(mockSdk.users.getBulkUsers).toHaveBeenCalledWith({ id: [Id.parse(id)], userId: OptionalId.parse(null) }) @@ -108,8 +117,8 @@ describe('getUsersBatcher', () => { const results = await Promise.all(ids.map((id) => batcher.fetch(id))) // Verify single bulk request was made - expect(mockSdk.full.users.getBulkUsers).toHaveBeenCalledTimes(1) - expect(mockSdk.full.users.getBulkUsers).toHaveBeenCalledWith({ + expect(mockSdk.users.getBulkUsers).toHaveBeenCalledTimes(1) + expect(mockSdk.users.getBulkUsers).toHaveBeenCalledWith({ id: ids.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) @@ -141,12 +150,12 @@ describe('getUsersBatcher', () => { ) // Verify two separate bulk requests were made - expect(mockSdk.full.users.getBulkUsers).toHaveBeenCalledTimes(2) - expect(mockSdk.full.users.getBulkUsers).toHaveBeenNthCalledWith(1, { + expect(mockSdk.users.getBulkUsers).toHaveBeenCalledTimes(2) + expect(mockSdk.users.getBulkUsers).toHaveBeenNthCalledWith(1, { id: firstBatchIds.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) - expect(mockSdk.full.users.getBulkUsers).toHaveBeenNthCalledWith(2, { + expect(mockSdk.users.getBulkUsers).toHaveBeenNthCalledWith(2, { id: secondBatchIds.map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) @@ -171,10 +180,10 @@ describe('getUsersBatcher', () => { const missingId = 999 // Mock API to only return data for existingId - const mockBulkUsers = mockSdk.full.users + const mockBulkUsers = mockSdk.users .getBulkUsers as unknown as MockInstance< [GetBulkUsersRequest], - Promise<{ data: full.UserFull[] }> + Promise<{ data: User[] }> > mockBulkUsers.mockImplementationOnce((params: GetBulkUsersRequest) => { const users = @@ -199,8 +208,8 @@ describe('getUsersBatcher', () => { expect(missingResult).toBeNull() // Verify single batch request was made with both IDs - expect(mockSdk.full.users.getBulkUsers).toHaveBeenCalledTimes(1) - expect(mockSdk.full.users.getBulkUsers).toHaveBeenCalledWith({ + expect(mockSdk.users.getBulkUsers).toHaveBeenCalledTimes(1) + expect(mockSdk.users.getBulkUsers).toHaveBeenCalledWith({ id: [missingId, existingId].map((id) => Id.parse(id)), userId: OptionalId.parse(null) }) diff --git a/packages/common/src/api/tan-query/batchers/getCollectionsBatcher.ts b/packages/common/src/api/tan-query/batchers/getCollectionsBatcher.ts index 1b29725ad22..106851d8e67 100644 --- a/packages/common/src/api/tan-query/batchers/getCollectionsBatcher.ts +++ b/packages/common/src/api/tan-query/batchers/getCollectionsBatcher.ts @@ -19,7 +19,7 @@ export const getCollectionsBatcher = memoize( const { sdk, currentUserId, queryClient } = context if (!ids.length) return [] - const { data } = await sdk.full.playlists.getBulkPlaylists({ + const { data } = await sdk.playlists.getBulkPlaylists({ id: ids.map((id) => Id.parse(id)), userId: OptionalId.parse(currentUserId) }) diff --git a/packages/common/src/api/tan-query/batchers/getTracksBatcher.ts b/packages/common/src/api/tan-query/batchers/getTracksBatcher.ts index 0b2976c2a78..b5dc80ef771 100644 --- a/packages/common/src/api/tan-query/batchers/getTracksBatcher.ts +++ b/packages/common/src/api/tan-query/batchers/getTracksBatcher.ts @@ -19,7 +19,7 @@ export const getTracksBatcher = memoize( const { sdk, currentUserId, queryClient } = context if (!ids.length) return [] - const { data } = await sdk.full.tracks.getBulkTracks({ + const { data } = await sdk.tracks.getBulkTracks({ id: ids.map((id) => Id.parse(id)), userId: OptionalId.parse(currentUserId) }) diff --git a/packages/common/src/api/tan-query/batchers/getUsersBatcher.ts b/packages/common/src/api/tan-query/batchers/getUsersBatcher.ts index 08116053333..e6b0ca1ae18 100644 --- a/packages/common/src/api/tan-query/batchers/getUsersBatcher.ts +++ b/packages/common/src/api/tan-query/batchers/getUsersBatcher.ts @@ -17,7 +17,7 @@ export const getUsersBatcher = memoize( fetcher: async (ids: ID[]): Promise => { const { sdk, currentUserId } = context if (!ids.length) return [] - const { data } = await sdk.full.users.getBulkUsers({ + const { data } = await sdk.users.getBulkUsers({ id: ids.map((id) => Id.parse(id)), userId: OptionalId.parse(currentUserId) }) diff --git a/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts b/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts index 918f13751f1..169513d7b05 100644 --- a/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts +++ b/packages/common/src/api/tan-query/collection/useCollectionByPermalink.ts @@ -43,7 +43,7 @@ export const getCollectionByPermalinkQueryFn = async ( sdk: any ) => { const { handle, slug } = playlistPermalinkToHandleAndSlug(permalink) - const { data = [] } = await sdk.full.playlists.getPlaylistByHandleAndSlug({ + const { data = [] } = await sdk.playlists.getPlaylistByHandleAndSlug({ handle, slug, userId: OptionalId.parse(currentUserId) diff --git a/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts b/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts index 757dc333bbf..d70aa53f821 100644 --- a/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts +++ b/packages/common/src/api/tan-query/collection/useCollectionFavorites.ts @@ -46,7 +46,7 @@ export const useCollectionFavorites = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.playlists.getUsersFromPlaylistFavorites({ + const { data } = await sdk.playlists.getUsersFromPlaylistFavorites({ playlistId: Id.parse(collectionId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/collection/useCollectionReposts.ts b/packages/common/src/api/tan-query/collection/useCollectionReposts.ts index 44298b5e13a..eb868f89d83 100644 --- a/packages/common/src/api/tan-query/collection/useCollectionReposts.ts +++ b/packages/common/src/api/tan-query/collection/useCollectionReposts.ts @@ -46,7 +46,7 @@ export const useCollectionReposts = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.playlists.getUsersFromPlaylistReposts({ + const { data } = await sdk.playlists.getUsersFromPlaylistReposts({ playlistId: Id.parse(collectionId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/collection/useLibraryCollections.ts b/packages/common/src/api/tan-query/collection/useLibraryCollections.ts index c632977bba6..9faa66b3e3f 100644 --- a/packages/common/src/api/tan-query/collection/useLibraryCollections.ts +++ b/packages/common/src/api/tan-query/collection/useLibraryCollections.ts @@ -1,4 +1,9 @@ -import { full, Id } from '@audius/sdk' +import { + Id, + type GetUserLibraryAlbumsSortDirectionEnum, + type GetUserLibraryAlbumsSortMethodEnum, + type GetUserLibraryAlbumsTypeEnum +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -20,10 +25,10 @@ const PAGE_SIZE = 20 type UseLibraryCollectionsArgs = { collectionType: CollectionType - category?: full.GetUserLibraryAlbumsTypeEnum + category?: GetUserLibraryAlbumsTypeEnum query?: string - sortMethod?: full.GetUserLibraryAlbumsSortMethodEnum - sortDirection?: full.GetUserLibraryAlbumsSortDirectionEnum + sortMethod?: GetUserLibraryAlbumsSortMethodEnum + sortDirection?: GetUserLibraryAlbumsSortDirectionEnum pageSize?: number } @@ -94,8 +99,8 @@ export const useLibraryCollections = ( const { data: activities = [] } = collectionType === 'albums' - ? await sdk.full.users.getUserLibraryAlbums(requestParams) - : await sdk.full.users.getUserLibraryPlaylists(requestParams) + ? await sdk.users.getUserLibraryAlbums(requestParams) + : await sdk.users.getUserLibraryPlaylists(requestParams) const collections = transformAndCleanList(activities, ({ item }) => userCollectionMetadataFromSDK(item) diff --git a/packages/common/src/api/tan-query/comments/useComment.ts b/packages/common/src/api/tan-query/comments/useComment.ts index 751d3446213..2f6a17018cc 100644 --- a/packages/common/src/api/tan-query/comments/useComment.ts +++ b/packages/common/src/api/tan-query/comments/useComment.ts @@ -21,7 +21,7 @@ export const useComment = (commentId: ID | null | undefined) => { enabled: !!commentId, queryFn: async () => { const sdk = await audiusSdk() - const { data: commentRes } = await sdk.full.comments.getComment({ + const { data: commentRes } = await sdk.comments.getComment({ commentId: Id.parse(commentId) }) diff --git a/packages/common/src/api/tan-query/comments/useCommentReplies.ts b/packages/common/src/api/tan-query/comments/useCommentReplies.ts index 4d9e4265e30..509facc7af8 100644 --- a/packages/common/src/api/tan-query/comments/useCommentReplies.ts +++ b/packages/common/src/api/tan-query/comments/useCommentReplies.ts @@ -42,7 +42,7 @@ export const useCommentReplies = ( }, queryFn: async ({ pageParam }): Promise => { const sdk = await audiusSdk() - const response = await sdk.full.comments.getCommentReplies({ + const response = await sdk.comments.getCommentReplies({ commentId: Id.parse(commentId), userId: currentUserId?.toString(), limit: pageSize, diff --git a/packages/common/src/api/tan-query/comments/useTrackComments.ts b/packages/common/src/api/tan-query/comments/useTrackComments.ts index 0e3d3f65cd2..aa91c56d2c5 100644 --- a/packages/common/src/api/tan-query/comments/useTrackComments.ts +++ b/packages/common/src/api/tan-query/comments/useTrackComments.ts @@ -51,7 +51,7 @@ export const useTrackComments = ( queryKey: getTrackCommentListQueryKey({ trackId, sortMethod, pageSize }), queryFn: async ({ pageParam }): Promise => { const sdk = await audiusSdk() - const commentsRes = await sdk.full.tracks.getTrackComments({ + const commentsRes = await sdk.tracks.getTrackComments({ trackId: Id.parse(trackId), offset: pageParam, limit: pageSize, diff --git a/packages/common/src/api/tan-query/comments/useUserComments.ts b/packages/common/src/api/tan-query/comments/useUserComments.ts index 445f97395fa..3b4f5652936 100644 --- a/packages/common/src/api/tan-query/comments/useUserComments.ts +++ b/packages/common/src/api/tan-query/comments/useUserComments.ts @@ -46,7 +46,7 @@ export const useUserComments = ( queryKey: ['userCommentList', userId, pageSize], queryFn: async ({ pageParam }): Promise => { const sdk = await audiusSdk() - const commentsRes = await sdk.full.users.getUserComments({ + const commentsRes = await sdk.users.getUserComments({ id: Id.parse(userId), userId: OptionalId.parse(currentUserId), offset: pageParam, diff --git a/packages/common/src/api/tan-query/lineups/useExclusiveTracks.ts b/packages/common/src/api/tan-query/lineups/useExclusiveTracks.ts index e2b772c4ed1..01886d683dd 100644 --- a/packages/common/src/api/tan-query/lineups/useExclusiveTracks.ts +++ b/packages/common/src/api/tan-query/lineups/useExclusiveTracks.ts @@ -72,7 +72,7 @@ export const useExclusiveTracks = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data: tracks = [] } = await sdk.full.users.getTracksByUser({ + const { data: tracks = [] } = await sdk.users.getTracksByUser({ id: OptionalId.parse(userId)!, userId: OptionalId.parse(currentUserId), gateCondition: gateConditions as any, @@ -136,7 +136,7 @@ export const useExclusiveTracksCount = (args: { queryKey: [QUERY_KEYS.exclusiveTracksCount, userId, { gateConditions }], queryFn: async () => { const sdk = await audiusSdk() - const { data: count } = await sdk.full.users.getTracksCountByUser({ + const { data: count } = await sdk.users.getTracksCountByUser({ id: OptionalId.parse(userId)!, userId: OptionalId.parse(currentUserId), gateCondition: gateConditions as any diff --git a/packages/common/src/api/tan-query/lineups/useFeed.ts b/packages/common/src/api/tan-query/lineups/useFeed.ts index c5aca3ba530..a18e1be1d77 100644 --- a/packages/common/src/api/tan-query/lineups/useFeed.ts +++ b/packages/common/src/api/tan-query/lineups/useFeed.ts @@ -1,4 +1,4 @@ -import { EntityType, Id, full } from '@audius/sdk' +import { EntityType, Id, type GetUserFeedFilterEnum } from '@audius/sdk' import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' @@ -22,7 +22,7 @@ import { primeTrackData } from '../utils/primeTrackData' import { useLineupQuery } from './useLineupQuery' -const filterMap: { [k in FeedFilter]: full.GetUserFeedFilterEnum } = { +const filterMap: { [k in FeedFilter]: GetUserFeedFilterEnum } = { [FeedFilter.ALL]: 'all', [FeedFilter.ORIGINAL]: 'original', [FeedFilter.REPOST]: 'repost' @@ -70,7 +70,7 @@ export const useFeed = ( const isFirstPage = pageParam === 0 const currentPageSize = isFirstPage ? initialPageSize : loadMorePageSize const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getUserFeed({ + const { data = [] } = await sdk.users.getUserFeed({ id: Id.parse(currentUserId), userId: Id.parse(currentUserId), filter: filterMap[filter], diff --git a/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts b/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts index 883a2c6b6e2..2c9e4667eca 100644 --- a/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts +++ b/packages/common/src/api/tan-query/lineups/useLibraryTracks.ts @@ -2,7 +2,7 @@ import { Id, EntityType } from '@audius/sdk' import { GetUserLibraryTracksSortMethodEnum, GetUserLibraryTracksSortDirectionEnum -} from '@audius/sdk/src/sdk/api/generated/full/apis/UsersApi' +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -86,7 +86,7 @@ export const useLibraryTracks = ( queryFn: async ({ pageParam = 0 }) => { if (!currentUserId) return [] const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getUserLibraryTracks({ + const response = await sdk.users.getUserLibraryTracks({ id: Id.parse(currentUserId), offset: pageParam, limit: pageSize, @@ -96,6 +96,7 @@ export const useLibraryTracks = ( query }) + const data = response.data ?? [] const tracks = data .map((activity) => userTrackMetadataFromSDK(activity.item)) .filter(removeNullable) diff --git a/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts b/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts index 1151ad66eeb..1bb5dcac42c 100644 --- a/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts +++ b/packages/common/src/api/tan-query/lineups/usePremiumTracks.ts @@ -53,7 +53,7 @@ export const usePremiumTracks = ( queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() const { data: tracks = [] } = - await sdk.full.tracks.getTrendingUSDCPurchaseTracks({ + await sdk.tracks.getTrendingUSDCPurchaseTracks({ userId: OptionalId.parse(currentUserId), limit: pageSize, offset: pageParam diff --git a/packages/common/src/api/tan-query/lineups/useProfileReposts.ts b/packages/common/src/api/tan-query/lineups/useProfileReposts.ts index 219ab5d9bf6..7260b553198 100644 --- a/packages/common/src/api/tan-query/lineups/useProfileReposts.ts +++ b/packages/common/src/api/tan-query/lineups/useProfileReposts.ts @@ -60,7 +60,7 @@ export const useProfileReposts = ( // If the @ is still at the beginning of the handle, trim it off const handleNoAt = handle.startsWith('@') ? handle.substring(1) : handle - const { data: repostsSDKData } = await sdk.full.users.getRepostsByHandle({ + const { data: repostsSDKData } = await sdk.users.getRepostsByHandle({ handle: handleNoAt, userId: OptionalId.parse(currentUserId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/lineups/useProfileTracks.ts b/packages/common/src/api/tan-query/lineups/useProfileTracks.ts index d9fe2833677..2d82ed6d7b9 100644 --- a/packages/common/src/api/tan-query/lineups/useProfileTracks.ts +++ b/packages/common/src/api/tan-query/lineups/useProfileTracks.ts @@ -69,7 +69,7 @@ export const useProfileTracks = ( if (!handle) return [] // If the @ is still at the beginning of the handle, trim it off const handleNoAt = handle.startsWith('@') ? handle.substring(1) : handle - const { data: tracks } = await sdk.full.users.getTracksByUserHandle({ + const { data: tracks } = await sdk.users.getTracksByUserHandle({ handle: handleNoAt, userId: OptionalId.parse(currentUserId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts b/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts index 19d2b18f71e..7ce1281fca2 100644 --- a/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts +++ b/packages/common/src/api/tan-query/lineups/useTrackPageLineup.ts @@ -105,7 +105,7 @@ export const useTrackPageLineup = ( heroTrack.remix_of?.tracks?.[0]?.parent_track_id if (heroTrackRemixParentTrackId) { - const remixParentTrack = await sdk.full.tracks.getTrack({ + const remixParentTrack = await sdk.tracks.getTrack({ trackId: Id.parse(heroTrackRemixParentTrackId), userId: OptionalId.parse(currentUserId) }) @@ -119,7 +119,7 @@ export const useTrackPageLineup = ( } } else { // If hero track is remixable (not a remix), get its remixes - const { data: remixesData } = await sdk.full.tracks.getTrackRemixes({ + const remixesData = await sdk.tracks.getTrackRemixes({ trackId: Id.parse(trackId), userId: OptionalId.parse(currentUserId), limit: pageSize, @@ -140,7 +140,7 @@ export const useTrackPageLineup = ( } // Get more tracks by the artist - const { data = [] } = await sdk.full.users.getTracksByUserHandle({ + const { data = [] } = await sdk.users.getTracksByUserHandle({ handle: ownerHandle, userId: OptionalId.parse(currentUserId), sort: 'plays', @@ -168,7 +168,7 @@ export const useTrackPageLineup = ( // If there are no remixes, get recommended tracks based on genre if (indices.remixesSection.index === null) { - const { data: trendingData } = await sdk.full.tracks.getTrendingTracks({ + const { data: trendingData } = await sdk.tracks.getTrendingTracks({ genre: heroTrack.genre, limit: pageSize }) diff --git a/packages/common/src/api/tan-query/lineups/useTrending.ts b/packages/common/src/api/tan-query/lineups/useTrending.ts index 7c20ce28148..6a3c029ef3c 100644 --- a/packages/common/src/api/tan-query/lineups/useTrending.ts +++ b/packages/common/src/api/tan-query/lineups/useTrending.ts @@ -89,7 +89,7 @@ export const useTrending = ( const currentPageSize = isFirstPage ? initialPageSize : loadMorePageSize const { data: sdkResponse = [] } = version - ? await sdk.full.tracks.getTrendingTracksWithVersion({ + ? await sdk.tracks.getTrendingTracksWithVersion({ time: timeRange, genre: (genre as string) || undefined, userId: OptionalId.parse(currentUserId), @@ -97,7 +97,7 @@ export const useTrending = ( offset: pageParam, version }) - : await sdk.full.tracks.getTrendingTracks({ + : await sdk.tracks.getTrendingTracks({ time: timeRange, genre: (genre as string) || undefined, userId: OptionalId.parse(currentUserId), diff --git a/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts b/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts index ef247e08ef7..ce17bf447ce 100644 --- a/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts +++ b/packages/common/src/api/tan-query/lineups/useTrendingUnderground.ts @@ -53,7 +53,7 @@ export const useTrendingUnderground = ( queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.tracks.getUndergroundTrendingTracks({ + const { data = [] } = await sdk.tracks.getUndergroundTrendingTracks({ offset: pageParam, limit: pageSize, userId: OptionalId.parse(currentUserId) diff --git a/packages/common/src/api/tan-query/lineups/useTrendingWinners.ts b/packages/common/src/api/tan-query/lineups/useTrendingWinners.ts index 401eb3ae3c3..8004a87d8af 100644 --- a/packages/common/src/api/tan-query/lineups/useTrendingWinners.ts +++ b/packages/common/src/api/tan-query/lineups/useTrendingWinners.ts @@ -1,4 +1,3 @@ -import type { full, Track } from '@audius/sdk' import { OptionalId } from '@audius/sdk' import { useQuery, useQueryClient } from '@tanstack/react-query' @@ -27,25 +26,6 @@ export const getTrendingWinnersQueryKey = ({ type ] -/** - * Maps default API Track (from sdk.tracks) to full.TrackFull-like structure - * for userTrackMetadataFromSDK. The default Track has user but not userId. - * TODO: Remove when full is gone. - */ -const toTrackFullLike = (t: Track): full.TrackFull | null => { - // @ts-expect-error - TODO: Remove when full is gone. - const user = t.user as full.UserFull | undefined - if (!user?.id) return null - const trackWithUserId = { - ...t, - userId: user.id, - coverArtCids: - (t as { coverArtCids?: unknown }).coverArtCids ?? t.coverArtSizes, - trackSegments: Array.isArray(t.trackSegments) ? t.trackSegments : [] - } - return trackWithUserId as unknown as full.TrackFull -} - export const useTrendingWinners = ( { week, type }: UseTrendingWinnersArgs, options?: QueryOptions @@ -71,12 +51,8 @@ export const useTrendingWinners = ( const sdkResponse = response?.data ?? [] - const trackFullLike = sdkResponse - .map(toTrackFullLike) - .filter((t): t is full.TrackFull => t !== null) - const tracks = transformAndCleanList( - trackFullLike, + sdkResponse, userTrackMetadataFromSDK ) diff --git a/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts b/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts index 372e1d350f2..2d41c33f7d4 100644 --- a/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts +++ b/packages/common/src/api/tan-query/notifications/useNotificationUnreadCount.ts @@ -32,11 +32,15 @@ export const useNotificationUnreadCount = () => { queryKey: getNotificationUnreadCountQueryKey(currentUserId), queryFn: async () => { const sdk = await audiusSdk() - const { data } = await sdk.full.notifications.getNotifications({ + const response = await (sdk.notifications as { + getNotifications: (params: { userId: string; limit?: number }) => Promise<{ + data?: { unreadCount?: number } + }> + }).getNotifications({ userId: Id.parse(currentUserId), limit: 0 }) - return data?.unreadCount ?? 0 + return response?.data?.unreadCount ?? 0 }, refetchInterval: pollingFreqMs, enabled: !!currentUserId diff --git a/packages/common/src/api/tan-query/notifications/useNotifications.ts b/packages/common/src/api/tan-query/notifications/useNotifications.ts index b4aa54e9bb6..b3a0ac1187e 100644 --- a/packages/common/src/api/tan-query/notifications/useNotifications.ts +++ b/packages/common/src/api/tan-query/notifications/useNotifications.ts @@ -1,6 +1,6 @@ import { useEffect, useMemo } from 'react' -import { Id } from '@audius/sdk' +import { Id, type NotificationsResponse } from '@audius/sdk' import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query' import { usePrevious } from 'react-use' @@ -202,15 +202,23 @@ export const useNotifications = (options?: QueryOptions) => { initialPageParam: null as PageParam, queryFn: async ({ pageParam = null }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.notifications.getNotifications({ + const response = await (sdk.notifications as { + getNotifications: (params: { + userId: string + limit?: number + timestamp?: number + groupId?: string + }) => Promise + }).getNotifications({ userId: Id.parse(currentUserId), limit: DEFAULT_LIMIT, timestamp: pageParam?.timestamp, groupId: pageParam?.groupId }) + const data = response const notifications = transformAndCleanList( - data?.notifications, + data?.data?.notifications, notificationFromSDK ) as Notification[] diff --git a/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts b/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts index 68bfbbd3177..a0eabfd862d 100644 --- a/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts +++ b/packages/common/src/api/tan-query/purchases/useAudioTransactions.ts @@ -1,4 +1,8 @@ -import { full, Id } from '@audius/sdk' +import { + GetAudioTransactionsSortMethodEnum, + GetAudioTransactionsSortDirectionEnum, + Id +} from '@audius/sdk' import { useQuery } from '@tanstack/react-query' import { audioTransactionFromSdk } from '~/adapters/audioTransactions' @@ -14,8 +18,8 @@ import { useCurrentUserId } from '../users/account/useCurrentUserId' type GetAudioTransactionsArgs = { page?: number pageSize?: number - sortMethod?: full.GetAudioTransactionsSortMethodEnum - sortDirection?: full.GetAudioTransactionsSortDirectionEnum + sortMethod?: GetAudioTransactionsSortMethodEnum + sortDirection?: GetAudioTransactionsSortDirectionEnum } export const DEFAULT_AUDIO_TRANSACTIONS_BATCH_SIZE = 50 @@ -63,7 +67,7 @@ export const useAudioTransactions = ( if (!userId) return [] const sdk = await audiusSdk() - const response = await sdk.full.users.getAudioTransactions({ + const response = await sdk.users.getAudioTransactions({ id: Id.parse(userId), offset: page * pageSize, limit: pageSize, diff --git a/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts b/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts index 989e5d914fe..15ce8d82222 100644 --- a/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts +++ b/packages/common/src/api/tan-query/purchases/useAudioTransactionsCount.ts @@ -30,7 +30,7 @@ export const useAudioTransactionsCount = ( if (!userId) return 0 const sdk = await audiusSdk() - const response = await sdk.full.users.getAudioTransactionCount({ + const response = await sdk.users.getAudioTransactionCount({ id: Id.parse(userId) }) diff --git a/packages/common/src/api/tan-query/purchases/usePurchasers.ts b/packages/common/src/api/tan-query/purchases/usePurchasers.ts index 2b94a84f637..ba99e689dd0 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchasers.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchasers.ts @@ -56,7 +56,7 @@ export const usePurchasers = ( queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() if (!currentUserId) return [] - const { data = [] } = await sdk.full.users.getPurchasers({ + const { data = [] } = await sdk.users.getPurchasers({ id: Id.parse(currentUserId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts b/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts index 3a08b0c20be..9fbbb4a32d0 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchasersCount.ts @@ -37,7 +37,7 @@ export const usePurchasersCount = ( queryFn: async () => { const sdk = await audiusSdk() if (!currentUserId) return 0 - const { data = 0 } = await sdk.full.users.getPurchasersCount({ + const { data = 0 } = await sdk.users.getPurchasersCount({ id: Id.parse(currentUserId), userId: Id.parse(currentUserId), contentId: OptionalId.parse(contentId), diff --git a/packages/common/src/api/tan-query/purchases/usePurchases.ts b/packages/common/src/api/tan-query/purchases/usePurchases.ts index ea1d765e85f..065fef10ec7 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchases.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchases.ts @@ -1,6 +1,10 @@ import { useCallback, useMemo } from 'react' -import { full, Id } from '@audius/sdk' +import { + Id, + type GetPurchasesSortDirectionEnum, + type GetPurchasesSortMethodEnum +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query' import { purchaseFromSDK } from '~/adapters/purchase' @@ -22,8 +26,8 @@ const PAGE_SIZE = 10 export type GetPurchaseListArgs = { userId: ID | null | undefined - sortMethod?: full.GetPurchasesSortMethodEnum - sortDirection?: full.GetPurchasesSortDirectionEnum + sortMethod?: GetPurchasesSortMethodEnum + sortDirection?: GetPurchasesSortDirectionEnum pageSize?: number } @@ -61,7 +65,7 @@ export const usePurchases = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getPurchases({ + const { data = [] } = await sdk.users.getPurchases({ id: Id.parse(userId), userId: Id.parse(userId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts b/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts index 9fb3f864bd5..855874eb148 100644 --- a/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts +++ b/packages/common/src/api/tan-query/purchases/usePurchasesCount.ts @@ -28,7 +28,7 @@ export const usePurchasesCount = ( queryKey: getPurchasesCountQueryKey({ userId }), queryFn: async () => { const sdk = await audiusSdk() - const { data = 0 } = await sdk.full.users.getPurchasesCount({ + const { data = 0 } = await sdk.users.getPurchasesCount({ id: Id.parse(userId), userId: Id.parse(userId) }) diff --git a/packages/common/src/api/tan-query/purchases/useSales.ts b/packages/common/src/api/tan-query/purchases/useSales.ts index 485a7a922b6..605f046fef5 100644 --- a/packages/common/src/api/tan-query/purchases/useSales.ts +++ b/packages/common/src/api/tan-query/purchases/useSales.ts @@ -1,6 +1,10 @@ import { useCallback, useMemo } from 'react' -import { full, Id } from '@audius/sdk' +import { + Id, + type GetPurchasesSortDirectionEnum, + type GetPurchasesSortMethodEnum +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query' import { purchaseFromSDK } from '~/adapters/purchase' @@ -22,8 +26,8 @@ const PAGE_SIZE = 10 export type GetSalesListArgs = { userId: ID | null | undefined - sortMethod?: full.GetPurchasesSortMethodEnum - sortDirection?: full.GetPurchasesSortDirectionEnum + sortMethod?: GetPurchasesSortMethodEnum + sortDirection?: GetPurchasesSortDirectionEnum pageSize?: number } @@ -56,7 +60,7 @@ export const useSales = (args: GetSalesListArgs, options?: QueryOptions) => { }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getSales({ + const { data = [] } = await sdk.users.getSales({ id: Id.parse(userId!), userId: Id.parse(userId!), limit: pageSize, diff --git a/packages/common/src/api/tan-query/purchases/useSalesCount.ts b/packages/common/src/api/tan-query/purchases/useSalesCount.ts index 1a3e2c0f907..3396bda813b 100644 --- a/packages/common/src/api/tan-query/purchases/useSalesCount.ts +++ b/packages/common/src/api/tan-query/purchases/useSalesCount.ts @@ -22,7 +22,7 @@ export const useSalesCount = ( queryKey: getSalesCountQueryKey(userId), queryFn: async () => { const sdk = await audiusSdk() - const { data = 0 } = await sdk.full.users.getSalesCount({ + const { data = 0 } = await sdk.users.getSalesCount({ id: Id.parse(userId), userId: Id.parse(userId) }) diff --git a/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts b/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts index 4dde413cb3b..df98b20a121 100644 --- a/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts +++ b/packages/common/src/api/tan-query/purchases/useUSDCTransactions.ts @@ -1,6 +1,13 @@ import { useCallback } from 'react' -import { full, Id } from '@audius/sdk' +import { + Id, + GetUSDCTransactionsSortDirectionEnum, + GetUSDCTransactionsSortMethodEnum, + type GetUSDCTransactionsMethodEnum, + type GetUSDCTransactionsTypeEnum, + type TransactionDetails +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -20,10 +27,10 @@ const DEFAULT_PAGE_SIZE = 50 type UseUSDCTransactionsArgs = { pageSize?: number - sortMethod?: full.GetUSDCTransactionsSortMethodEnum - sortDirection?: full.GetUSDCTransactionsSortDirectionEnum - type?: full.GetUSDCTransactionsTypeEnum[] - method?: full.GetUSDCTransactionsMethodEnum + sortMethod?: GetUSDCTransactionsSortMethodEnum + sortDirection?: GetUSDCTransactionsSortDirectionEnum + type?: GetUSDCTransactionsTypeEnum[] + method?: GetUSDCTransactionsMethodEnum } export const getUSDCTransactionsQueryKey = ( @@ -32,8 +39,8 @@ export const getUSDCTransactionsQueryKey = ( ) => { const { pageSize = DEFAULT_PAGE_SIZE, - sortMethod = full.GetUSDCTransactionsSortMethodEnum.Date, - sortDirection = full.GetUSDCTransactionsSortDirectionEnum.Desc, + sortMethod = GetUSDCTransactionsSortMethodEnum.Date, + sortDirection = GetUSDCTransactionsSortDirectionEnum.Desc, type, method } = args @@ -56,7 +63,7 @@ export const getUSDCTransactionsQueryKey = ( const parseTransaction = ({ transaction }: { - transaction: full.TransactionDetails + transaction: TransactionDetails }): USDCTransactionDetails => { const { change, balance, transactionType, method, ...rest } = transaction return { @@ -71,8 +78,8 @@ const parseTransaction = ({ export const useUSDCTransactions = ( { pageSize = DEFAULT_PAGE_SIZE, - sortMethod = full.GetUSDCTransactionsSortMethodEnum.Date, - sortDirection = full.GetUSDCTransactionsSortDirectionEnum.Desc, + sortMethod = GetUSDCTransactionsSortMethodEnum.Date, + sortDirection = GetUSDCTransactionsSortDirectionEnum.Desc, type, method }: UseUSDCTransactionsArgs = {}, @@ -99,7 +106,7 @@ export const useUSDCTransactions = ( queryFn: async ({ pageParam }) => { if (!currentUserId) return [] const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getUSDCTransactions({ + const { data = [] } = await sdk.users.getUSDCTransactions({ id: Id.parse(currentUserId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts b/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts index 64d7a74d900..d2374583677 100644 --- a/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts +++ b/packages/common/src/api/tan-query/purchases/useUSDCTransactionsCount.ts @@ -1,4 +1,8 @@ -import { full, Id } from '@audius/sdk' +import { + Id, + type GetUSDCTransactionsMethodEnum, + type GetUSDCTransactionsTypeEnum +} from '@audius/sdk' import { useQuery } from '@tanstack/react-query' import { useQueryContext } from '~/api/tan-query/utils' @@ -9,8 +13,8 @@ import { QueryOptions } from '../types' import { useCurrentUserId } from '../users/account/useCurrentUserId' type UseUSDCTransactionsCountArgs = { - type?: full.GetUSDCTransactionsTypeEnum[] - method?: full.GetUSDCTransactionsMethodEnum + type?: GetUSDCTransactionsTypeEnum[] + method?: GetUSDCTransactionsMethodEnum } export const getUSDCTransactionsCountQueryKey = ( @@ -37,7 +41,7 @@ export const useUSDCTransactionsCount = ( queryFn: async () => { if (!currentUserId) return 0 const sdk = await audiusSdk() - const { data } = await sdk.full.users.getUSDCTransactionCount({ + const { data } = await sdk.users.getUSDCTransactionCount({ id: Id.parse(currentUserId), type: args?.type, method: args?.method diff --git a/packages/common/src/api/tan-query/remixes/useRemixers.ts b/packages/common/src/api/tan-query/remixes/useRemixers.ts index 4559958c377..3f2cf4a01e1 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixers.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixers.ts @@ -48,7 +48,7 @@ export const useRemixers = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getRemixers({ + const { data = [] } = await sdk.users.getRemixers({ id: Id.parse(userId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/remixes/useRemixersCount.ts b/packages/common/src/api/tan-query/remixes/useRemixersCount.ts index a69ff8e790f..5cf4630644b 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixersCount.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixersCount.ts @@ -27,7 +27,7 @@ export const useRemixersCount = ( queryFn: async () => { const sdk = await audiusSdk() if (!currentUserId) return 0 - const { data = 0 } = await sdk.full.users.getRemixersCount({ + const { data = 0 } = await sdk.users.getRemixersCount({ id: Id.parse(currentUserId), userId: Id.parse(currentUserId), trackId: OptionalId.parse(trackId) diff --git a/packages/common/src/api/tan-query/remixes/useRemixes.ts b/packages/common/src/api/tan-query/remixes/useRemixes.ts index b2feeca056b..cd1d2c6db08 100644 --- a/packages/common/src/api/tan-query/remixes/useRemixes.ts +++ b/packages/common/src/api/tan-query/remixes/useRemixes.ts @@ -1,4 +1,9 @@ -import { Id, OptionalId, EntityType, full } from '@audius/sdk' +import { + GetTrackRemixesSortMethodEnum, + Id, + OptionalId, + EntityType +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -25,7 +30,7 @@ export type UseRemixesArgs = { includeOriginal?: boolean includeWinners?: boolean pageSize?: number - sortMethod?: full.GetTrackRemixesSortMethodEnum + sortMethod?: GetTrackRemixesSortMethodEnum isCosign?: boolean isContestEntry?: boolean } @@ -100,8 +105,7 @@ export const useRemixes = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = { count: 0, tracks: [] } } = - await sdk.full.tracks.getTrackRemixes({ + const remixesResponse = await sdk.tracks.getTrackRemixes({ trackId: Id.parse(trackId), userId: OptionalId.parse(currentUserId), limit: pageSize, @@ -110,8 +114,9 @@ export const useRemixes = ( onlyCosigns: isCosign, onlyContestEntries: isContestEntry }) + const data = remixesResponse ?? { count: 0, tracks: [] } let processedTracks = transformAndCleanList( - data.tracks, + data.tracks ?? [], userTrackMetadataFromSDK ) diff --git a/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts b/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts index f222d8c32a7..e35ba56030a 100644 --- a/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts +++ b/packages/common/src/api/tan-query/search/useSearchAutocomplete.ts @@ -44,7 +44,7 @@ export const useSearchAutocomplete = ( queryKey: getSearchAutocompleteQueryKey(currentUserId, { query, limit }), queryFn: async () => { const sdk = await audiusSdk() - const { data } = await sdk.full.search.searchAutocomplete({ + const { data } = await sdk.search.searchAutocomplete({ userId: OptionalId.parse(currentUserId), query, limit, diff --git a/packages/common/src/api/tan-query/search/useSearchResults.ts b/packages/common/src/api/tan-query/search/useSearchResults.ts index 955dd730e86..d41a86548ee 100644 --- a/packages/common/src/api/tan-query/search/useSearchResults.ts +++ b/packages/common/src/api/tan-query/search/useSearchResults.ts @@ -209,8 +209,8 @@ const useSearchQueryProps = ( } const { data } = isTagsSearch - ? await sdk.full.search.searchTags(searchParams) - : await sdk.full.search.search(searchParams) + ? await sdk.search.searchTags(searchParams) + : await sdk.search.search(searchParams) const { tracks, playlists, albums, users } = searchResultsFromSDK( data, diff --git a/packages/common/src/api/tan-query/tracks/useFeelingLuckyTrack.ts b/packages/common/src/api/tan-query/tracks/useFeelingLuckyTrack.ts index 485d037ff9c..20d89d83759 100644 --- a/packages/common/src/api/tan-query/tracks/useFeelingLuckyTrack.ts +++ b/packages/common/src/api/tan-query/tracks/useFeelingLuckyTrack.ts @@ -39,7 +39,7 @@ export const useFeelingLuckyTracks = ( queryKey: getFeelingLuckyTracksQueryKey({ userId: currentUserId, limit }), queryFn: async () => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.tracks.getFeelingLuckyTracks({ + const { data = [] } = await sdk.tracks.getFeelingLuckyTracks({ limit }) const tracks = transformAndCleanList(data, userTrackMetadataFromSDK) diff --git a/packages/common/src/api/tan-query/tracks/useRecentlyCommentedTracks.ts b/packages/common/src/api/tan-query/tracks/useRecentlyCommentedTracks.ts index cf466c27f19..7b136e17fc6 100644 --- a/packages/common/src/api/tan-query/tracks/useRecentlyCommentedTracks.ts +++ b/packages/common/src/api/tan-query/tracks/useRecentlyCommentedTracks.ts @@ -1,4 +1,7 @@ -import { full, OptionalId } from '@audius/sdk' +import { + GetTracksWithRecentCommentsRequest, + OptionalId +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -18,7 +21,7 @@ import { useCurrentUserId } from '../users/account/useCurrentUserId' const DEFAULT_PAGE_SIZE = 10 export type UseRecentlyCommentedTracksArgs = - SDKInfiniteQueryArgs + SDKInfiniteQueryArgs export const getRecentlyCommentedTracksQueryKey = ( userId: ID | null | undefined, @@ -55,7 +58,7 @@ export const useRecentlyCommentedTracks = ( queryFn: async ({ pageParam }) => { if (!currentUserId) return [] const sdk = await audiusSdk() - const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({ + const { data = [] } = await sdk.tracks.getTracksWithRecentComments({ ...args, userId: OptionalId.parse(currentUserId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/tracks/useRecentlyPlayedTracks.ts b/packages/common/src/api/tan-query/tracks/useRecentlyPlayedTracks.ts index a82bf2a7512..5320c4e5228 100644 --- a/packages/common/src/api/tan-query/tracks/useRecentlyPlayedTracks.ts +++ b/packages/common/src/api/tan-query/tracks/useRecentlyPlayedTracks.ts @@ -1,4 +1,4 @@ -import { Id, full } from '@audius/sdk' +import { Id, type GetUsersTrackHistoryRequest } from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -19,7 +19,7 @@ const DEFAULT_PAGE_SIZE = 10 // `id` is automatically added by the hook export type UseRecentlyPlayedTracksArgs = Omit< - SDKInfiniteQueryArgs, + SDKInfiniteQueryArgs, 'id' > export const getRecentlyPlayedTracksQueryKey = ( @@ -53,7 +53,7 @@ export const useRecentlyPlayedTracks = ( if (!currentUserId) return [] const sdk = await audiusSdk() const id = Id.parse(currentUserId) - const { data = [] } = await sdk.full.users.getUsersTrackHistory({ + const { data = [] } = await sdk.users.getUsersTrackHistory({ ...args, id, userId: id, diff --git a/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts b/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts index 38ce48f275f..361682e6bef 100644 --- a/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts +++ b/packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts @@ -1,4 +1,4 @@ -import { Id, full } from '@audius/sdk' +import { Id, type GetUserRecommendedTracksRequest } from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -19,7 +19,7 @@ const DEFAULT_PAGE_SIZE = 10 // `id` is automatically added by the hook export type UseRecommendedTracksArgs = Omit< - SDKInfiniteQueryArgs, + SDKInfiniteQueryArgs, 'id' > @@ -53,7 +53,7 @@ export const useRecommendedTracks = ( queryFn: async ({ pageParam }) => { if (!currentUserId) return [] const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getUserRecommendedTracks({ + const { data = [] } = await sdk.users.getUserRecommendedTracks({ ...args, id: Id.parse(currentUserId), userId: Id.parse(currentUserId), diff --git a/packages/common/src/api/tan-query/tracks/useStems.ts b/packages/common/src/api/tan-query/tracks/useStems.ts index c8ab05b8651..29701dabca5 100644 --- a/packages/common/src/api/tan-query/tracks/useStems.ts +++ b/packages/common/src/api/tan-query/tracks/useStems.ts @@ -31,7 +31,7 @@ export const useStems = ( queryKey: getStemsQueryKey(trackId), queryFn: async () => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.tracks.getTrackStems({ + const { data = [] } = await sdk.tracks.getTrackStems({ trackId: Id.parse(trackId!) }) diff --git a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts index 988ba364a00..1ffdb657f6b 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackByPermalink.ts @@ -43,7 +43,7 @@ export const useTrackByPermalink = ( queryKey: getTrackByPermalinkQueryKey(permalink), queryFn: async () => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.tracks.getBulkTracks({ + const { data = [] } = await sdk.tracks.getBulkTracks({ permalink: [permalink!], userId: OptionalId.parse(currentUserId) }) diff --git a/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts b/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts index 5fa1082a325..0aeb48a9a0d 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackFavorites.ts @@ -49,7 +49,7 @@ export const useTrackFavorites = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.tracks.getUsersFromFavorites({ + const { data } = await sdk.tracks.getUsersFromFavorites({ trackId: Id.parse(trackId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/tracks/useTrackHistory.ts b/packages/common/src/api/tan-query/tracks/useTrackHistory.ts index 27b3819435f..f61bed9e21d 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackHistory.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackHistory.ts @@ -1,4 +1,10 @@ -import { Id, full, EntityType } from '@audius/sdk' +import { + Id, + EntityType, + GetUsersTrackHistorySortMethodEnum, + GetUsersTrackHistorySortDirectionEnum, + type TrackActivity +} from '@audius/sdk' import { useInfiniteQuery, useQueryClient } from '@tanstack/react-query' import { useDispatch } from 'react-redux' @@ -22,8 +28,8 @@ const DEFAULT_PAGE_SIZE = 30 type UseTrackHistoryArgs = { pageSize?: number query?: string - sortMethod?: full.GetUsersTrackHistorySortMethodEnum - sortDirection?: full.GetUsersTrackHistorySortDirectionEnum + sortMethod?: GetUsersTrackHistorySortMethodEnum + sortDirection?: GetUsersTrackHistorySortDirectionEnum } export const getTrackHistoryQueryKey = ( @@ -67,7 +73,7 @@ export const useTrackHistory = ( const id = Id.parse(currentUserId) - const { data: activityData } = await sdk.full.users.getUsersTrackHistory({ + const { data: activityData } = await sdk.users.getUsersTrackHistory({ id, userId: id, limit: pageSize, @@ -81,7 +87,7 @@ export const useTrackHistory = ( const tracks = transformAndCleanList( activityData, - (activity: full.ActivityFull) => { + (activity: TrackActivity) => { const track = trackActivityFromSDK(activity)?.item if (track) { return { diff --git a/packages/common/src/api/tan-query/tracks/useTrackRank.ts b/packages/common/src/api/tan-query/tracks/useTrackRank.ts index 73ca6236267..a8512ea082e 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackRank.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackRank.ts @@ -40,7 +40,7 @@ export const useGetTrendingIds = (args?: GetTrendingIdsArgs) => { queryKey: getTrendingIdsQueryKey(args), queryFn: async () => { const sdk = await audiusSdk() - const { data } = await sdk.full.tracks.getTrendingTrackIDs(args) + const { data } = await sdk.tracks.getTrendingTrackIDs(args) return data ? trendingIdsFromSDK(data) : null } }) diff --git a/packages/common/src/api/tan-query/tracks/useTrackReposts.ts b/packages/common/src/api/tan-query/tracks/useTrackReposts.ts index a87715d61ee..7f02cec58b1 100644 --- a/packages/common/src/api/tan-query/tracks/useTrackReposts.ts +++ b/packages/common/src/api/tan-query/tracks/useTrackReposts.ts @@ -49,7 +49,7 @@ export const useTrackReposts = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.tracks.getUsersFromReposts({ + const { data } = await sdk.tracks.getUsersFromReposts({ trackId: Id.parse(trackId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts b/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts index b7f7f4ff039..12f75079db8 100644 --- a/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts +++ b/packages/common/src/api/tan-query/users/account/useCurrentAccount.ts @@ -70,7 +70,7 @@ export const getCurrentAccountQueryFn = async ( return null } - const { data } = await sdk.full.users.getUserAccount({ + const { data } = await sdk.users.getUserAccount({ wallet: currentUserWallet! }) diff --git a/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts b/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts index 2d7d6f58120..ad7393c3206 100644 --- a/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts +++ b/packages/common/src/api/tan-query/users/account/useManagedAccounts.ts @@ -26,7 +26,7 @@ export const useManagedAccounts = ( queryKey: getManagedAccountsQueryKey(userId), queryFn: async () => { const sdk = await audiusSdk() - const managedUsers = await sdk.full.users.getManagedUsers({ + const managedUsers = await sdk.users.getManagedUsers({ id: Id.parse(userId) }) const { data = [] } = managedUsers diff --git a/packages/common/src/api/tan-query/users/account/useManagers.ts b/packages/common/src/api/tan-query/users/account/useManagers.ts index 992459f823a..7b2351f72dc 100644 --- a/packages/common/src/api/tan-query/users/account/useManagers.ts +++ b/packages/common/src/api/tan-query/users/account/useManagers.ts @@ -24,7 +24,7 @@ export const useManagers = ( queryKey: getManagersQueryKey(userId), queryFn: async () => { const sdk = await audiusSdk() - const managers = await sdk.full.users.getManagers({ + const managers = await sdk.users.getManagers({ id: Id.parse(userId) }) const { data: rawData = [] } = managers diff --git a/packages/common/src/api/tan-query/users/account/useWalletUser.ts b/packages/common/src/api/tan-query/users/account/useWalletUser.ts index 8d01b765d01..0e16f7ba404 100644 --- a/packages/common/src/api/tan-query/users/account/useWalletUser.ts +++ b/packages/common/src/api/tan-query/users/account/useWalletUser.ts @@ -34,7 +34,7 @@ export const getWalletAccountQueryFn = async ( queryClient: QueryClient ) => { try { - const { data } = await sdk.full.users.getUserAccount({ wallet }) + const { data } = await sdk.users.getUserAccount({ wallet }) if (!data) { console.warn('Missing user from account response') diff --git a/packages/common/src/api/tan-query/users/useFollowers.ts b/packages/common/src/api/tan-query/users/useFollowers.ts index daf4cbcc937..c8d91b499e5 100644 --- a/packages/common/src/api/tan-query/users/useFollowers.ts +++ b/packages/common/src/api/tan-query/users/useFollowers.ts @@ -49,7 +49,7 @@ export const useFollowers = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.users.getFollowers({ + const { data } = await sdk.users.getFollowers({ id: Id.parse(userId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/users/useFollowing.ts b/packages/common/src/api/tan-query/users/useFollowing.ts index d8254fc91c2..7a80cc0348c 100644 --- a/packages/common/src/api/tan-query/users/useFollowing.ts +++ b/packages/common/src/api/tan-query/users/useFollowing.ts @@ -48,7 +48,7 @@ export const useFollowing = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getFollowing({ + const { data = [] } = await sdk.users.getFollowing({ id: Id.parse(userId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/users/useHandleInUse.ts b/packages/common/src/api/tan-query/users/useHandleInUse.ts index 54c9c10bec7..ea1b64012ef 100644 --- a/packages/common/src/api/tan-query/users/useHandleInUse.ts +++ b/packages/common/src/api/tan-query/users/useHandleInUse.ts @@ -14,7 +14,7 @@ export const fetchHandleInUse = async ( if (!handle) return false const sdk = await audiusSdk() try { - const { data: users = [] } = await sdk.full.users.getUserByHandle({ + const { data: users = [] } = await sdk.users.getUserByHandle({ handle }) return !isEmpty(users[0]) diff --git a/packages/common/src/api/tan-query/users/useMutedUsers.ts b/packages/common/src/api/tan-query/users/useMutedUsers.ts index 984932f7fc1..39fa4aec49d 100644 --- a/packages/common/src/api/tan-query/users/useMutedUsers.ts +++ b/packages/common/src/api/tan-query/users/useMutedUsers.ts @@ -36,7 +36,7 @@ export const useMutedUsers = ( queryFn: async () => { if (!currentUserId) return [] const sdk = await audiusSdk() - const { data } = await sdk.full.users.getMutedUsers({ + const { data } = await sdk.users.getMutedUsers({ id: Id.parse(currentUserId) }) const users = userMetadataListFromSDK(data) diff --git a/packages/common/src/api/tan-query/users/useMutualFollowers.ts b/packages/common/src/api/tan-query/users/useMutualFollowers.ts index e838ab1e3b6..c0be0e10e60 100644 --- a/packages/common/src/api/tan-query/users/useMutualFollowers.ts +++ b/packages/common/src/api/tan-query/users/useMutualFollowers.ts @@ -47,7 +47,7 @@ export const useMutualFollowers = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getMutualFollowers({ + const { data = [] } = await sdk.users.getMutualFollowers({ userId: OptionalId.parse(currentUserId), id: Id.parse(userId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/users/useRelatedArtists.ts b/packages/common/src/api/tan-query/users/useRelatedArtists.ts index ae70e43ee32..fb46a1f90ab 100644 --- a/packages/common/src/api/tan-query/users/useRelatedArtists.ts +++ b/packages/common/src/api/tan-query/users/useRelatedArtists.ts @@ -55,7 +55,7 @@ export const useRelatedArtists = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getRelatedUsers({ + const { data = [] } = await sdk.users.getRelatedUsers({ id: Id.parse(artistId), limit: pageSize, offset: pageParam, diff --git a/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts b/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts index 7435d1c307d..893891cade8 100644 --- a/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts +++ b/packages/common/src/api/tan-query/users/useTopArtistsInGenre.ts @@ -51,7 +51,7 @@ export const useTopArtistsInGenre = ( }, queryFn: async ({ pageParam }) => { const sdk = await audiusSdk() - const { data } = await sdk.full.users.getTopUsersInGenre({ + const { data } = await sdk.users.getTopUsersInGenre({ genre: [genre], limit: pageSize, offset: (pageParam as number) * pageSize diff --git a/packages/common/src/api/tan-query/users/useUpdateProfile.ts b/packages/common/src/api/tan-query/users/useUpdateProfile.ts index 29bdee0d88c..1c6c7a7dbcc 100644 --- a/packages/common/src/api/tan-query/users/useUpdateProfile.ts +++ b/packages/common/src/api/tan-query/users/useUpdateProfile.ts @@ -53,12 +53,12 @@ export const useUpdateProfile = () => { }) // Fetch updated user data - const { data: userData = [] } = await sdk.full.users.getUser({ + const response = await sdk.users.getUser({ id: Id.parse(currentUserId), userId: Id.parse(currentUserId) }) - return userData[0] + return response.data }, onMutate: async (metadata): Promise => { // Cancel any outgoing refetches diff --git a/packages/common/src/api/tan-query/users/useUserAlbums.ts b/packages/common/src/api/tan-query/users/useUserAlbums.ts index 47ccd06c6b1..0cceaa809a8 100644 --- a/packages/common/src/api/tan-query/users/useUserAlbums.ts +++ b/packages/common/src/api/tan-query/users/useUserAlbums.ts @@ -1,4 +1,8 @@ -import { full, Id, OptionalId } from '@audius/sdk' +import { + GetAlbumsByUserSortMethodEnum, + Id, + OptionalId +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -21,7 +25,7 @@ import { useCurrentUserId } from './account/useCurrentUserId' type GetAlbumsOptions = { userId: number | null | undefined pageSize?: number - sortMethod?: full.GetAlbumsByUserSortMethodEnum + sortMethod?: GetAlbumsByUserSortMethodEnum query?: string } @@ -58,7 +62,7 @@ export const useUserAlbums = ( const sdk = await audiusSdk() - const { data } = await sdk.full.users.getAlbumsByUser({ + const { data } = await sdk.users.getAlbumsByUser({ id: Id.parse(userId), userId: OptionalId.parse(currentUserId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/users/useUserByHandle.ts b/packages/common/src/api/tan-query/users/useUserByHandle.ts index b2a96565d12..2c76567defa 100644 --- a/packages/common/src/api/tan-query/users/useUserByHandle.ts +++ b/packages/common/src/api/tan-query/users/useUserByHandle.ts @@ -29,14 +29,18 @@ export const getUserByHandleQueryFn = async ( currentUserId?: ID | null ) => { if (!handle) return undefined - const { data } = await sdk.full.users.getUserByHandle({ + const response = await sdk.users.getUserByHandle({ handle: handle.toLowerCase(), userId: OptionalId.parse(currentUserId) }) - const user = userMetadataListFromSDK(data)[0] - - primeUserData({ users: [user], queryClient }) - return user.user_id + const user = response.data + ? userMetadataListFromSDK([response.data])[0] + : undefined + if (user) { + primeUserData({ users: [user], queryClient }) + return user.user_id + } + return undefined } export const useUserByHandle = ( diff --git a/packages/common/src/api/tan-query/users/useUserPlaylists.ts b/packages/common/src/api/tan-query/users/useUserPlaylists.ts index 96e223ce4d6..c3a2d7d172c 100644 --- a/packages/common/src/api/tan-query/users/useUserPlaylists.ts +++ b/packages/common/src/api/tan-query/users/useUserPlaylists.ts @@ -1,4 +1,8 @@ -import { Id, OptionalId, full } from '@audius/sdk' +import { + GetPlaylistsByUserSortMethodEnum, + Id, + OptionalId +} from '@audius/sdk' import { InfiniteData, useInfiniteQuery, @@ -21,7 +25,7 @@ import { useCurrentUserId } from './account/useCurrentUserId' type GetPlaylistsOptions = { userId: number | null | undefined pageSize?: number - sortMethod?: full.GetPlaylistsByUserSortMethodEnum + sortMethod?: GetPlaylistsByUserSortMethodEnum query?: string } @@ -58,7 +62,7 @@ export const useUserPlaylists = ( const sdk = await audiusSdk() - const { data } = await sdk.full.users.getPlaylistsByUser({ + const { data } = await sdk.users.getPlaylistsByUser({ id: Id.parse(userId), userId: OptionalId.parse(currentUserId), limit: pageSize, diff --git a/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts b/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts index 5cc496cb69f..30b89902ba3 100644 --- a/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts +++ b/packages/common/src/api/tan-query/users/useUserTracksByHandle.ts @@ -1,5 +1,5 @@ import { OptionalId } from '@audius/sdk' -import type { full } from '@audius/sdk' +import type { GetTracksByUserHandleFilterTracksEnum } from '@audius/sdk' import { useQuery, useQueryClient } from '@tanstack/react-query' import { userTrackMetadataFromSDK } from '~/adapters/track' @@ -15,7 +15,7 @@ import { primeTrackData } from '../utils/primeTrackData' type GetTracksByUserHandleArgs = { handle: string | null | undefined - filterTracks?: full.GetTracksByUserHandleFilterTracksEnum + filterTracks?: GetTracksByUserHandleFilterTracksEnum sort?: 'date' | 'plays' limit?: number offset?: number @@ -51,7 +51,7 @@ export const useUserTracksByHandle = ( queryKey: getUserTracksByHandleQueryKey(args), queryFn: async () => { const sdk = await audiusSdk() - const { data = [] } = await sdk.full.users.getTracksByUserHandle({ + const { data = [] } = await sdk.users.getTracksByUserHandle({ handle: handle!, userId: OptionalId.parse(currentUserId), filterTracks, diff --git a/packages/common/src/api/tan-query/utils/parsePurchase.ts b/packages/common/src/api/tan-query/utils/parsePurchase.ts index 497267e213f..d075317671f 100644 --- a/packages/common/src/api/tan-query/utils/parsePurchase.ts +++ b/packages/common/src/api/tan-query/utils/parsePurchase.ts @@ -1,4 +1,4 @@ -import { full, HashId } from '@audius/sdk' +import { HashId, type Purchase } from '@audius/sdk' import { PurchaseAccess } from '~/models' import { @@ -7,7 +7,7 @@ import { } from '~/models/USDCTransactions' import { StringUSDC } from '~/models/Wallet' -export const parsePurchase = (purchase: full.Purchase): USDCPurchaseDetails => { +export const parsePurchase = (purchase: Purchase): USDCPurchaseDetails => { const { contentId, contentType, diff --git a/packages/common/src/api/tan-query/utils/primeRelatedData.ts b/packages/common/src/api/tan-query/utils/primeRelatedData.ts index 6b1dd4d1aa4..da01329b6c9 100644 --- a/packages/common/src/api/tan-query/utils/primeRelatedData.ts +++ b/packages/common/src/api/tan-query/utils/primeRelatedData.ts @@ -1,4 +1,4 @@ -import { full } from '@audius/sdk' +import type { Related } from '@audius/sdk' import { QueryClient } from '@tanstack/react-query' import { @@ -20,7 +20,7 @@ export const primeRelatedData = ({ forceReplace = false, skipQueryData = false }: { - related: full.Related | undefined + related: Related | undefined queryClient: QueryClient forceReplace?: boolean skipQueryData?: boolean diff --git a/packages/common/src/models/USDCTransactions.ts b/packages/common/src/models/USDCTransactions.ts index 10d70b796a1..15c7057301e 100644 --- a/packages/common/src/models/USDCTransactions.ts +++ b/packages/common/src/models/USDCTransactions.ts @@ -1,4 +1,4 @@ -import type { full } from '@audius/sdk' +import type { PurchaseSplit } from '@audius/sdk' import { Nullable } from '../utils/typeUtils' @@ -32,7 +32,7 @@ export type USDCPurchaseDetails = { contentId: number createdAt: string access: PurchaseAccess - splits: full.PurchaseSplit[] + splits: PurchaseSplit[] } export type USDCTransactionDetails = { diff --git a/packages/common/src/services/explore/Explore.ts b/packages/common/src/services/explore/Explore.ts index 7009e111efd..26994078a76 100644 --- a/packages/common/src/services/explore/Explore.ts +++ b/packages/common/src/services/explore/Explore.ts @@ -22,7 +22,7 @@ export class Explore { async getFeelingLuckyTracks(userId: ID | null | undefined, limit = 25) { try { const sdk = await this.audiusSdk() - const { data = [] } = await sdk.full.tracks.getFeelingLuckyTracks({ + const { data = [] } = await sdk.tracks.getFeelingLuckyTracks({ limit, withUsers: true, userId: OptionalId.parse(userId) diff --git a/packages/common/src/store/account/sagas.ts b/packages/common/src/store/account/sagas.ts index 997e5e9cf85..beaef5b4241 100644 --- a/packages/common/src/store/account/sagas.ts +++ b/packages/common/src/store/account/sagas.ts @@ -66,7 +66,7 @@ function* handleFetchTrackCount() { try { const { data = [] } = yield* call( - [sdk.full.users, sdk.full.users.getTracksByUserHandle], + [sdk.users, sdk.users.getTracksByUserHandle], { handle, userId: Id.parse(currentUserId), diff --git a/packages/common/src/store/gated-content/sagas.ts b/packages/common/src/store/gated-content/sagas.ts index db4a5770638..deb935bfdc1 100644 --- a/packages/common/src/store/gated-content/sagas.ts +++ b/packages/common/src/store/gated-content/sagas.ts @@ -78,14 +78,14 @@ export function* pollGatedContent({ while (true) { const apiEntity = isAlbum ? yield* call(async () => { - const { data = [] } = await sdk.full.playlists.getPlaylist({ + const { data = [] } = await sdk.playlists.getPlaylist({ playlistId: Id.parse(contentId), userId: OptionalId.parse(currentUserId) }) return transformAndCleanList(data, userCollectionMetadataFromSDK)[0] }) : yield* call(async () => { - const { data } = await sdk.full.tracks.getTrack({ + const { data } = await sdk.tracks.getTrack({ trackId: Id.parse(contentId), userId: OptionalId.parse(currentUserId) }) diff --git a/packages/common/src/store/pages/library-page/types.ts b/packages/common/src/store/pages/library-page/types.ts index 2ae7e7993b8..bb066d0e4ba 100644 --- a/packages/common/src/store/pages/library-page/types.ts +++ b/packages/common/src/store/pages/library-page/types.ts @@ -1,4 +1,4 @@ -import { full } from '@audius/sdk' +import { GetUserLibraryTracksTypeEnum } from '@audius/sdk' import type { Dayjs } from '~/utils/dayjs' import { ValueOf } from '~/utils/typeUtils' @@ -12,7 +12,7 @@ import { LineupTrack } from '../../../models' -export const LibraryCategory = full.GetUserLibraryTracksTypeEnum +export const LibraryCategory = GetUserLibraryTracksTypeEnum export type LibraryCategoryType = ValueOf export function isLibraryCategory(value: string): value is LibraryCategoryType { diff --git a/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts b/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts index e35a778e566..b7ba0691091 100644 --- a/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts +++ b/packages/common/src/store/playlist-updates/playlistUpdatesSagas.ts @@ -1,4 +1,4 @@ -import { Id } from '@audius/sdk' +import { Id, type PlaylistUpdatesResponse } from '@audius/sdk' import { call, takeEvery, select, put } from 'typed-redux-saga' import { playlistUpdateFromSDK, transformAndCleanList } from '~/adapters' @@ -25,13 +25,16 @@ function* fetchPlaylistUpdatesWorker() { const sdk = yield* getSDK() const existingUpdatesTotal = yield* select(selectPlaylistUpdatesTotal) - const { data } = yield* call( - [sdk.full.notifications, sdk.full.notifications.getPlaylistUpdates], + const response = (yield* call( + [ + sdk.notifications, + (sdk.notifications as { getPlaylistUpdates: (params: { userId: string }) => Promise }).getPlaylistUpdates + ], { userId: Id.parse(currentUserId) } - ) + )) as PlaylistUpdatesResponse | undefined const playlistUpdates = transformAndCleanList( - data?.playlistUpdates ?? [], + response?.data?.playlistUpdates ?? [], playlistUpdateFromSDK ) diff --git a/packages/common/src/store/purchase-content/sagas.ts b/packages/common/src/store/purchase-content/sagas.ts index 9d60bfa999f..ff00b4496f0 100644 --- a/packages/common/src/store/purchase-content/sagas.ts +++ b/packages/common/src/store/purchase-content/sagas.ts @@ -293,7 +293,7 @@ function* pollForPurchaseConfirmation({ const sdk = yield* getSDK() for (const trackId of metadata.playlist_contents.track_ids) { const { data } = yield* call( - [sdk.full.tracks, sdk.full.tracks.getTrack], + [sdk.tracks, sdk.tracks.getTrack], { trackId: Id.parse(trackId.track), userId: OptionalId.parse(currentUserId) @@ -602,7 +602,7 @@ function* collectEmailAfterPurchase({ } const { data: managers } = yield* call( - [sdk.full.users, sdk.full.users.getManagers], + [sdk.users, sdk.users.getManagers], { id: Id.parse(sellerId), isApproved: true diff --git a/packages/common/src/store/ui/search-users-modal/sagas.ts b/packages/common/src/store/ui/search-users-modal/sagas.ts index 2d00d8091d8..667460568d5 100644 --- a/packages/common/src/store/ui/search-users-modal/sagas.ts +++ b/packages/common/src/store/ui/search-users-modal/sagas.ts @@ -18,7 +18,7 @@ function* doSearchUsers(action: ReturnType) { const userList = yield* select(getUserList) try { const currentUserId = yield* call(queryCurrentUserId) - const { data } = yield* call([sdk.full.search, sdk.full.search.search], { + const { data } = yield* call([sdk.search, sdk.search.search], { query, limit, kind: SearchKind.USERS, diff --git a/packages/common/src/store/ui/share-modal/sagas.ts b/packages/common/src/store/ui/share-modal/sagas.ts index 265d80ccb1c..a6013260121 100644 --- a/packages/common/src/store/ui/share-modal/sagas.ts +++ b/packages/common/src/store/ui/share-modal/sagas.ts @@ -40,7 +40,7 @@ function* handleRequestOpen(action: ShareModalRequestOpenAction) { let collection = yield* queryCollection(collectionId) if (!collection) { const { data = [] } = yield* call( - [sdk.full.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { playlistId: Id.parse(collectionId) } @@ -57,11 +57,11 @@ function* handleRequestOpen(action: ShareModalRequestOpenAction) { let owner = yield* queryUser(collection.playlist_owner_id) if (!owner) { - const { data } = yield* call([sdk.full.users, sdk.full.users.getUser], { + const response = yield* call([sdk.users, sdk.users.getUser], { id: Id.parse(collection.playlist_owner_id) }) const [transformedUser] = transformAndCleanList( - data ?? [], + response?.data != null ? [response.data] : [], userMetadataFromSDK ) if (transformedUser) { diff --git a/packages/create-audius-app/examples/react/src/App.tsx b/packages/create-audius-app/examples/react/src/App.tsx index d82321b08a8..ab77f1afd4a 100644 --- a/packages/create-audius-app/examples/react/src/App.tsx +++ b/packages/create-audius-app/examples/react/src/App.tsx @@ -55,7 +55,7 @@ export default function App() { handle: handleInputRef.current?.value ?? '' }) - const { data: tracks } = await sdk.full.users.getTracksByUser({ + const { data: tracks } = await sdk.users.getTracksByUser({ id: selectedUser?.id ?? '' }) diff --git a/packages/create-audius-app/tests/e2e/react/react.test.ts b/packages/create-audius-app/tests/e2e/react/react.test.ts index 20b19938b05..0ee35d8d13f 100644 --- a/packages/create-audius-app/tests/e2e/react/react.test.ts +++ b/packages/create-audius-app/tests/e2e/react/react.test.ts @@ -30,7 +30,7 @@ test('auth and fetches tracks', async ({ page, context }) => { // Set up response listener const responsePromise = page.waitForResponse(async (response) => { - if (response.url().includes('v1/full/users/4zZ9aV9/tracks')) { + if (response.url().includes('v1/users/4zZ9aV9/tracks')) { const json = await response.json() return json.data } diff --git a/packages/discovery-provider/plugins/pedalboard/apps/anti-abuse-oracle/src/server.tsx b/packages/discovery-provider/plugins/pedalboard/apps/anti-abuse-oracle/src/server.tsx index 9a994406011..41866a36653 100644 --- a/packages/discovery-provider/plugins/pedalboard/apps/anti-abuse-oracle/src/server.tsx +++ b/packages/discovery-provider/plugins/pedalboard/apps/anti-abuse-oracle/src/server.tsx @@ -193,7 +193,7 @@ app.post('/attestation/:handle', async (c) => { const handle = c.req.param('handle').toLowerCase() const { challengeId, challengeSpecifier, amount } = await c.req.json() - const { data: users } = await sdk.full.users.getUserByHandle({ handle }) + const { data: users } = await sdk.users.getUserByHandle({ handle }) if (!users || !users[0]) { return c.json({ error: `handle not found: ${handle}` }, 404) } diff --git a/packages/libs/src/services/discoveryProvider/requests.ts b/packages/libs/src/services/discoveryProvider/requests.ts index e93419c3bb4..5069a4221a0 100644 --- a/packages/libs/src/services/discoveryProvider/requests.ts +++ b/packages/libs/src/services/discoveryProvider/requests.ts @@ -254,7 +254,7 @@ export const getFullPlaylist = ( encodedUserId: string ) => { return { - endpoint: 'v1/full/playlists', + endpoint: 'v1/playlists', urlParams: '/' + encodedPlaylistId, queryParams: { user_id: encodedUserId @@ -532,7 +532,7 @@ export const getTopFullPlaylists = ({ withUsers = false }: GetTopFullPlaylistsParams) => { return { - endpoint: `/v1/full/playlists/top`, + endpoint: `/v1/playlists/top`, queryParams: { type, limit, @@ -569,7 +569,7 @@ export const getBestNewReleases = ( withUsers = false ) => { return { - endpoint: `/v1/full/tracks/best_new_releases`, + endpoint: `/v1/tracks/best_new_releases`, queryParams: { window, limit, @@ -585,7 +585,7 @@ export const getMostLovedTracks = ( withUsers = false ) => { return { - endpoint: `/v1/full/tracks/most_loved`, + endpoint: `/v1/tracks/most_loved`, queryParams: { limit, user_id: encodedUserId, @@ -600,7 +600,7 @@ export const getFeelingLuckyTracks = ( withUsers = false ) => { return { - endpoint: `/v1/full/tracks/feeling_lucky`, + endpoint: `/v1/tracks/feeling_lucky`, queryParams: { limit, user_id: encodedUserId, @@ -682,7 +682,7 @@ export const getUserNotifications = ({ validTypes }: GetUserNotificationsParams) => { return { - endpoint: `v1/full/notifications/${encodedUserId}`, + endpoint: `v1/notifications/${encodedUserId}`, queryParams: { timestamp, group_id: groupId, @@ -694,7 +694,7 @@ export const getUserNotifications = ({ export const getUserSubscribers = (encodedUserId: string, timeout: number) => { return { - endpoint: `v1/full/users/${encodedUserId}/subscribers`, + endpoint: `v1/users/${encodedUserId}/subscribers`, method: 'get', timeout } @@ -705,7 +705,7 @@ export const bulkGetUserSubscribers = ( timeout: number ) => { return { - endpoint: 'v1/full/users/subscribers', + endpoint: 'v1/users/subscribers', method: 'post', headers: { 'Content-Type': 'application/json' @@ -723,7 +723,7 @@ export const getCIDData = ( timeout: number ) => { return { - endpoint: `v1/full/cid_data/${cid}`, + endpoint: `v1/cid_data/${cid}`, method: 'get', responseType, timeout @@ -803,7 +803,7 @@ export const verifyToken = (token: string) => { export const getUserReplicaSet = (encodedUserId: string) => { return { - endpoint: `/v1/full/users/${encodedUserId}/replica_set`, + endpoint: `/v1/users/${encodedUserId}/replica_set`, timeout: 5000 } } diff --git a/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx b/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx index 9a34e5f2398..347ac115070 100644 --- a/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx +++ b/packages/mobile/src/screens/explore-screen/components/ForYouTracks.tsx @@ -3,7 +3,7 @@ import React from 'react' import { useRecommendedTracks } from '@audius/common/api' import { exploreMessages as messages } from '@audius/common/messages' import { QueueSource } from '@audius/common/store' -import { full } from '@audius/sdk' +import { GetRecommendedTracksTimeEnum } from '@audius/sdk' import { useExploreSectionTracking } from '../hooks/useExploreSectionTracking' @@ -14,7 +14,7 @@ export const ForYouTracks = () => { const { inView, InViewWrapper } = useExploreSectionTracking('Recommended Tracks') const { data: recommendedTracks, isPending } = useRecommendedTracks( - { pageSize: 10, timeRange: full.GetRecommendedTracksTimeEnum.Week }, + { pageSize: 10, timeRange: GetRecommendedTracksTimeEnum.Week }, { enabled: inView } ) diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts index 18c4eea2cf8..cdc9d8045d5 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadCollectionWorker.ts @@ -124,7 +124,7 @@ function* downloadCollectionAsync( const sdk = yield* getSDK() const { data = [] } = yield* call( - [sdk.full.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { playlistId: Id.parse(collectionId), userId: OptionalId.parse(currentUserId) diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts index 2eb656417a6..a37f21d3806 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/downloadTrackWorker.ts @@ -120,7 +120,7 @@ function* downloadTrackAsync( if (!currentUserId) return OfflineDownloadStatus.ERROR const sdk = yield* getSDK() - const { data } = yield* call([sdk.full.tracks, sdk.full.tracks.getTrack], { + const { data } = yield* call([sdk.tracks, sdk.tracks.getTrack], { trackId: Id.parse(trackId), userId: OptionalId.parse(currentUserId) }) diff --git a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts index 2a9e7f784fe..40c72822b09 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/offlineQueueSagas/workers/staleTrackWorker.ts @@ -55,7 +55,7 @@ export function* handleStaleTrack(trackId: ID) { if (!currentTrack || !currentUserId) return OfflineDownloadStatus.ERROR - const { data } = yield* call([sdk.full.tracks, sdk.full.tracks.getTrack], { + const { data } = yield* call([sdk.tracks, sdk.tracks.getTrack], { trackId: Id.parse(trackId), userId: OptionalId.parse(currentUserId) }) diff --git a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts index 172a2e2dcbc..6fc473431de 100644 --- a/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts +++ b/packages/mobile/src/store/offline-downloads/sagas/requestDownloadCollectionSaga.ts @@ -35,7 +35,7 @@ function* downloadCollection(action: CollectionAction) { const sdk = yield* getSDK() const { data = [] } = yield* call( - [sdk.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { playlistId: Id.parse(collectionId), userId: OptionalId.parse(currentUserId) diff --git a/packages/sdk/src/sdk/api/notifications/NotificationsApi.ts b/packages/sdk/src/sdk/api/notifications/NotificationsApi.ts index 3e2f1c3c165..3a1cc194767 100644 --- a/packages/sdk/src/sdk/api/notifications/NotificationsApi.ts +++ b/packages/sdk/src/sdk/api/notifications/NotificationsApi.ts @@ -1,4 +1,7 @@ -import type { Configuration } from '../../api/generated/default' +import { + NotificationsApi as GeneratedNotificationsApi, + type Configuration +} from '../../api/generated/default' import type { EntityManagerService } from '../../services' import { Action, EntityType } from '../../services/EntityManager/types' import { parseParams } from '../../utils/parseParams' @@ -10,12 +13,13 @@ import { UpdatePlaylistLastViewedAtSchema } from './types' -export class NotificationsApi { - // eslint-disable-next-line no-useless-constructor +export class NotificationsApi extends GeneratedNotificationsApi { constructor( - _config: Configuration, + config: Configuration, private readonly entityManager: EntityManagerService - ) {} + ) { + super(config) + } /** * When a user views all of their notifications diff --git a/packages/sdk/src/sdk/api/users/UsersApi.ts b/packages/sdk/src/sdk/api/users/UsersApi.ts index fbef2cf42a7..5ed8f662b1d 100644 --- a/packages/sdk/src/sdk/api/users/UsersApi.ts +++ b/packages/sdk/src/sdk/api/users/UsersApi.ts @@ -11,7 +11,7 @@ import { } from '../../services/EntityManager/types' import type { ClaimableTokensClient } from '../../services/Solana/programs/ClaimableTokensClient/ClaimableTokensClient' import type { SolanaClient } from '../../services/Solana/programs/SolanaClient' -import { HashId, Id } from '../../types/HashId' +import { HashId } from '../../types/HashId' import { generateMetadataCidV1 } from '../../utils/cid' import { decodeHashId, encodeHashId } from '../../utils/hashId' import { parseParams } from '../../utils/parseParams' diff --git a/packages/sdk/src/sdk/config/production.ts b/packages/sdk/src/sdk/config/production.ts index e81874a6c3d..48f837b180f 100644 --- a/packages/sdk/src/sdk/config/production.ts +++ b/packages/sdk/src/sdk/config/production.ts @@ -5,330 +5,338 @@ /* eslint-disable prettier/prettier */ import type { SdkServicesConfig } from './types' export const productionConfig: SdkServicesConfig = { - "network": { - "minVersion": "0.7.0", - "apiEndpoint": "https://api.audius.co", - "storageNodes": [ + network: { + minVersion: '0.7.0', + apiEndpoint: 'http://localhost:1323', + storageNodes: [ { - "endpoint": "https://creatornode3.audius.co", - "delegateOwnerWallet": "0x0C32BE6328578E99b6F06E0e7A6B385EB8FC13d1" + endpoint: 'https://creatornode3.audius.co', + delegateOwnerWallet: '0x0C32BE6328578E99b6F06E0e7A6B385EB8FC13d1' }, { - "endpoint": "https://audius.bragi.cc", - "delegateOwnerWallet": "0x627d23D17a3eAaDB1D3823e73Ab80D474023Acab" + endpoint: 'https://audius.bragi.cc', + delegateOwnerWallet: '0x627d23D17a3eAaDB1D3823e73Ab80D474023Acab' }, { - "endpoint": "https://creatornode.audius.co", - "delegateOwnerWallet": "0xc8d0C29B6d540295e8fc8ac72456F2f4D41088c8" + endpoint: 'https://creatornode.audius.co', + delegateOwnerWallet: '0xc8d0C29B6d540295e8fc8ac72456F2f4D41088c8' }, { - "endpoint": "https://audius-cn1.tikilabs.com", - "delegateOwnerWallet": "0x159200F84c2cF000b3A014cD4D8244500CCc36ca" + endpoint: 'https://audius-cn1.tikilabs.com', + delegateOwnerWallet: '0x159200F84c2cF000b3A014cD4D8244500CCc36ca' }, { - "endpoint": "https://creatornode2.audius.co", - "delegateOwnerWallet": "0xf686647E3737d595C60c6DE2f5F90463542FE439" + endpoint: 'https://creatornode2.audius.co', + delegateOwnerWallet: '0xf686647E3737d595C60c6DE2f5F90463542FE439' }, { - "endpoint": "https://audius.rickyrombo.com", - "delegateOwnerWallet": "0xae5D0507b6653589A03ae5becb35EB0C160e7131" + endpoint: 'https://audius.rickyrombo.com', + delegateOwnerWallet: '0xae5D0507b6653589A03ae5becb35EB0C160e7131' }, { - "endpoint": "https://audius-discovery-2.cultur3stake.com", - "delegateOwnerWallet": "0xB98a729444E262ec9AC5F1539b68e69aEC37Ef2C" + endpoint: 'https://audius-discovery-2.cultur3stake.com', + delegateOwnerWallet: '0xB98a729444E262ec9AC5F1539b68e69aEC37Ef2C' }, { - "endpoint": "https://audius-discovery-3.cultur3stake.com", - "delegateOwnerWallet": "0xeEB73B487f8B4b23B757d9d738Bfc48fD0cc2606" + endpoint: 'https://audius-discovery-3.cultur3stake.com', + delegateOwnerWallet: '0xeEB73B487f8B4b23B757d9d738Bfc48fD0cc2606' }, { - "endpoint": "https://audius-discovery-4.cultur3stake.com", - "delegateOwnerWallet": "0x8162684B7a004AF41de09Bfd3bE6Ef53d64158F5" + endpoint: 'https://audius-discovery-4.cultur3stake.com', + delegateOwnerWallet: '0x8162684B7a004AF41de09Bfd3bE6Ef53d64158F5' }, { - "endpoint": "https://audius-discovery-7.cultur3stake.com", - "delegateOwnerWallet": "0xb03478a9e8fB1516AA91b272Afc7422b1c71D837" + endpoint: 'https://audius-discovery-7.cultur3stake.com', + delegateOwnerWallet: '0xb03478a9e8fB1516AA91b272Afc7422b1c71D837' }, { - "endpoint": "https://audius-discovery-8.cultur3stake.com", - "delegateOwnerWallet": "0x9D0a106E6cE7643DF87914c7387b3d864bfA152B" + endpoint: 'https://audius-discovery-8.cultur3stake.com', + delegateOwnerWallet: '0x9D0a106E6cE7643DF87914c7387b3d864bfA152B' }, { - "endpoint": "https://audius-discovery-10.cultur3stake.com", - "delegateOwnerWallet": "0x241Da559e97d2e76f37F7144a04623849Fa576ff" + endpoint: 'https://audius-discovery-10.cultur3stake.com', + delegateOwnerWallet: '0x241Da559e97d2e76f37F7144a04623849Fa576ff' }, { - "endpoint": "https://audius-discovery-1.cultur3stake.com", - "delegateOwnerWallet": "0x3f0cbB987b82f620dF313A74999f025E03A11a30" + endpoint: 'https://audius-discovery-1.cultur3stake.com', + delegateOwnerWallet: '0x3f0cbB987b82f620dF313A74999f025E03A11a30' }, { - "endpoint": "https://v.monophonic.digital", - "delegateOwnerWallet": "0x422541273087beC833c57D3c15B9e17F919bFB1F" + endpoint: 'https://v.monophonic.digital', + delegateOwnerWallet: '0x422541273087beC833c57D3c15B9e17F919bFB1F' }, { - "endpoint": "https://validator.stuffisup.com", - "delegateOwnerWallet": "0x3E2Cd6d498b412Da182Ef25837F72355f8918BE9" + endpoint: 'https://validator.stuffisup.com', + delegateOwnerWallet: '0x3E2Cd6d498b412Da182Ef25837F72355f8918BE9' }, { - "endpoint": "https://audius-content-1.figment.io", - "delegateOwnerWallet": "0xBfdE9a7DD3620CB6428463E9A9e9932B4d10fdc5" + endpoint: 'https://audius-content-1.figment.io', + delegateOwnerWallet: '0xBfdE9a7DD3620CB6428463E9A9e9932B4d10fdc5' }, { - "endpoint": "https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud", - "delegateOwnerWallet": "0x675086B880260D217963cF14F503272AEb44b2E9" + endpoint: + 'https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud', + delegateOwnerWallet: '0x675086B880260D217963cF14F503272AEb44b2E9' }, { - "endpoint": "https://audius-content-2.figment.io", - "delegateOwnerWallet": "0x6444212FFc23a4CcF7460f8Fe6D0e6074db59036" + endpoint: 'https://audius-content-2.figment.io', + delegateOwnerWallet: '0x6444212FFc23a4CcF7460f8Fe6D0e6074db59036' }, { - "endpoint": "https://audius-content-3.figment.io", - "delegateOwnerWallet": "0xECEDCaABecb40ef4bE733BA47FaD612aeA1F396F" + endpoint: 'https://audius-content-3.figment.io', + delegateOwnerWallet: '0xECEDCaABecb40ef4bE733BA47FaD612aeA1F396F' }, { - "endpoint": "https://audius-content-4.figment.io", - "delegateOwnerWallet": "0x08fEF3884Db16E2E6211272cdC9Eee68E8b63b09" + endpoint: 'https://audius-content-4.figment.io', + delegateOwnerWallet: '0x08fEF3884Db16E2E6211272cdC9Eee68E8b63b09' }, { - "endpoint": "https://audius-content-5.figment.io", - "delegateOwnerWallet": "0x10fF8197f2e94eF880d940D2414E0A14983c3bFE" + endpoint: 'https://audius-content-5.figment.io', + delegateOwnerWallet: '0x10fF8197f2e94eF880d940D2414E0A14983c3bFE' }, { - "endpoint": "https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud", - "delegateOwnerWallet": "0xC23Ee959E0B22a9B0F5dF18D7e7875cA4B6c4236" + endpoint: + 'https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud', + delegateOwnerWallet: '0xC23Ee959E0B22a9B0F5dF18D7e7875cA4B6c4236' }, { - "endpoint": "https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud", - "delegateOwnerWallet": "0x51a5575dc04c1f5f2e39390d090aaf78554F5f7B" + endpoint: + 'https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud', + delegateOwnerWallet: '0x51a5575dc04c1f5f2e39390d090aaf78554F5f7B' }, { - "endpoint": "https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud", - "delegateOwnerWallet": "0xe0b56BAe2276E016d3DB314Dd7374e596B0457ac" + endpoint: + 'https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud', + delegateOwnerWallet: '0xe0b56BAe2276E016d3DB314Dd7374e596B0457ac' }, { - "endpoint": "https://audius-content-6.figment.io", - "delegateOwnerWallet": "0x68a4Bd6b4177ffB025AF9844cBE4Fe31348AEE1D" + endpoint: 'https://audius-content-6.figment.io', + delegateOwnerWallet: '0x68a4Bd6b4177ffB025AF9844cBE4Fe31348AEE1D' }, { - "endpoint": "https://audius-content-7.figment.io", - "delegateOwnerWallet": "0xf45a6DBf3ce0201F4012a19b1fB04D4f05B53a37" + endpoint: 'https://audius-content-7.figment.io', + delegateOwnerWallet: '0xf45a6DBf3ce0201F4012a19b1fB04D4f05B53a37' }, { - "endpoint": "https://audius-content-8.figment.io", - "delegateOwnerWallet": "0x9708Fb04DeA029212126255B311a21F1F884cCB4" + endpoint: 'https://audius-content-8.figment.io', + delegateOwnerWallet: '0x9708Fb04DeA029212126255B311a21F1F884cCB4' }, { - "endpoint": "https://audius-content-9.figment.io", - "delegateOwnerWallet": "0x7c34c9709ed69513D55dF2020e799DA44fC52E6e" + endpoint: 'https://audius-content-9.figment.io', + delegateOwnerWallet: '0x7c34c9709ed69513D55dF2020e799DA44fC52E6e' }, { - "endpoint": "https://audius-content-10.figment.io", - "delegateOwnerWallet": "0xff753331CEa586DD5B23bd21222a3c902909F2dd" + endpoint: 'https://audius-content-10.figment.io', + delegateOwnerWallet: '0xff753331CEa586DD5B23bd21222a3c902909F2dd' }, { - "endpoint": "https://audius-content-11.figment.io", - "delegateOwnerWallet": "0xC9721F892BcC8822eb34237E875BE93904f11073" + endpoint: 'https://audius-content-11.figment.io', + delegateOwnerWallet: '0xC9721F892BcC8822eb34237E875BE93904f11073' }, { - "endpoint": "https://content.grassfed.network", - "delegateOwnerWallet": "0x33Ab85445c8A2690B9488e9fB5E6A9849d3a18d3" + endpoint: 'https://content.grassfed.network', + delegateOwnerWallet: '0x33Ab85445c8A2690B9488e9fB5E6A9849d3a18d3' }, { - "endpoint": "https://blockdaemon-audius-content-01.bdnodes.net", - "delegateOwnerWallet": "0x807C0fba7405aeb8b6a37A974df6259C6aB9bB1e" + endpoint: 'https://blockdaemon-audius-content-01.bdnodes.net', + delegateOwnerWallet: '0x807C0fba7405aeb8b6a37A974df6259C6aB9bB1e' }, { - "endpoint": "https://audius-content-1.cultur3stake.com", - "delegateOwnerWallet": "0xCEb6a23d6132Cfe329b3c8E3c45f9DDc28A62Bd4" + endpoint: 'https://audius-content-1.cultur3stake.com', + delegateOwnerWallet: '0xCEb6a23d6132Cfe329b3c8E3c45f9DDc28A62Bd4' }, { - "endpoint": "https://audius-content-2.cultur3stake.com", - "delegateOwnerWallet": "0x2e9e7A4e35C3136fB651a0dBF8f91c9f5C27BBf7" + endpoint: 'https://audius-content-2.cultur3stake.com', + delegateOwnerWallet: '0x2e9e7A4e35C3136fB651a0dBF8f91c9f5C27BBf7' }, { - "endpoint": "https://audius-content-3.cultur3stake.com", - "delegateOwnerWallet": "0x742da6cAc2782FeA961bB7B9150a048F5167D1e1" + endpoint: 'https://audius-content-3.cultur3stake.com', + delegateOwnerWallet: '0x742da6cAc2782FeA961bB7B9150a048F5167D1e1' }, { - "endpoint": "https://audius-content-4.cultur3stake.com", - "delegateOwnerWallet": "0xcbb0cE7481685587b0988195Ff0cD6AA1A701657" + endpoint: 'https://audius-content-4.cultur3stake.com', + delegateOwnerWallet: '0xcbb0cE7481685587b0988195Ff0cD6AA1A701657' }, { - "endpoint": "https://audius-content-5.cultur3stake.com", - "delegateOwnerWallet": "0xFec4708155277D35d568aD6Ca322262577683584" + endpoint: 'https://audius-content-5.cultur3stake.com', + delegateOwnerWallet: '0xFec4708155277D35d568aD6Ca322262577683584' }, { - "endpoint": "https://audius-content-6.cultur3stake.com", - "delegateOwnerWallet": "0x3Db0E61591063310eEd22fd57E6f7F1ab2Bb538E" + endpoint: 'https://audius-content-6.cultur3stake.com', + delegateOwnerWallet: '0x3Db0E61591063310eEd22fd57E6f7F1ab2Bb538E' }, { - "endpoint": "https://audius-content-7.cultur3stake.com", - "delegateOwnerWallet": "0xE6C00e7E8d582fD2856718a5439f1aeEB68e27E5" + endpoint: 'https://audius-content-7.cultur3stake.com', + delegateOwnerWallet: '0xE6C00e7E8d582fD2856718a5439f1aeEB68e27E5' }, { - "endpoint": "https://blockdaemon-audius-content-02.bdnodes.net", - "delegateOwnerWallet": "0x4Ad694B3fC34b3cC245aF6AA7B43C52ddD0d7AAE" + endpoint: 'https://blockdaemon-audius-content-02.bdnodes.net', + delegateOwnerWallet: '0x4Ad694B3fC34b3cC245aF6AA7B43C52ddD0d7AAE' }, { - "endpoint": "https://blockdaemon-audius-content-03.bdnodes.net", - "delegateOwnerWallet": "0x8ea81225013719950E968DE0602c4Eca458fA9f4" + endpoint: 'https://blockdaemon-audius-content-03.bdnodes.net', + delegateOwnerWallet: '0x8ea81225013719950E968DE0602c4Eca458fA9f4' }, { - "endpoint": "https://audius-content-8.cultur3stake.com", - "delegateOwnerWallet": "0xff432F81D0eb77DA5973Cf55e24A897882fdd3E6" + endpoint: 'https://audius-content-8.cultur3stake.com', + delegateOwnerWallet: '0xff432F81D0eb77DA5973Cf55e24A897882fdd3E6' }, { - "endpoint": "https://audius-content-9.cultur3stake.com", - "delegateOwnerWallet": "0xB6f506557B2e9026743FeA6157e52F204D26690F" + endpoint: 'https://audius-content-9.cultur3stake.com', + delegateOwnerWallet: '0xB6f506557B2e9026743FeA6157e52F204D26690F' }, { - "endpoint": "https://audius-content-10.cultur3stake.com", - "delegateOwnerWallet": "0x2AF4598D3CF95D8e76987c02BC8A8D71F58d49d5" + endpoint: 'https://audius-content-10.cultur3stake.com', + delegateOwnerWallet: '0x2AF4598D3CF95D8e76987c02BC8A8D71F58d49d5' }, { - "endpoint": "https://audius-content-11.cultur3stake.com", - "delegateOwnerWallet": "0xB2684Cca5281d2bA6D9Ce66Cca215635FF2Ba466" + endpoint: 'https://audius-content-11.cultur3stake.com', + delegateOwnerWallet: '0xB2684Cca5281d2bA6D9Ce66Cca215635FF2Ba466' }, { - "endpoint": "https://audius-content-12.cultur3stake.com", - "delegateOwnerWallet": "0x28924C99822eA08bFCeDdE3a411308633948b349" + endpoint: 'https://audius-content-12.cultur3stake.com', + delegateOwnerWallet: '0x28924C99822eA08bFCeDdE3a411308633948b349' }, { - "endpoint": "https://audius-content-13.cultur3stake.com", - "delegateOwnerWallet": "0xcb23908aa0dCDef762ebEaA38391D8fFC69E6e8F" + endpoint: 'https://audius-content-13.cultur3stake.com', + delegateOwnerWallet: '0xcb23908aa0dCDef762ebEaA38391D8fFC69E6e8F' }, { - "endpoint": "https://audius-content-12.figment.io", - "delegateOwnerWallet": "0x780641e157621621658F118375dc1B36Ea514d46" + endpoint: 'https://audius-content-12.figment.io', + delegateOwnerWallet: '0x780641e157621621658F118375dc1B36Ea514d46' }, { - "endpoint": "https://cn0.mainnet.audiusindex.org", - "delegateOwnerWallet": "0xf9b373E223b73473C59034072263f52aEF60133B" + endpoint: 'https://cn0.mainnet.audiusindex.org', + delegateOwnerWallet: '0xf9b373E223b73473C59034072263f52aEF60133B' }, { - "endpoint": "https://cn1.mainnet.audiusindex.org", - "delegateOwnerWallet": "0x9b0D01bd7F01BD6916Ba139743Ce9C524B9375Dd" + endpoint: 'https://cn1.mainnet.audiusindex.org', + delegateOwnerWallet: '0x9b0D01bd7F01BD6916Ba139743Ce9C524B9375Dd' }, { - "endpoint": "https://cn2.mainnet.audiusindex.org", - "delegateOwnerWallet": "0xf6e297203c0086dc229DAE17F5b61a15F42A1A00" + endpoint: 'https://cn2.mainnet.audiusindex.org', + delegateOwnerWallet: '0xf6e297203c0086dc229DAE17F5b61a15F42A1A00' }, { - "endpoint": "https://cn3.mainnet.audiusindex.org", - "delegateOwnerWallet": "0x24C4b2cb6eC4c87a03F66723d8750dbe98Fa3e4f" + endpoint: 'https://cn3.mainnet.audiusindex.org', + delegateOwnerWallet: '0x24C4b2cb6eC4c87a03F66723d8750dbe98Fa3e4f' }, { - "endpoint": "https://audius-content-13.figment.io", - "delegateOwnerWallet": "0x33a2da466B14990E0124383204b06F9196f62d8e" + endpoint: 'https://audius-content-13.figment.io', + delegateOwnerWallet: '0x33a2da466B14990E0124383204b06F9196f62d8e' }, { - "endpoint": "https://audius-content-14.figment.io", - "delegateOwnerWallet": "0x817c513C1B702eA0BdD4F8C1204C60372f715006" + endpoint: 'https://audius-content-14.figment.io', + delegateOwnerWallet: '0x817c513C1B702eA0BdD4F8C1204C60372f715006' }, { - "endpoint": "https://cn4.mainnet.audiusindex.org", - "delegateOwnerWallet": "0x69e749266C59757dA81F8C659Be6B07ce5Bac6C9" + endpoint: 'https://cn4.mainnet.audiusindex.org', + delegateOwnerWallet: '0x69e749266C59757dA81F8C659Be6B07ce5Bac6C9' }, { - "endpoint": "https://audius-creator-1.theblueprint.xyz", - "delegateOwnerWallet": "0x0E0aF7035581C615d07372be16D99A9B64E5B2e9" + endpoint: 'https://audius-creator-1.theblueprint.xyz', + delegateOwnerWallet: '0x0E0aF7035581C615d07372be16D99A9B64E5B2e9' }, { - "endpoint": "https://audius-creator-2.theblueprint.xyz", - "delegateOwnerWallet": "0x3D0dD2Cd46c2658d228769f4a394662946A28987" + endpoint: 'https://audius-creator-2.theblueprint.xyz', + delegateOwnerWallet: '0x3D0dD2Cd46c2658d228769f4a394662946A28987' }, { - "endpoint": "https://audius-creator-3.theblueprint.xyz", - "delegateOwnerWallet": "0x292B0d5987a7DE879909C48a54f0853C211da5f3" + endpoint: 'https://audius-creator-3.theblueprint.xyz', + delegateOwnerWallet: '0x292B0d5987a7DE879909C48a54f0853C211da5f3' }, { - "endpoint": "https://audius-creator-4.theblueprint.xyz", - "delegateOwnerWallet": "0xA815f8108C2772D24D7DCB866c861148f043224D" + endpoint: 'https://audius-creator-4.theblueprint.xyz', + delegateOwnerWallet: '0xA815f8108C2772D24D7DCB866c861148f043224D' }, { - "endpoint": "https://audius-creator-5.theblueprint.xyz", - "delegateOwnerWallet": "0x65Fe5BEf65A0E0b0520d6beE7767ea6Da7f792f6" + endpoint: 'https://audius-creator-5.theblueprint.xyz', + delegateOwnerWallet: '0x65Fe5BEf65A0E0b0520d6beE7767ea6Da7f792f6' }, { - "endpoint": "https://audius-creator-6.theblueprint.xyz", - "delegateOwnerWallet": "0x19B026B0f0Dbf619DBf8C4Efb0190308ace56366" + endpoint: 'https://audius-creator-6.theblueprint.xyz', + delegateOwnerWallet: '0x19B026B0f0Dbf619DBf8C4Efb0190308ace56366' }, { - "endpoint": "https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud", - "delegateOwnerWallet": "0xc69F344FCDbc9D747559c968562f682ABfBa442C" + endpoint: + 'https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud', + delegateOwnerWallet: '0xc69F344FCDbc9D747559c968562f682ABfBa442C' }, { - "endpoint": "https://audius-creator-7.theblueprint.xyz", - "delegateOwnerWallet": "0x720758adEa33433833c14e2516fA421261D0875e" + endpoint: 'https://audius-creator-7.theblueprint.xyz', + delegateOwnerWallet: '0x720758adEa33433833c14e2516fA421261D0875e' }, { - "endpoint": "https://cn1.shakespearetech.com", - "delegateOwnerWallet": "0x44955AD360652c302644F564B42D1458C584A4ec" + endpoint: 'https://cn1.shakespearetech.com', + delegateOwnerWallet: '0x44955AD360652c302644F564B42D1458C584A4ec' }, { - "endpoint": "https://audius-creator-8.theblueprint.xyz", - "delegateOwnerWallet": "0x078842E88B82e6a69549043269AE3aADD5581105" + endpoint: 'https://audius-creator-8.theblueprint.xyz', + delegateOwnerWallet: '0x078842E88B82e6a69549043269AE3aADD5581105' }, { - "endpoint": "https://audius-creator-9.theblueprint.xyz", - "delegateOwnerWallet": "0x2DfC8152eF49e91b83638ad2bd0D2F9efC6f65b5" + endpoint: 'https://audius-creator-9.theblueprint.xyz', + delegateOwnerWallet: '0x2DfC8152eF49e91b83638ad2bd0D2F9efC6f65b5' }, { - "endpoint": "https://audius-creator-10.theblueprint.xyz", - "delegateOwnerWallet": "0x97BcBFA8289731d694440795094E831599Ab7A11" + endpoint: 'https://audius-creator-10.theblueprint.xyz', + delegateOwnerWallet: '0x97BcBFA8289731d694440795094E831599Ab7A11' }, { - "endpoint": "https://audius-creator-11.theblueprint.xyz", - "delegateOwnerWallet": "0xfe38c5Ea3579c9333fE302414fe1895F7a320beF" + endpoint: 'https://audius-creator-11.theblueprint.xyz', + delegateOwnerWallet: '0xfe38c5Ea3579c9333fE302414fe1895F7a320beF' }, { - "endpoint": "https://audius-creator-12.theblueprint.xyz", - "delegateOwnerWallet": "0x8C78ef541135e2cb037f91109fb8EE780fa4709d" + endpoint: 'https://audius-creator-12.theblueprint.xyz', + delegateOwnerWallet: '0x8C78ef541135e2cb037f91109fb8EE780fa4709d' }, { - "endpoint": "https://audius-creator-13.theblueprint.xyz", - "delegateOwnerWallet": "0x75D2269D18C59CC2ED00a63a40367AC495E3F330" + endpoint: 'https://audius-creator-13.theblueprint.xyz', + delegateOwnerWallet: '0x75D2269D18C59CC2ED00a63a40367AC495E3F330' } ], - "antiAbuseOracleNodes": { - "endpoints": [ - "https://discoveryprovider.audius.co", - "https://audius-oracle.creatorseed.com", - "https://oracle.audius.endl.net" + antiAbuseOracleNodes: { + endpoints: [ + 'https://discoveryprovider.audius.co', + 'https://audius-oracle.creatorseed.com', + 'https://oracle.audius.endl.net' ], - "registeredAddresses": [ - "0x9811BA3eAB1F2Cd9A2dFeDB19e8c2a69729DC8b6", - "0xe60d50356cd891f56B744165fcc1D8B352201A76", - "0x7A03cFAE79266683D9706731D6E187868E939c9C" + registeredAddresses: [ + '0x9811BA3eAB1F2Cd9A2dFeDB19e8c2a69729DC8b6', + '0xe60d50356cd891f56B744165fcc1D8B352201A76', + '0x7A03cFAE79266683D9706731D6E187868E939c9C' ] }, - "identityService": "https://identityservice.audius.co" + identityService: 'https://identityservice.audius.co' }, - "acdc": { - "entityManagerContractAddress": "0x1Cd8a543596D499B9b6E7a6eC15ECd2B7857Fd64", - "chainId": 31524 + acdc: { + entityManagerContractAddress: '0x1Cd8a543596D499B9b6E7a6eC15ECd2B7857Fd64', + chainId: 31524 }, - "solana": { - "claimableTokensProgramAddress": "Ewkv3JahEFRKkcJmpoKB7pXbnUHwjAyXiwEo4ZY2rezQ", - "rewardManagerProgramAddress": "DDZDcYdQFEMwcu2Mwo75yGFjJ1mUQyyXLWzhZLEVFcei", - "rewardManagerStateAddress": "71hWFVYokLaN1PNYzTAWi13EfJ7Xt9VbSWUKsXUT8mxE", - "paymentRouterProgramAddress": "paytYpX3LPN98TAeen6bFFeraGSuWnomZmCXjAsoqPa", - "stakingBridgeProgramAddress": "stkB5DZziVJT1C1VmzvDdRtdWxfs5nwcHViiaNBDK31", - "rpcEndpoint": "https://carolina-8qh733-fast-mainnet.helius-rpc.com", - "usdcTokenMint": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v", - "wAudioTokenMint": "9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM", - "rewardManagerLookupTableAddress": "4UQwpGupH66RgQrWRqmPM9Two6VJEE68VZ7GeqZ3mvVv" + solana: { + claimableTokensProgramAddress: + 'Ewkv3JahEFRKkcJmpoKB7pXbnUHwjAyXiwEo4ZY2rezQ', + rewardManagerProgramAddress: 'DDZDcYdQFEMwcu2Mwo75yGFjJ1mUQyyXLWzhZLEVFcei', + rewardManagerStateAddress: '71hWFVYokLaN1PNYzTAWi13EfJ7Xt9VbSWUKsXUT8mxE', + paymentRouterProgramAddress: 'paytYpX3LPN98TAeen6bFFeraGSuWnomZmCXjAsoqPa', + stakingBridgeProgramAddress: 'stkB5DZziVJT1C1VmzvDdRtdWxfs5nwcHViiaNBDK31', + rpcEndpoint: 'https://carolina-8qh733-fast-mainnet.helius-rpc.com', + usdcTokenMint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v', + wAudioTokenMint: '9LzCMqDgTKYz9Drzqnpgee3SGa89up3a247ypMj2xrqM', + rewardManagerLookupTableAddress: + '4UQwpGupH66RgQrWRqmPM9Two6VJEE68VZ7GeqZ3mvVv' }, - "ethereum": { - "rpcEndpoint": "https://eth-client.audius.co", - "addresses": { - "ethRewardsManagerAddress": "0x5aa6B99A2B461bA8E97207740f0A689C5C39C3b0", - "serviceProviderFactoryAddress": "0xD17A9bc90c582249e211a4f4b16721e7f65156c8", - "serviceTypeManagerAddress": "0x9EfB0f4F38aFbb4b0984D00C126E97E21b8417C5", - "audiusTokenAddress": "0x18aAA7115705e8be94bfFEBDE57Af9BFc265B998", - "audiusWormholeAddress": "0x6E7a1F7339bbB62b23D44797b63e4258d283E095", - "delegateManagerAddress": "0x4d7968ebfD390D5E7926Cb3587C39eFf2F9FB225", - "stakingAddress": "0xe6D97B2099F142513be7A2a068bE040656Ae4591" + ethereum: { + rpcEndpoint: 'https://eth-client.audius.co', + addresses: { + ethRewardsManagerAddress: '0x5aa6B99A2B461bA8E97207740f0A689C5C39C3b0', + serviceProviderFactoryAddress: + '0xD17A9bc90c582249e211a4f4b16721e7f65156c8', + serviceTypeManagerAddress: '0x9EfB0f4F38aFbb4b0984D00C126E97E21b8417C5', + audiusTokenAddress: '0x18aAA7115705e8be94bfFEBDE57Af9BFc265B998', + audiusWormholeAddress: '0x6E7a1F7339bbB62b23D44797b63e4258d283E095', + delegateManagerAddress: '0x4d7968ebfD390D5E7926Cb3587C39eFf2F9FB225', + stakingAddress: '0xe6D97B2099F142513be7A2a068bE040656Ae4591' } } } diff --git a/packages/sdk/src/sdk/index.ts b/packages/sdk/src/sdk/index.ts index 33d7fe50be2..a9918f3f016 100644 --- a/packages/sdk/src/sdk/index.ts +++ b/packages/sdk/src/sdk/index.ts @@ -1,7 +1,6 @@ /* eslint-disable import/export */ export { sdk } from './sdk' export type { AudiusSdk } from './sdk' -export * as full from './api/generated/full' export * from './api/generated/default' export { TracksApi } from './api/tracks/TracksApi' export { PlaylistsApi } from './api/playlists/PlaylistsApi' @@ -17,7 +16,7 @@ export { GetAudioTransactionHistorySortMethodEnum, GetAudioTransactionHistorySortDirectionEnum, GetNotificationsTypesEnum -} from './api/generated/full' +} from './api/generated/default' export { ChallengeId } from './api/challenges/types' export * from './api/chats/clientTypes' export * from './api/chats/serverTypes' diff --git a/packages/sdk/src/sdk/sdk.ts b/packages/sdk/src/sdk/sdk.ts index 9669a1efb6d..b188cfe6cfc 100644 --- a/packages/sdk/src/sdk/sdk.ts +++ b/packages/sdk/src/sdk/sdk.ts @@ -15,23 +15,10 @@ import { ExploreApi, PrizesApi, RewardsApi, + SearchApi, TipsApi, WalletApi } from './api/generated/default' -import { - TracksApi as TracksApiFull, - Configuration as ConfigurationFull, - PlaylistsApi as PlaylistsApiFull, - ReactionsApi as ReactionsApiFull, - SearchApi as SearchApiFull, - UsersApi as UsersApiFull, - TipsApi as TipsApiFull, - TransactionsApi as TransactionsApiFull, - NotificationsApi as NotificationsApiFull, - CidDataApi as CidDataApiFull, - CommentsApi as CommentsApiFull, - ExploreApi as ExploreApiFull -} from './api/generated/full' import { GrantsApi } from './api/grants/GrantsApi' import { NotificationsApi } from './api/notifications/NotificationsApi' import { PlaylistsApi } from './api/playlists/PlaylistsApi' @@ -516,32 +503,13 @@ const initializeApis = ({ services.entityManager ) - const generatedApiClientConfigFull = new ConfigurationFull({ - basePath: `${basePath}/full`, - fetchApi: fetch, - middleware - }) - const events = new EventsApi( apiClientConfig, services.entityManager, services.logger ) const explore = new ExploreApi(apiClientConfig) - - const full = { - tracks: new TracksApiFull(generatedApiClientConfigFull), - users: new UsersApiFull(generatedApiClientConfigFull), - search: new SearchApiFull(generatedApiClientConfigFull), - playlists: new PlaylistsApiFull(generatedApiClientConfigFull), - reactions: new ReactionsApiFull(generatedApiClientConfigFull), - tips: new TipsApiFull(generatedApiClientConfigFull), - transactions: new TransactionsApiFull(generatedApiClientConfigFull), - notifications: new NotificationsApiFull(generatedApiClientConfigFull), - cidData: new CidDataApiFull(generatedApiClientConfigFull), - comments: new CommentsApiFull(generatedApiClientConfigFull), - explore: new ExploreApiFull(generatedApiClientConfigFull) - } + const search = new SearchApi(apiClientConfig) return { tracks, @@ -550,7 +518,6 @@ const initializeApis = ({ playlists, tips, resolve, - full, chats, grants, developerApps, @@ -561,6 +528,7 @@ const initializeApis = ({ notifications, events, explore, + search, coins, wallets, challenges, diff --git a/packages/web/e2e/data.ts b/packages/web/e2e/data.ts index fe052c808ab..c6e78f5f994 100644 --- a/packages/web/e2e/data.ts +++ b/packages/web/e2e/data.ts @@ -1,7 +1,7 @@ import { readFileSync } from 'fs' import path from 'path' -import type { full } from '@audius/sdk' +import type { Track, Playlist } from '@audius/sdk' const runAgainstLocalStack = process.env.RUN_AGAINST_STAGE !== 'true' @@ -38,7 +38,7 @@ export const getUser = () => { export const getTrack = () => { if (runAgainstLocalStack) { - return track() as Pick + return track() as Pick } return { @@ -96,7 +96,7 @@ export const getRemixes = () => { export const getAlbum = () => { if (runAgainstLocalStack) { - return album() as Pick + return album() as Pick } return { @@ -107,7 +107,7 @@ export const getAlbum = () => { export const getEditableAlbum = () => { if (runAgainstLocalStack) { - return album2() as Pick + return album2() as Pick } // TODO: Find one for stage or eliminate stage testing diff --git a/packages/web/scripts/workers-site/index.js b/packages/web/scripts/workers-site/index.js index b623e3d329f..3ec9f8ef79e 100644 --- a/packages/web/scripts/workers-site/index.js +++ b/packages/web/scripts/workers-site/index.js @@ -80,13 +80,13 @@ async function getMetadata(pathname, apiEndpoint) { case 'playlist': { const { handle, title } = route.params if (!handle || !title) return { metadata: null, name: null } - apiRequestPath = `v1/full/playlists/by_permalink/${handle}/${title}` + apiRequestPath = `v1/playlists/by_permalink/${handle}/${title}` break } case 'album': { const { handle, title } = route.params if (!handle || !title) return { metadata: null, name: null } - apiRequestPath = `v1/full/playlists/by_permalink/${handle}/${title}` + apiRequestPath = `v1/playlists/by_permalink/${handle}/${title}` break } default: diff --git a/packages/web/src/common/store/cache/collections/commonSagas.ts b/packages/web/src/common/store/cache/collections/commonSagas.ts index 2a8920641bd..07c6f9bcca7 100644 --- a/packages/web/src/common/store/cache/collections/commonSagas.ts +++ b/packages/web/src/common/store/cache/collections/commonSagas.ts @@ -210,7 +210,7 @@ function* confirmEditPlaylist( }) } const { data: playlist } = yield* call( - [sdk.full.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { userId: OptionalId.parse(userId), playlistId: Id.parse(playlistId) @@ -514,7 +514,7 @@ function* confirmPublishPlaylist( }) const { data } = yield* call( - [sdk.full.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { userId: OptionalId.parse(userId), playlistId: Id.parse(playlistId) diff --git a/packages/web/src/common/store/cache/collections/createAlbumSaga.ts b/packages/web/src/common/store/cache/collections/createAlbumSaga.ts index 32120f0b9cf..386b2cc0e3e 100644 --- a/packages/web/src/common/store/cache/collections/createAlbumSaga.ts +++ b/packages/web/src/common/store/cache/collections/createAlbumSaga.ts @@ -186,7 +186,7 @@ function* createAndConfirmAlbum( }) const { data: album } = yield* call( - [sdk.full.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { userId: OptionalId.parse(userId), playlistId: Id.parse(albumId) diff --git a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts index fc6293374bd..808ff4c1890 100644 --- a/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts +++ b/packages/web/src/common/store/cache/collections/createPlaylistSaga.ts @@ -211,7 +211,7 @@ function* createAndConfirmPlaylist( // Merge the confirmed playlist with the optimistic playlist, preferring // optimistic data in case other unconfirmed edits have been made. const { data: playlist } = yield* call( - [sdk.full.playlists, sdk.full.playlists.getPlaylist], + [sdk.playlists, sdk.playlists.getPlaylist], { userId: OptionalId.parse(userId), playlistId: Id.parse(playlistId) diff --git a/packages/web/src/common/store/cache/tracks/sagas.ts b/packages/web/src/common/store/cache/tracks/sagas.ts index 24a00058ecd..0b6302f36de 100644 --- a/packages/web/src/common/store/cache/tracks/sagas.ts +++ b/packages/web/src/common/store/cache/tracks/sagas.ts @@ -228,10 +228,10 @@ function* confirmEditTrack( generatePreview }) - const { data } = yield* call( - [sdk.full.tracks, sdk.full.tracks.getTrack], - { trackId: Id.parse(trackId), userId: OptionalId.parse(userId) } - ) + const { data } = yield* call([sdk.tracks, sdk.tracks.getTrack], { + trackId: Id.parse(trackId), + userId: OptionalId.parse(userId) + }) return data ? userTrackMetadataFromSDK(data) : null }, function* (confirmedTrack: TrackMetadataForUpload & Track) { @@ -313,10 +313,10 @@ function* confirmDeleteTrack(track: Track) { const track = yield* queryTrack(trackId) if (!track) return - const { data } = yield* call( - [sdk.full.tracks, sdk.full.tracks.getTrack], - { trackId: Id.parse(trackId), userId: OptionalId.parse(userId) } - ) + const { data } = yield* call([sdk.tracks, sdk.tracks.getTrack], { + trackId: Id.parse(trackId), + userId: OptionalId.parse(userId) + }) return data ? userTrackMetadataFromSDK(data) : null }, function* (deletedTrack: Track) { diff --git a/packages/web/src/common/store/pages/feed/lineup/sagas.ts b/packages/web/src/common/store/pages/feed/lineup/sagas.ts index e17cc8011d8..248fc10d21c 100644 --- a/packages/web/src/common/store/pages/feed/lineup/sagas.ts +++ b/packages/web/src/common/store/pages/feed/lineup/sagas.ts @@ -22,7 +22,7 @@ import { CommonState, getSDK } from '@audius/common/store' -import { Id, full } from '@audius/sdk' +import { Id, type GetUserFeedFilterEnum } from '@audius/sdk' import { all, call, select } from 'typed-redux-saga' import { LineupSagas } from 'common/store/lineup/sagas' @@ -33,7 +33,7 @@ const { getFeedFilter } = feedPageSelectors type FeedItem = LineupTrack | Collection -const filterMap: { [k in FeedFilter]: full.GetUserFeedFilterEnum } = { +const filterMap: { [k in FeedFilter]: GetUserFeedFilterEnum } = { [FeedFilter.ALL]: 'all', [FeedFilter.ORIGINAL]: 'original', [FeedFilter.REPOST]: 'repost' @@ -59,18 +59,15 @@ function* getTracks({ const followeeUserIds = yield* select(getFollowIds) const userId = Id.parse(currentUserId) - const { data = [] } = yield* call( - [sdk.full.users, sdk.full.users.getUserFeed], - { - id: userId, - userId, - filter, - limit, - offset, - followeeUserId: followeeUserIds.length ? followeeUserIds : undefined, - withUsers: true - } - ) + const { data = [] } = yield* call([sdk.users, sdk.users.getUserFeed], { + id: userId, + userId, + filter, + limit, + offset, + followeeUserId: followeeUserIds.length ? followeeUserIds : undefined, + withUsers: true + }) const feed = transformAndCleanList(data, userFeedItemFromSDK).map( ({ item }) => item ) diff --git a/packages/web/src/common/store/pages/library/sagas.ts b/packages/web/src/common/store/pages/library/sagas.ts index 79f52dfe298..eecd317a9b5 100644 --- a/packages/web/src/common/store/pages/library/sagas.ts +++ b/packages/web/src/common/store/pages/library/sagas.ts @@ -12,7 +12,13 @@ import { LibraryCategoryType } from '@audius/common/store' import { Nullable } from '@audius/common/utils' -import { full, HashId, Id } from '@audius/sdk' +import { + HashId, + Id, + type Activity, + GetUserLibraryTracksSortMethodEnum, + GetUserLibraryTracksSortDirectionEnum +} from '@audius/sdk' import { call, fork, put, select, takeLatest } from 'typed-redux-saga' import { waitForRead } from 'utils/sagaHelpers' @@ -56,16 +62,15 @@ function* sendLibraryRequest({ const sdk = yield* call(audiusSdk) const libraryTracksResponse = yield* call( - [sdk.full.users, sdk.full.users.getUserLibraryTracks], + [sdk.users, sdk.users.getUserLibraryTracks], { id: Id.parse(userId), userId: Id.parse(userId), offset, limit, query, - sortMethod: sortMethod as full.GetUserLibraryTracksSortMethodEnum, - sortDirection: - sortDirection as full.GetUserLibraryTracksSortDirectionEnum, + sortMethod: sortMethod as GetUserLibraryTracksSortMethodEnum, + sortDirection: sortDirection as GetUserLibraryTracksSortDirectionEnum, type: category } ) @@ -73,7 +78,7 @@ function* sendLibraryRequest({ const libraryTracksResponseData = libraryTracksResponse.data ?? [] const tracks = transformAndCleanList( libraryTracksResponse.data, - (activity: full.ActivityFull) => trackActivityFromSDK(activity)?.item + (activity: Activity) => trackActivityFromSDK(activity)?.item ) if (!tracks) { diff --git a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts index 049ad4debf7..a4e955059ad 100644 --- a/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts +++ b/packages/web/src/common/store/pages/premium-tracks/lineups/tracks/sagas.ts @@ -28,7 +28,7 @@ function* getPremiumTracks({ const sdk = yield* getSDK() const currentUserId = yield* call(queryCurrentUserId) const { data = [] } = yield* call( - [sdk.full.tracks, sdk.full.tracks.getTrendingUSDCPurchaseTracks], + [sdk.tracks, sdk.tracks.getTrendingUSDCPurchaseTracks], { limit, offset, userId: OptionalId.parse(currentUserId) } ) const tracks = transformAndCleanList(data, userTrackMetadataFromSDK) diff --git a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts index 3dd42ac89fb..82a95ff753b 100644 --- a/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts +++ b/packages/web/src/common/store/pages/profile/lineups/feed/retrieveUserReposts.ts @@ -10,7 +10,7 @@ import { UserCollectionMetadata } from '@audius/common/models' import { getSDK } from '@audius/common/store' -import { OptionalId, full } from '@audius/sdk' +import { OptionalId, type Activity } from '@audius/sdk' import { all } from 'redux-saga/effects' import { waitForRead } from 'utils/sagaHelpers' @@ -48,7 +48,7 @@ export function* retrieveUserReposts({ yield* waitForRead() const sdk = yield* getSDK() - const { data: repostsSDKData } = yield sdk.full.users.getRepostsByHandle({ + const { data: repostsSDKData } = yield sdk.users.getRepostsByHandle({ handle, userId: OptionalId.parse(currentUserId), limit, @@ -57,7 +57,7 @@ export function* retrieveUserReposts({ const reposts = transformAndCleanList( repostsSDKData, // `getTracksAndCollections` below expects a list of just the items - (activity: full.ActivityFull) => repostActivityFromSDK(activity)?.item + (activity: Activity) => repostActivityFromSDK(activity)?.item ) const [tracks, collections] = getTracksAndCollections(reposts) diff --git a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts index c2a5e186c67..35ddd3ecc23 100644 --- a/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts +++ b/packages/web/src/common/store/pages/profile/lineups/tracks/retrieveUserTracks.ts @@ -31,7 +31,7 @@ export function* retrieveUserTracks({ }: RetrieveUserTracksArgs): Generator { const sdk = yield* getSDK() const { data = [] } = yield* call( - [sdk.full.users, sdk.full.users.getTracksByUserHandle], + [sdk.users, sdk.users.getTracksByUserHandle], { handle, sort, diff --git a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts index 8f30c453ff0..ce3561ca673 100644 --- a/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts +++ b/packages/web/src/common/store/pages/trending-underground/lineups/sagas.ts @@ -44,16 +44,14 @@ function* getTrendingUnderground({ const { data = [] } = version ? yield* call( - [ - sdk.full.tracks, - sdk.full.tracks.getUndergroundTrendingTracksWithVersion - ], + [sdk.tracks, sdk.tracks.getUndergroundTrendingTracksWithVersion], { version, offset, limit, userId: OptionalId.parse(currentUserId) } ) - : yield* call( - [sdk.full.tracks, sdk.full.tracks.getUndergroundTrendingTracks], - { offset, limit, userId: OptionalId.parse(currentUserId) } - ) + : yield* call([sdk.tracks, sdk.tracks.getUndergroundTrendingTracks], { + offset, + limit, + userId: OptionalId.parse(currentUserId) + }) let tracks = transformAndCleanList(data, userTrackMetadataFromSDK) diff --git a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts index 95377dd2711..d673d0ecc40 100644 --- a/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts +++ b/packages/web/src/common/store/pages/trending/lineups/trending/retrieveTrending.ts @@ -73,8 +73,8 @@ export function* retrieveTrending({ } const { data = [] } = version - ? yield sdk.full.tracks.getTrendingTracksWithVersion({ ...args, version }) - : yield sdk.full.tracks.getTrendingTracks(args) + ? yield sdk.tracks.getTrendingTracksWithVersion({ ...args, version }) + : yield sdk.tracks.getTrendingTracks(args) let apiTracks = transformAndCleanList(data, userTrackMetadataFromSDK) // DN may return hidden tracks in trending because of its cache diff --git a/packages/web/src/common/store/profile/sagas.js b/packages/web/src/common/store/profile/sagas.js index eb57acbf0dc..278a7ba0c85 100644 --- a/packages/web/src/common/store/profile/sagas.js +++ b/packages/web/src/common/store/profile/sagas.js @@ -154,13 +154,10 @@ function* confirmUpdateProfile(userId, metadata) { } yield waitForAccount() const currentUserId = yield call(queryCurrentUserId) - const { data = [] } = yield call( - [sdk.full.users, sdk.full.users.getUser], - { - id: Id.parse(userId), - userId: Id.parse(currentUserId) - } - ) + const { data = [] } = yield call([sdk.users, sdk.users.getUser], { + id: Id.parse(userId), + userId: Id.parse(currentUserId) + }) return userMetadataListFromSDK(data)[0] }, function* (confirmedUser) { diff --git a/packages/web/src/common/store/recommendation/sagas.ts b/packages/web/src/common/store/recommendation/sagas.ts index f19615f5787..a4ba8d9bd4c 100644 --- a/packages/web/src/common/store/recommendation/sagas.ts +++ b/packages/web/src/common/store/recommendation/sagas.ts @@ -19,15 +19,12 @@ export function* getRecommendedTracks( const sdk = yield* getSDK() - const { data } = yield* call( - [sdk.full.tracks, sdk.full.tracks.getRecommendedTracks], - { - genre, - exclusionList, - limit: remoteConfigInstance.getRemoteVar(IntKeys.AUTOPLAY_LIMIT) || 10, - userId: OptionalId.parse(currentUserId) - } - ) + const { data } = yield* call([sdk.tracks, sdk.tracks.getRecommendedTracks], { + genre, + exclusionList, + limit: remoteConfigInstance.getRemoteVar(IntKeys.AUTOPLAY_LIMIT) || 10, + userId: OptionalId.parse(currentUserId) + }) const tracks = transformAndCleanList(data, userTrackMetadataFromSDK) yield* call(primeTrackDataSaga, tracks) return tracks diff --git a/packages/web/src/common/store/search-ai-bar/sagas.ts b/packages/web/src/common/store/search-ai-bar/sagas.ts index 18ed60c93a6..ea4aa74f1bb 100644 --- a/packages/web/src/common/store/search-ai-bar/sagas.ts +++ b/packages/web/src/common/store/search-ai-bar/sagas.ts @@ -20,16 +20,13 @@ function* getSearchResults(searchText: string) { const sdk = yield* getSDK() const userId = yield* call(queryCurrentUserId) - const { data } = yield* call( - [sdk.full.search, sdk.full.search.searchAutocomplete], - { - userId: OptionalId.parse(userId), - query: searchText, - limit: 10, - offset: 0, - kind: SearchKind.USERS - } - ) + const { data } = yield* call([sdk.search, sdk.search.searchAutocomplete], { + userId: OptionalId.parse(userId), + query: searchText, + limit: 10, + offset: 0, + kind: SearchKind.USERS + }) const results = limitAutocompleteResults(searchResultsFromSDK(data)) const { users } = results diff --git a/packages/web/src/pages/audio-page/AudioWalletTransactions.tsx b/packages/web/src/pages/audio-page/AudioWalletTransactions.tsx index 04dd7178acc..2a630427751 100644 --- a/packages/web/src/pages/audio-page/AudioWalletTransactions.tsx +++ b/packages/web/src/pages/audio-page/AudioWalletTransactions.tsx @@ -10,7 +10,10 @@ import { TransactionDetails } from '@audius/common/store' import { Flex, IconCaretRight, Paper, PlainButton, Text } from '@audius/harmony' -import { full } from '@audius/sdk' +import { + GetAudioTransactionsSortMethodEnum, + GetAudioTransactionsSortDirectionEnum +} from '@audius/sdk' import { useDispatch } from 'react-redux' import { useSetVisibility } from 'common/hooks/useModalState' @@ -60,12 +63,12 @@ const Disclaimer = () => { export const AudioWalletTransactions = () => { const [page, setPage] = useState(0) const [sortMethod, setSortMethod] = - useState( - full.GetAudioTransactionsSortMethodEnum.Date + useState( + GetAudioTransactionsSortMethodEnum.Date ) const [sortDirection, setSortDirection] = - useState( - full.GetAudioTransactionsSortDirectionEnum.Desc + useState( + GetAudioTransactionsSortDirectionEnum.Desc ) const mainContentRef = useMainContentRef() const dispatch = useDispatch() @@ -89,13 +92,13 @@ export const AudioWalletTransactions = () => { (sortMethodInner: string, sortDirectionInner: string) => { const sortMethodRes = sortMethodInner === 'type' - ? full.GetAudioTransactionsSortMethodEnum.TransactionType - : full.GetAudioTransactionsSortMethodEnum.Date + ? GetAudioTransactionsSortMethodEnum.TransactionType + : GetAudioTransactionsSortMethodEnum.Date setSortMethod(sortMethodRes) const sortDirectionRes = sortDirectionInner === 'asc' - ? full.GetAudioTransactionsSortDirectionEnum.Asc - : full.GetAudioTransactionsSortDirectionEnum.Desc + ? GetAudioTransactionsSortDirectionEnum.Asc + : GetAudioTransactionsSortDirectionEnum.Desc setSortDirection(sortDirectionRes) // Reset page when sorting changes setPage(0) diff --git a/packages/web/src/pages/dashboard-page/store/sagas.ts b/packages/web/src/pages/dashboard-page/store/sagas.ts index c713e802513..d78d098fce7 100644 --- a/packages/web/src/pages/dashboard-page/store/sagas.ts +++ b/packages/web/src/pages/dashboard-page/store/sagas.ts @@ -81,24 +81,23 @@ function* fetchDashboardAsync( limit, getUnlisted: true }), - call([sdk.full.users, sdk.full.users.getPlaylistsByUser], { + call([sdk.users, sdk.users.getPlaylistsByUser], { id: Id.parse(accountUserId), userId: OptionalId.parse(accountUserId) }), - call([sdk.full.users, sdk.full.users.getAlbumsByUser], { + call([sdk.users, sdk.users.getAlbumsByUser], { id: Id.parse(accountUserId), userId: OptionalId.parse(accountUserId) }) ]) const tracks = data[0] as Track[] const playlists = transformAndCleanList( - (data[1] as Awaited>) + (data[1] as Awaited>) .data, userCollectionMetadataFromSDK ) const albums = transformAndCleanList( - (data[2] as Awaited>) - .data, + (data[2] as Awaited>).data, userCollectionMetadataFromSDK ) const collections = [...playlists, ...albums] diff --git a/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx b/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx index 10b401d54f6..bd27c0d9c3e 100644 --- a/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx +++ b/packages/web/src/pages/history-page/components/desktop/HistoryPage.tsx @@ -9,7 +9,10 @@ import { IconPlay, useTheme } from '@audius/harmony' -import { full } from '@audius/sdk' +import { + GetUsersTrackHistorySortMethodEnum, + GetUsersTrackHistorySortDirectionEnum +} from '@audius/sdk' import { useDispatch } from 'react-redux' import { useNavigate } from 'react-router' @@ -51,9 +54,9 @@ export const HistoryPage = ({ title, description }: HistoryPageProps) => { }, []) const [sortMethod, setSortMethod] = - useState() + useState() const [sortDirection, setSortDirection] = - useState() + useState() const handleSort = useCallback(({ column, order }: any) => { setSortMethod(column?.accessor) diff --git a/packages/web/src/pages/library-page/hooks/useLibraryPage.ts b/packages/web/src/pages/library-page/hooks/useLibraryPage.ts index 1dfaaa46649..362a940ee46 100644 --- a/packages/web/src/pages/library-page/hooks/useLibraryPage.ts +++ b/packages/web/src/pages/library-page/hooks/useLibraryPage.ts @@ -31,7 +31,7 @@ import { useLineupTable } from '@audius/common/store' import { route } from '@audius/common/utils' -import { full } from '@audius/sdk' +import { GetUserLibraryTracksSortMethodEnum } from '@audius/sdk' import { debounce } from 'lodash' import { useDispatch, useSelector } from 'react-redux' @@ -52,17 +52,15 @@ const messages = { description: "View tracks that you've favorited" } -const { GetFavoritesSortMethodEnum } = full - const sortMethodMap: Record = { - title: GetFavoritesSortMethodEnum.Title, - artist: GetFavoritesSortMethodEnum.ArtistName, - created_at: GetFavoritesSortMethodEnum.ReleaseDate, - dateListened: GetFavoritesSortMethodEnum.LastListenDate, - dateSaved: GetFavoritesSortMethodEnum.AddedDate, - dateAdded: GetFavoritesSortMethodEnum.AddedDate, - plays: GetFavoritesSortMethodEnum.Plays, - repost_count: GetFavoritesSortMethodEnum.Reposts + title: GetUserLibraryTracksSortMethodEnum.Title, + artist: GetUserLibraryTracksSortMethodEnum.ArtistName, + created_at: GetUserLibraryTracksSortMethodEnum.ReleaseDate, + dateListened: GetUserLibraryTracksSortMethodEnum.LastListenDate, + dateSaved: GetUserLibraryTracksSortMethodEnum.AddedDate, + dateAdded: GetUserLibraryTracksSortMethodEnum.AddedDate, + plays: GetUserLibraryTracksSortMethodEnum.Plays, + repost_count: GetUserLibraryTracksSortMethodEnum.Reposts } type LibraryPageState = { diff --git a/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx b/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx index 8ce48501068..2dcb9298bb9 100644 --- a/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx +++ b/packages/web/src/pages/oauth-login-page/OAuthLoginPage.tsx @@ -199,7 +199,7 @@ export const OAuthLoginPage = () => { ) const sdk = await audiusSdk() - const { data } = await sdk.full.users.getUserAccount({ + const { data } = await sdk.users.getUserAccount({ wallet: signInResponse.walletAddress }) if (!data) { diff --git a/packages/web/src/pages/oauth-login-page/OAuthSignUpPage.tsx b/packages/web/src/pages/oauth-login-page/OAuthSignUpPage.tsx index f6ee020bbea..fecc2b01f29 100644 --- a/packages/web/src/pages/oauth-login-page/OAuthSignUpPage.tsx +++ b/packages/web/src/pages/oauth-login-page/OAuthSignUpPage.tsx @@ -133,7 +133,7 @@ export const OAuthSignUpPage = () => { const maxRetries = 15 while (retries < maxRetries) { try { - const response = await sdk.full.users.getUserAccount({ + const response = await sdk.users.getUserAccount({ wallet }) if (response.data) { diff --git a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx index 3ebaa8dae8a..b9f46b1e2dd 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/PurchasesTab.tsx @@ -8,7 +8,11 @@ import { import { USDCPurchaseDetails } from '@audius/common/models' import { useUSDCPurchaseDetailsModal } from '@audius/common/store' import { route } from '@audius/common/utils' -import { Id, full } from '@audius/sdk' +import { + Id, + GetPurchasesSortMethodEnum, + GetPurchasesSortDirectionEnum +} from '@audius/sdk' import { useDispatch } from 'react-redux' import { useIsMobile } from 'hooks/useIsMobile' @@ -43,22 +47,22 @@ const messages = { const TRANSACTIONS_BATCH_SIZE = 50 const sortMethods: { - [k in PurchasesTableSortMethod]: full.GetPurchasesSortMethodEnum + [k in PurchasesTableSortMethod]: GetPurchasesSortMethodEnum } = { - contentId: full.GetPurchasesSortMethodEnum.ContentTitle, - createdAt: full.GetPurchasesSortMethodEnum.Date, - sellerUserId: full.GetPurchasesSortMethodEnum.ArtistName + contentId: GetPurchasesSortMethodEnum.ContentTitle, + createdAt: GetPurchasesSortMethodEnum.Date, + sellerUserId: GetPurchasesSortMethodEnum.ArtistName } const sortDirections: { - [k in PurchasesTableSortDirection]: full.GetPurchasesSortDirectionEnum + [k in PurchasesTableSortDirection]: GetPurchasesSortDirectionEnum } = { - asc: full.GetPurchasesSortDirectionEnum.Asc, - desc: full.GetPurchasesSortDirectionEnum.Desc + asc: GetPurchasesSortDirectionEnum.Asc, + desc: GetPurchasesSortDirectionEnum.Desc } -const DEFAULT_SORT_METHOD = full.GetPurchasesSortMethodEnum.Date -const DEFAULT_SORT_DIRECTION = full.GetPurchasesSortDirectionEnum.Desc +const DEFAULT_SORT_METHOD = GetPurchasesSortMethodEnum.Date +const DEFAULT_SORT_DIRECTION = GetPurchasesSortDirectionEnum.Desc const NoPurchases = () => { const dispatch = useDispatch() @@ -81,9 +85,9 @@ export const usePurchases = () => { const dispatch = useDispatch() // Defaults: sort method = date, sort direction = desc const [sortMethod, setSortMethod] = - useState(DEFAULT_SORT_METHOD) + useState(DEFAULT_SORT_METHOD) const [sortDirection, setSortDirection] = - useState(DEFAULT_SORT_DIRECTION) + useState(DEFAULT_SORT_DIRECTION) const { onOpen: openDetailsModal } = useUSDCPurchaseDetailsModal() diff --git a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx index 45a3847b178..c2aa930a672 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/SalesTab.tsx @@ -12,7 +12,11 @@ import { FeatureFlags } from '@audius/common/services' import { useUSDCPurchaseDetailsModal } from '@audius/common/store' import { route } from '@audius/common/utils' import { Flex, IconMoneyBracket, Text, useTheme } from '@audius/harmony' -import { Id, full } from '@audius/sdk' +import { + Id, + GetSalesSortMethodEnum, + GetSalesSortDirectionEnum +} from '@audius/sdk' import { useDispatch } from 'react-redux' import { ExternalTextLink } from 'components/link' @@ -52,22 +56,22 @@ const messages = { const TRANSACTIONS_BATCH_SIZE = 50 const sortMethods: { - [k in SalesTableSortMethod]: full.GetSalesSortMethodEnum + [k in SalesTableSortMethod]: GetSalesSortMethodEnum } = { - contentId: full.GetSalesSortMethodEnum.ContentTitle, - createdAt: full.GetSalesSortMethodEnum.Date, - buyerUserId: full.GetSalesSortMethodEnum.BuyerName + contentId: GetSalesSortMethodEnum.ContentTitle, + createdAt: GetSalesSortMethodEnum.Date, + buyerUserId: GetSalesSortMethodEnum.BuyerName } const sortDirections: { - [k in SalesTableSortDirection]: full.GetSalesSortDirectionEnum + [k in SalesTableSortDirection]: GetSalesSortDirectionEnum } = { - asc: full.GetSalesSortDirectionEnum.Asc, - desc: full.GetSalesSortDirectionEnum.Desc + asc: GetSalesSortDirectionEnum.Asc, + desc: GetSalesSortDirectionEnum.Desc } -const DEFAULT_SORT_METHOD = full.GetSalesSortMethodEnum.Date -const DEFAULT_SORT_DIRECTION = full.GetSalesSortDirectionEnum.Desc +const DEFAULT_SORT_METHOD = GetSalesSortMethodEnum.Date +const DEFAULT_SORT_DIRECTION = GetSalesSortDirectionEnum.Desc const NoSales = () => { const dispatch = useDispatch() @@ -92,9 +96,10 @@ export const useSales = () => { // Defaults: sort method = date, sort direction = desc const [sortMethod, setSortMethod] = - useState(DEFAULT_SORT_METHOD) - const [sortDirection, setSortDirection] = - useState(DEFAULT_SORT_DIRECTION) + useState(DEFAULT_SORT_METHOD) + const [sortDirection, setSortDirection] = useState( + DEFAULT_SORT_DIRECTION + ) const { onOpen: openDetailsModal } = useUSDCPurchaseDetailsModal() diff --git a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx index 31addb6ab42..75d62648427 100644 --- a/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx +++ b/packages/web/src/pages/pay-and-earn-page/components/WithdrawalsTab.tsx @@ -14,7 +14,13 @@ import { withdrawUSDCSelectors } from '@audius/common/store' import { USDC } from '@audius/fixed-decimal' -import { Id, full } from '@audius/sdk' +import { + Id, + GetUSDCTransactionsSortDirectionEnum, + GetUSDCTransactionsSortMethodEnum, + GetUSDCTransactionsTypeEnum, + GetUSDCTransactionsMethodEnum +} from '@audius/sdk' import { useDispatch } from 'react-redux' import { ThunkDispatch } from 'redux-thunk' @@ -50,20 +56,20 @@ const messages = { const TRANSACTIONS_BATCH_SIZE = 50 const sortMethods: { - [k in WithdrawalsTableSortMethod]: full.GetUSDCTransactionsSortMethodEnum + [k in WithdrawalsTableSortMethod]: GetUSDCTransactionsSortMethodEnum } = { - date: full.GetUSDCTransactionsSortMethodEnum.Date + date: GetUSDCTransactionsSortMethodEnum.Date } const sortDirections: { - [k in WithdrawalsTableSortDirection]: full.GetUSDCTransactionsSortDirectionEnum + [k in WithdrawalsTableSortDirection]: GetUSDCTransactionsSortDirectionEnum } = { - asc: full.GetUSDCTransactionsSortDirectionEnum.Asc, - desc: full.GetUSDCTransactionsSortDirectionEnum.Desc + asc: GetUSDCTransactionsSortDirectionEnum.Asc, + desc: GetUSDCTransactionsSortDirectionEnum.Desc } -const DEFAULT_SORT_METHOD = full.GetUSDCTransactionsSortMethodEnum.Date -const DEFAULT_SORT_DIRECTION = full.GetUSDCTransactionsSortDirectionEnum.Desc +const DEFAULT_SORT_METHOD = GetUSDCTransactionsSortMethodEnum.Date +const DEFAULT_SORT_DIRECTION = GetUSDCTransactionsSortDirectionEnum.Desc const NoWithdrawals = () => { const { onOpen: openWithdrawUSDCModal } = useWithdrawUSDCModal() @@ -99,8 +105,8 @@ const NoWithdrawals = () => { const useWithdrawalTransactionPoller = ( userId: ID | null | undefined, lastCompletedTransaction: string | undefined, - sortMethod: full.GetUSDCTransactionsSortMethodEnum, - sortDirection: full.GetUSDCTransactionsSortDirectionEnum + sortMethod: GetUSDCTransactionsSortMethodEnum, + sortDirection: GetUSDCTransactionsSortDirectionEnum ) => { const [isPolling, setIsPolling] = useState(false) @@ -116,10 +122,10 @@ const useWithdrawalTransactionPoller = ( sortMethod, sortDirection, type: [ - full.GetUSDCTransactionsTypeEnum.Withdrawal, - full.GetUSDCTransactionsTypeEnum.Transfer + GetUSDCTransactionsTypeEnum.Withdrawal, + GetUSDCTransactionsTypeEnum.Transfer ], - method: full.GetUSDCTransactionsMethodEnum.Send + method: GetUSDCTransactionsMethodEnum.Send }) useEffect(() => { @@ -182,9 +188,9 @@ export const useWithdrawals = () => { ) // Defaults: sort method = date, sort direction = desc const [sortMethod, setSortMethod] = - useState(DEFAULT_SORT_METHOD) + useState(DEFAULT_SORT_METHOD) const [sortDirection, setSortDirection] = - useState(DEFAULT_SORT_DIRECTION) + useState(DEFAULT_SORT_DIRECTION) const { transactions, @@ -205,7 +211,7 @@ export const useWithdrawals = () => { data: transactionsCount, isPending: transactionsCountIsPending } = useUSDCTransactionsCount({ - method: full.GetUSDCTransactionsMethodEnum.Send + method: GetUSDCTransactionsMethodEnum.Send }) // Error handling diff --git a/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx b/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx index 7931dd42ff6..3733b29586d 100644 --- a/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx +++ b/packages/web/src/pages/search-explore-page/components/desktop/RecommendedTracksSection.tsx @@ -1,6 +1,6 @@ import { useRecommendedTracks } from '@audius/common/api' import { exploreMessages as messages } from '@audius/common/messages' -import { full } from '@audius/sdk' +import { GetRecommendedTracksTimeEnum } from '@audius/sdk' import { Carousel } from './Carousel' import { TilePairs, TileSkeletons } from './TileHelpers' @@ -11,7 +11,7 @@ export const RecommendedTracksSection = () => { const { data, isLoading, isError, isSuccess } = useRecommendedTracks( { pageSize: 10, - timeRange: full.GetRecommendedTracksTimeEnum.Week + timeRange: GetRecommendedTracksTimeEnum.Week }, { enabled: inView diff --git a/packages/web/src/pages/sign-up-page/components/useExternalWalletAuth.ts b/packages/web/src/pages/sign-up-page/components/useExternalWalletAuth.ts index 53f54a57955..b9baa40eee3 100644 --- a/packages/web/src/pages/sign-up-page/components/useExternalWalletAuth.ts +++ b/packages/web/src/pages/sign-up-page/components/useExternalWalletAuth.ts @@ -14,7 +14,7 @@ import { appkitModal, audiusChain } from 'app/ReownAppKitModal' */ export const doesUserExist = async (sdk: AudiusSdk, wallet: string) => { try { - const { data } = await sdk.full.users.getUserAccount({ + const { data } = await sdk.users.getUserAccount({ wallet }) if (data?.user) { diff --git a/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx b/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx index 2c29aaf12aa..f7dd661f127 100644 --- a/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx +++ b/packages/web/src/public-site/pages/landing-page/components/FeaturedContent.tsx @@ -112,7 +112,7 @@ const FeaturedContent = (props: FeaturedContentProps) => { .slice(0, 4) .map((id: string) => Id.parse(parseInt(id))) const sdk = await audiusSdk() - const { data } = await sdk.full.playlists.getBulkPlaylists({ + const { data } = await sdk.playlists.getBulkPlaylists({ id: featuredPlaylistIds }) return transformAndCleanList(data, userCollectionMetadataFromSDK) diff --git a/packages/web/src/ssr/collection/+onBeforeRender.ts b/packages/web/src/ssr/collection/+onBeforeRender.ts index 25b4823af57..b26ed144ff2 100644 --- a/packages/web/src/ssr/collection/+onBeforeRender.ts +++ b/packages/web/src/ssr/collection/+onBeforeRender.ts @@ -16,7 +16,7 @@ export async function onBeforeRender(pageContext: PageContextServer) { const { handle, slug } = pageContext.routeParams try { - const requestPath = `v1/full/playlists/by_permalink/${handle}/${slug}` + const requestPath = `v1/playlists/by_permalink/${handle}/${slug}` const requestUrl = `${getApiUrl()}/${requestPath}` const res = await fetch(requestUrl) diff --git a/packages/web/src/ssr/profile/+onBeforeRender.tsx b/packages/web/src/ssr/profile/+onBeforeRender.tsx index b1c73af9d9d..2b353dab01e 100644 --- a/packages/web/src/ssr/profile/+onBeforeRender.tsx +++ b/packages/web/src/ssr/profile/+onBeforeRender.tsx @@ -16,7 +16,7 @@ export async function onBeforeRender(pageContext: PageContextServer) { const { handle } = pageContext.routeParams try { - const requestPath = `v1/full/users/handle/${handle}` + const requestPath = `v1/users/handle/${handle}` const requestUrl = `${getApiUrl()}/${requestPath}` const res = await fetch(requestUrl) diff --git a/packages/web/src/ssr/remixes/+onBeforeRender.tsx b/packages/web/src/ssr/remixes/+onBeforeRender.tsx index 06b7abe1d1f..755b3b2acfe 100644 --- a/packages/web/src/ssr/remixes/+onBeforeRender.tsx +++ b/packages/web/src/ssr/remixes/+onBeforeRender.tsx @@ -18,7 +18,7 @@ export async function onBeforeRender(pageContext: PageContextServer) { const { handle, slug } = pageContext.routeParams try { - const requestPath = `v1/full/tracks?permalink=${handle}/${slug}` + const requestPath = `v1/tracks?permalink=${handle}/${slug}` const requestUrl = `${getApiUrl()}/${requestPath}` const res = await fetch(requestUrl) diff --git a/packages/web/src/ssr/track/+onBeforeRender.tsx b/packages/web/src/ssr/track/+onBeforeRender.tsx index 9ef70aecec2..e4be3382ce2 100644 --- a/packages/web/src/ssr/track/+onBeforeRender.tsx +++ b/packages/web/src/ssr/track/+onBeforeRender.tsx @@ -21,7 +21,7 @@ type TrackPageContextServer = PageContextServer & { // Fetch comment data if commentId is provided async function fetchCommentData(commentId: string) { try { - const url = `${getApiUrl()}/v1/full/comments/${commentId}` + const url = `${getApiUrl()}/v1/comments/${commentId}` const res = await fetch(url) if (res.status !== 200) { return null @@ -49,7 +49,7 @@ export async function onBeforeRender(pageContext: TrackPageContextServer) { const { commentId } = pageContext.urlParsed.search ?? {} try { - const requestPath = `v1/full/tracks?permalink=${handle}/${slug}` + const requestPath = `v1/tracks?permalink=${handle}/${slug}` const requestUrl = `${getApiUrl()}/${requestPath}` const res = await fetch(requestUrl) diff --git a/packages/web/src/test/msw/mswMocks.ts b/packages/web/src/test/msw/mswMocks.ts index c3330b6351d..c63cfefff47 100644 --- a/packages/web/src/test/msw/mswMocks.ts +++ b/packages/web/src/test/msw/mswMocks.ts @@ -30,7 +30,7 @@ type TestUser = typeof artistUser | typeof nonArtistUser * User mocks */ export const mockUserByHandle = (user: typeof artistUser) => - http.get(`${apiEndpoint}/v1/full/users/handle/${user.handle}`, () => + http.get(`${apiEndpoint}/v1/users/handle/${user.handle}`, () => HttpResponse.json({ data: [user] }) ) @@ -38,7 +38,7 @@ export const mockRelatedUsers = ( user: typeof artistUser, relatedUsers?: TestUser[] ) => - http.get(`${apiEndpoint}/v1/full/users/${user.id}/related`, () => + http.get(`${apiEndpoint}/v1/users/${user.id}/related`, () => HttpResponse.json({ data: relatedUsers ?? [] }) ) @@ -81,7 +81,7 @@ export const mockCurrentAccount = ( userMetadataFromSDK(user) ) // Set current account data - return http.get(`${apiEndpoint}/v1/full/users/account/${user.wallet}`, () => + return http.get(`${apiEndpoint}/v1/users/account/${user.wallet}`, () => HttpResponse.json({ data: account }) ) } @@ -158,7 +158,7 @@ export const mockUserCreatedCoin = ( * Collections */ export const mockCollectionById = (collection: typeof testCollection & any) => - http.get(`${apiEndpoint}/v1/full/playlists`, ({ request }) => { + http.get(`${apiEndpoint}/v1/playlists`, ({ request }) => { const url = new URL(request.url) const id = url.searchParams.get('id') @@ -173,7 +173,7 @@ export const mockCollectionById = (collection: typeof testCollection & any) => * Tracks */ export const mockTrackById = (track: typeof testTrack & any) => - http.get(`${apiEndpoint}/v1/full/tracks`, ({ request }) => { + http.get(`${apiEndpoint}/v1/tracks`, ({ request }) => { const url = new URL(request.url) // Handle both single ID param and array params (id[]=1&id[]=2) const idParam = url.searchParams.get('id') @@ -210,11 +210,9 @@ export const mockTrackById = (track: typeof testTrack & any) => * Notifications */ export const mockUsers = (users: (typeof artistUser)[]) => - http.get(`${apiEndpoint}/v1/full/users`, () => - HttpResponse.json({ data: users }) - ) + http.get(`${apiEndpoint}/v1/users`, () => HttpResponse.json({ data: users })) export const mockTracks = (tracks: (typeof testTrack)[]) => - http.get(`${apiEndpoint}/v1/full/tracks`, () => + http.get(`${apiEndpoint}/v1/tracks`, () => HttpResponse.json({ data: tracks }) )