Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Search explore milestone 2: for you, recent premium, best selling by isaacsolo · Pull Request #12467 · AudiusProject/apps · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/common/src/api/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export * from './tan-query/events'

// Explore
export * from './tan-query/collection/useExploreContent'
export * from './tan-query/explore/useBestSelling'

// Lineups
export * from './tan-query/lineups/useFeed'
Expand DownExpand Up@@ -95,6 +96,8 @@ export * from './tan-query/tracks/useFileSizes'
export * from './tan-query/tracks/useTrackFileInfo'
export * from './tan-query/tracks/useUpdateTrack'
export * from './tan-query/tracks/useRemixedTracks'
export * from './tan-query/tracks/useRecommendedTracks'
export * from './tan-query/tracks/useRecentPremiumTracks'
export * from './tan-query/tracks/useSuggestedPlaylistTracks'

// Users
Expand Down
70 changes: 70 additions & 0 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import {
primeCollectionData,
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseBestSellingArgs = {
userId: ID | null | undefined
}

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(
related?.tracks,
userTrackMetadataFromSDK
)

primeTrackData({
tracks,
queryClient
})

const playlists = transformAndCleanList(
related?.playlists,
userCollectionMetadataFromSDK
)

primeCollectionData({
collections: playlists,
queryClient
})

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand DownExpand Up@@ -71,6 +72,8 @@ export const QUERY_KEYS = {
purchasers: 'purchasers',
purchasersCount: 'purchasersCount',
remixedTracks: 'remixedTracks',
recommendedTracks: 'recommendedTracks',
recentPremiumTracks: 'recentPremiumTracks',
mutedUsers: 'mutedUsers',
salesAggregate: 'salesAggregate',
usdcTransactionsCount: 'usdcTransactionsCount',
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecentPremiumTracksArgs = {
userId: ID | null | undefined
}

export const getRecentPremiumTracksQueryKey = ({
userId
}: UseRecentPremiumTracksArgs) => {
return [QUERY_KEYS.recentPremiumTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecentPremiumTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
userId: currentUserId ? Id.parse(currentUserId) : undefined
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})
return data.map((item) => HashId.parse(item.id))
},
...options,
enabled: options?.enabled !== false
})
}
51 changes: 51 additions & 0 deletions packages/common/src/api/tan-query/tracks/useRecommendedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
import { HashId, Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'

import { userTrackMetadataFromSDK } from '~/adapters/track'
import { transformAndCleanList } from '~/adapters/utils'
import { primeTrackData, useQueryContext } from '~/api/tan-query/utils'
import { ID } from '~/models'

import { QUERY_KEYS } from '../queryKeys'
import { QueryKey, SelectableQueryOptions } from '../types'
import { useCurrentUserId } from '../users/account/useCurrentUserId'

export type UseRecommendedTracksArgs = {
userId: ID | null | undefined
}

export const getRecommendedTracksQueryKey = ({
userId
}: UseRecommendedTracksArgs) => {
return [QUERY_KEYS.recommendedTracks, userId] as unknown as QueryKey<ID[]>
}

export const useRecommendedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecommendedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.users.getUserRecommendedTracks({
id: Id.parse(currentUserId),
userId: Id.parse(currentUserId)
})
const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)

primeTrackData({
tracks,
queryClient
})

