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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
59 changes: 44 additions & 15 deletions packages/common/src/api/tan-query/explore/useBestSelling.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
import { HashId, Id, BestSellingItem } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, BestSellingItem, full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

import { userCollectionMetadataFromSDK } from '~/adapters'
import { userTrackMetadataFromSDK } from '~/adapters/track'
Expand All@@ -9,37 +13,61 @@ import {
primeTrackData,
useQueryContext
} from '~/api/tan-query/utils'
import { SDKInfiniteQueryArgs } from '~/api/types'
import { ID } from '~/models'

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

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

export type UseBestSellingArgs =
SDKInfiniteQueryArgs<full.GetFullBestSellingRequest>

export type BestSellingItemWithId = BestSellingItem & { id: ID }

export const getBestSellingQueryKey = ({ userId }: UseBestSellingArgs) => {
return [QUERY_KEYS.bestSellingAlbums, userId] as unknown as QueryKey<
BestSellingItemWithId[]
export const getBestSellingQueryKey = (
userId: ID | null | undefined,
args: UseBestSellingArgs
) => {
return [QUERY_KEYS.bestSellingItems, userId, args] as unknown as QueryKey<
InfiniteData<BestSellingItemWithId[]>
>
}

export const useBestSelling = <TResult = BestSellingItemWithId[]>(
options?: SelectableQueryOptions<BestSellingItemWithId[], TResult>
export const useBestSelling = (
{
pageSize = DEFAULT_PAGE_SIZE,
type = 'all',
...args
}: UseBestSellingArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()
return useQuery({
queryKey: getBestSellingQueryKey({ userId: currentUserId }),
queryFn: async () => {

return useInfiniteQuery({
queryKey: getBestSellingQueryKey(currentUserId, {
pageSize,
type,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: BestSellingItemWithId[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [], related = {} } =
await sdk.full.explore.getFullBestSelling({
userId: currentUserId ? Id.parse(currentUserId) : undefined
...args,
userId: OptionalId.parse(currentUserId),
type,
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(
Expand All@@ -64,6 +92,7 @@ export const useBestSelling = <TResult = BestSellingItemWithId[]>(

return data.map((item) => ({ ...item, id: HashId.parse(item.contentId) }))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
2 changes: 1 addition & 1 deletion packages/common/src/api/tan-query/queryKeys.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ export const QUERY_KEYS = {
userTracksByHandle: 'userTracksByHandle',
userPlaylists: 'userPlaylists',
userAlbums: 'userAlbums',
bestSellingAlbums: 'bestSellingAlbums',
bestSellingItems: 'bestSellingItems',
userCollectibles: 'userCollectibles',
collection: 'collection',
collections: 'collections',
Expand Down
8 changes: 8 additions & 0 deletions packages/common/src/api/tan-query/search/useSearchResults.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,14 @@ import { primeUserData } from '../utils/primeUserData'

export type SearchCategory = 'all' | 'tracks' | 'albums' | 'playlists' | 'users'

export const labelByCategory: Record<SearchCategory, string> = {
all: 'All',
tracks: 'Tracks',
users: 'Profiles',
albums: 'Albums',
playlists: 'Playlists'
}

export type SearchFilters = {
genre?: Genre
mood?: Mood
Expand Down
55 changes: 38 additions & 17 deletions packages/common/src/api/tan-query/tracks/useMostSharedTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,61 @@
import { OptionalId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseMostSharedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseMostSharedTracksArgs =
SDKInfiniteQueryArgs<full.GetMostSharedTracksRequest>

export const getMostSharedTracksQueryKey = ({
userId
}: UseMostSharedTracksArgs) => {
return [QUERY_KEYS.mostSharedTracks, userId] as unknown as QueryKey<ID[]>
export const getMostSharedTracksQueryKey = (
userId: ID | null | undefined,
args: UseMostSharedTracksArgs
) => {
return [QUERY_KEYS.mostSharedTracks, userId, args] as unknown as QueryKey<
InfiniteData<ID[]>
>
}

export const useMostSharedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useMostSharedTracks = (
{ pageSize = DEFAULT_PAGE_SIZE, ...args }: UseMostSharedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getMostSharedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getMostSharedTracksQueryKey(currentUserId, {
pageSize,
timeRange: full.GetMostSharedTracksTimeRangeEnum.Week,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getMostSharedTracks({
...args,
userId: OptionalId.parse(currentUserId),
limit: 10,
timeRange: 'week'
limit: pageSize,
offset: pageParam
})
const tracks = primeTrackData({
tracks: transformAndCleanList(data, userTrackMetadataFromSDK),
Expand All@@ -44,6 +64,7 @@ export const useMostSharedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
54 changes: 38 additions & 16 deletions packages/common/src/api/tan-query/tracks/useRecentPremiumTracks.ts
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,59 @@
import { HashId } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { HashId, OptionalId, full } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

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

export type UseRecentPremiumTracksArgs =
SDKInfiniteQueryArgs<full.GetRecentPremiumTracksRequest>

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

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

return useQuery({
queryKey: getRecentPremiumTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentPremiumTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getRecentPremiumTracks({
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
limit: pageSize,
offset: pageParam
})

const tracks = transformAndCleanList(data, userTrackMetadataFromSDK)
Expand All@@ -43,6 +64,7 @@ export const useRecentPremiumTracks = <TResult = ID[]>(
})
return data.map((item) => HashId.parse(item.id))
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
import { Id } from '@audius/sdk'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { full, OptionalId } from '@audius/sdk'
import {
InfiniteData,
useInfiniteQuery,
useQueryClient
} from '@tanstack/react-query'

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

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

export type UseRecentlyCommentedTracksArgs = {
userId: ID | null | undefined
}
const DEFAULT_PAGE_SIZE = 10

export type UseRecentlyCommentedTracksArgs =
SDKInfiniteQueryArgs<full.GetTracksWithRecentCommentsRequest>

export const getRecentlyCommentedTracksQueryKey = ({
userId
}: UseRecentlyCommentedTracksArgs) => {
return [QUERY_KEYS.recentlyCommentedTracks, userId] as unknown as QueryKey<
ID[]
>
export const getRecentlyCommentedTracksQueryKey = (
userId: ID | null | undefined,
args: UseRecentlyCommentedTracksArgs
) => {
return [
QUERY_KEYS.recentlyCommentedTracks,
userId,
args
] as unknown as QueryKey<InfiniteData<ID[]>>
}

export const useRecentlyCommentedTracks = <TResult = ID[]>(
options?: SelectableQueryOptions<ID[], TResult>
export const useRecentlyCommentedTracks = (
{
pageSize = DEFAULT_PAGE_SIZE,
...args
}: UseRecentlyCommentedTracksArgs = {},
options?: QueryOptions
) => {
const { audiusSdk } = useQueryContext()
const { data: currentUserId } = useCurrentUserId()
const queryClient = useQueryClient()

return useQuery({
queryKey: getRecentlyCommentedTracksQueryKey({ userId: currentUserId }),
queryFn: async () => {
return useInfiniteQuery({
queryKey: getRecentlyCommentedTracksQueryKey(currentUserId, {
pageSize,
...args
}),
initialPageParam: 0,
getNextPageParam: (lastPage: ID[], allPages) => {
if (lastPage.length < pageSize) return undefined
return allPages.length * pageSize
},
queryFn: async ({ pageParam }) => {
if (!currentUserId) return []
const sdk = await audiusSdk()
const { data = [] } = await sdk.full.tracks.getTracksWithRecentComments({
userId: currentUserId ? Id.parse(currentUserId) : undefined,
limit: 30
...args,
userId: OptionalId.parse(currentUserId),
offset: pageParam
})

const tracks = primeTrackData({
Expand All@@ -45,6 +68,7 @@ export const useRecentlyCommentedTracks = <TResult = ID[]>(

return tracks.map(({ track_id }) => track_id)
},
select: (data) => data.pages.flat(),
...options,
enabled: options?.enabled !== false
})
Expand Down
Loading