GKaszewski/k-tv
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts in tv page (merge password + quality/subtitle features)

Browse Source
This commit is contained in:
Gabriel Kaszewski
2026-07-12 03:41:20 +02:00
parent 8051ab58c0
commit f2f56b7143
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
k-tv-frontend/app/(main)/tv/page.tsx
View File

@@ -89,7 +89,6 @@ function TvPageContent() {
error: broadcastError, error: broadcastError,
} = useCurrentBroadcast(channel?.id ?? "", passwords.channelPassword); } = useCurrentBroadcast(channel?.id ?? "", passwords.channelPassword);
// blockPassword derived from broadcast.slot.id after broadcast loads
const blockPassword = passwords.getBlockPassword(broadcast?.slot.id); const blockPassword = passwords.getBlockPassword(broadcast?.slot.id);
const { data: epgSlots } = useEpg( const { data: epgSlots } = useEpg(

8
k-tv-frontend/hooks/use-tv.ts
View File

@@ -132,10 +132,10 @@ export function useStreamUrl(
slotId: string | undefined, slotId: string | undefined,
channelPassword?: string, channelPassword?: string,
blockPassword?: string, blockPassword?: string,
quality?: string, bitrateBps?: number,
) { ) {
return useQuery({ return useQuery({
queryKey: ["stream-url", channelId, slotId, channelPassword, blockPassword, quality], queryKey: ["stream-url", channelId, slotId, channelPassword, blockPassword, bitrateBps],
queryFn: async (): Promise<string | null> => { queryFn: async (): Promise<string | null> => {
const params = new URLSearchParams(); const params = new URLSearchParams();
if (token) params.set("token", token); if (token) params.set("token", token);
@@ -151,8 +151,8 @@ export function useStreamUrl(
const msg = body?.error ?? `Stream resolve failed: ${res.status}`; const msg = body?.error ?? `Stream resolve failed: ${res.status}`;
throw new Error(msg); throw new Error(msg);
} }
const { url } = await res.json(); const { url } = (await res.json()) as { url: string };
return url as string; return bitrateBps ? `${url}&VideoBitRate=${bitrateBps}` : url;
}, },
enabled: !!channelId && !!slotId, enabled: !!channelId && !!slotId,
staleTime: Infinity, staleTime: Infinity,