return data.map((item) => HashId.parse(item.id))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to run the results though "primeTrackData", look at other hooks for examples. this applies to every hook youre adding

},
...options,
enabled: options?.enabled !== false
})
}
3 changes: 3 additions & 0 deletions packages/common/src/messages/explore.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,9 @@ export const exploreMessages = {
searchPlaceholder: 'What do you want to listen to?',
featuredPlaylists: 'Community Playlists',
featuredRemixContests: 'Featured Remix Contests',
forYou: 'For You',
recentlyListedForSale: 'Recently Listed for Sale',
bestSelling: 'Best Selling',
artistSpotlight: 'Artist Spotlight',
labelSpotlight: 'Label Spotlight',
exploreByMood: 'Explore by Mood',
Expand Down
3 changes: 2 additions & 1 deletion packages/common/src/store/queue/types.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,8 @@ export enum QueueSource {
CHAT_TRACKS = 'CHAT_TRACKS',
CHAT_PLAYLIST_TRACKS = 'CHAT_PLAYLIST_TRACKS',
EXPLORE_PREMIUM_TRACKS = 'EXPLORE_PREMIUM_TRACKS',
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS'
PICK_WINNERS_TRACKS = 'PICK_WINNERS_TRACKS',
EXPLORE = 'EXPLORE'
}

export type Queueable = {
Expand Down
157 changes: 157 additions & 0 deletions packages/mobile/src/components/track/TrackCard.tsx
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
import { useCallback } from 'react'

import { useTrack, useCurrentUserId } from '@audius/common/api'
import type { ID } from '@audius/common/models'
import { SquareSizes, isContentUSDCPurchaseGated } from '@audius/common/models'
import { formatCount, formatSeconds } from '@audius/common/utils'
import { pick } from 'lodash'
import type { GestureResponderEvent } from 'react-native'

import {
Divider,
Flex,
IconHeart,
IconRepost,
Paper,
Text
} from '@audius/harmony-native'
import { UserLink } from 'app/components/user-link'
import { useNavigation } from 'app/hooks/useNavigation'

import { LockedStatusBadge } from '../core'
import { TrackImage } from '../image/TrackImage'
import { TrackDownloadStatusIndicator } from '../offline-downloads'

import { TrackCardSkeleton } from './TrackCardSkeleton'

const messages = {
repost: 'Reposts',
favorites: 'Favorites',
hidden: 'Hidden'
}

type TrackCardProps = {
id: ID
onPress?: (e: GestureResponderEvent) => void
noNavigation?: boolean
}

export const TrackCard = (props: TrackCardProps) => {
const { id, onPress, noNavigation } = props

const { data: partialTrack } = useTrack(id, {
select: (track) =>
pick(
track,
'title',
'owner_id',
'repost_count',
'save_count',
'is_unlisted',
'access',
'stream_conditions',
'duration',
'offline'
)
})
const {
title,
owner_id,
repost_count,
save_count,
is_unlisted,
access,
stream_conditions,
duration,
offline
} = partialTrack ?? {}
const { data: accountId } = useCurrentUserId()

const navigation = useNavigation()

const handlePress = useCallback(
(e: GestureResponderEvent) => {
onPress?.(e)
if (noNavigation) return
navigation.navigate('Track', { id })
},
[onPress, noNavigation, navigation, id]
)

if (!partialTrack) {
console.warn('Track missing for TrackCard, preventing render')
return <TrackCardSkeleton />
}

const isOwner = accountId === owner_id
const isPurchase = isContentUSDCPurchaseGated(stream_conditions)

return (
<Paper border='default' onPress={handlePress}>
<Flex p='s' gap='s'>
<TrackImage
trackId={id}
size={SquareSizes.SIZE_480_BY_480}
style={{ flex: 1 }}
/>
<Text variant='title' textAlign='center' numberOfLines={1}>
{title}
</Text>
<UserLink
userId={owner_id!}
textAlign='center'
style={{ justifyContent: 'center' }}
/>
{duration && (
<Text variant='body' size='s' textAlign='center' color='subdued'>
{formatSeconds(duration)}
</Text>
)}
</Flex>
<Divider orientation='horizontal' />
<Flex
direction='row'
gap='l'
pv='s'
justifyContent='center'
backgroundColor='surface1'
borderBottomLeftRadius='m'
borderBottomRightRadius='m'
>
{is_unlisted ? (
<Text
variant='body'
size='s'
strength='strong'
color='subdued'
// Ensures footer height is not affected
style={{ lineHeight: 16 }}
>
{messages.hidden}
</Text>
) : (
<>
<Flex direction='row' gap='xs' alignItems='center'>
<IconRepost size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(repost_count ?? 0)}
</Text>
</Flex>
<Flex direction='row' gap='xs' alignItems='center'>
<IconHeart size='s' color='subdued' />
<Text variant='label' color='subdued'>
{formatCount(save_count ?? 0)}
</Text>
</Flex>
</>
)}
{isPurchase && !isOwner ? (
<LockedStatusBadge variant='premium' locked={!access?.stream} />
) : null}
{offline ? (
<TrackDownloadStatusIndicator trackId={id} size='s' />
) : null}
</Flex>
</Paper>
)
}
Loading