blade/materialious
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into traefik_example

Browse Source
This commit is contained in:
arcoast
2024-04-01 21:48:37 +01:00
committed by GitHub
parent d6ebc7275a a52f68f932
commit c77ce18ea6
12 changed files with 119 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
materialious/src/app.html
+1 -1
View File
@@ -12,7 +12,7 @@
%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<body data-sveltekit-preload-data="hover" style="background-color: rgb(20, 19, 22)">
<div style="display: contents">%sveltekit.body%</div>
</body>
materialious/src/lib/Api/index.ts
+41 -27
View File
@@ -6,27 +6,40 @@ export function buildPath(path: string): string {
return `${import.meta.env.VITE_DEFAULT_INVIDIOUS_INSTANCE}/api/v1/${path}`;
}
export async function fetchErrorHandle(response: Response): Promise<Response> {
if (!response.ok) {
let message = 'Internal error';
try {
const json = await response.json();
message = 'errorBacktrace' in json ? json.errorBacktrace : json.error;
} catch { }
throw Error(message);
}
return response;
}
export function buildAuthHeaders(): { headers: { Authorization: string; }; } {
return { headers: { Authorization: `Bearer ${get(auth)?.token}` } };
}
export async function getTrending(): Promise<Video[]> {
const resp = await fetch(buildPath('trending'));
const resp = await fetchErrorHandle(await fetch(buildPath('trending')));
return await resp.json();
}
export async function getPopular(): Promise<Video[]> {
const resp = await fetch(buildPath('popular'));
const resp = await fetchErrorHandle(await fetch(buildPath('popular')));
return await resp.json();
}
export async function getVideo(videoId: string, local: boolean = false): Promise<VideoPlay> {
const resp = await fetch(buildPath(`videos/${videoId}?local=${local}`));
const resp = await fetchErrorHandle(await fetch(buildPath(`videos/${videoId}?local=${local}`)));
return await resp.json();
}
export async function getDislikes(videoId: string): Promise<ReturnYTDislikes> {
const resp = await fetch(`${get(returnYTDislikesInstance)}/votes?videoId=${videoId}`);
const resp = await fetchErrorHandle(await fetch(`${get(returnYTDislikesInstance)}/votes?videoId=${videoId}`));
return await resp.json();
}
@@ -45,12 +58,12 @@ export async function getComments(videoId: string, parameters: {
const path = new URL(buildPath(`comments/${videoId}`));
path.search = new URLSearchParams(parameters).toString();
const resp = await fetch(path);
const resp = await fetchErrorHandle(await fetch(path));
return await resp.json();
}
export async function getChannel(channelId: string): Promise<ChannelPage> {
const resp = await fetch(buildPath(`channels/${channelId}`));
const resp = await fetchErrorHandle(await fetch(buildPath(`channels/${channelId}`)));
return await resp.json();
}
@@ -66,14 +79,14 @@ export async function getChannelContent(
if (typeof parameters.continuation !== 'undefined') url.searchParams.set('continuation', parameters.continuation);
const resp = await fetch(url.toString());
const resp = await fetchErrorHandle(await fetch(url.toString()));
return await resp.json();
}
export async function getSearchSuggestions(search: string): Promise<SearchSuggestion> {
const path = new URL(buildPath("search/suggestions"));
path.search = new URLSearchParams({ q: search }).toString();
const resp = await fetch(path);
const resp = await fetchErrorHandle(await fetch(path));
return await resp.json();
}
@@ -96,19 +109,19 @@ export async function getSearch(search: string, options: {
const path = new URL(buildPath("search"));
path.search = new URLSearchParams({ ...options, q: search }).toString();
const resp = await fetch(path);
const resp = await fetchErrorHandle(await fetch(path));
return await resp.json();
}
export async function getFeed(maxResults: number, page: number) {
const path = new URL(buildPath("auth/feed"));
path.search = new URLSearchParams({ max_results: maxResults.toString(), page: page.toString() }).toString();
const resp = await fetch(path, buildAuthHeaders());
const resp = await fetchErrorHandle(await fetch(path, buildAuthHeaders()));
return await resp.json();
}
export async function getSubscriptions(): Promise<Subscription[]> {
const resp = await fetch(buildPath("auth/subscriptions"), buildAuthHeaders());
const resp = await fetchErrorHandle(await fetch(buildPath("auth/subscriptions"), buildAuthHeaders()));
return await resp.json();
}
@@ -122,21 +135,21 @@ export async function amSubscribed(authorId: string): Promise<boolean> {
}
export async function postSubscribe(authorId: string) {
await fetch(buildPath(`auth/subscriptions/${authorId}`), {
await fetchErrorHandle(await fetch(buildPath(`auth/subscriptions/${authorId}`), {
method: "POST",
...buildAuthHeaders()
});
}));
}
export async function deleteUnsubscribe(authorId: string) {
await fetch(buildPath(`auth/subscriptions/${authorId}`), {
await fetchErrorHandle(await fetch(buildPath(`auth/subscriptions/${authorId}`), {
method: 'DELETE',
...buildAuthHeaders()
});
}));
}
export async function getHistory(page: number = 1): Promise<string[]> {
const resp = await fetch(buildPath(`auth/history?page=${page}`), buildAuthHeaders());
const resp = await fetchErrorHandle(await fetch(buildPath(`auth/history?page=${page}`), buildAuthHeaders()));
return await resp.json();
}
@@ -146,17 +159,17 @@ export async function deleteHistory(videoId: string | undefined = undefined) {
url += `/${videoId}`;
}
await fetch(buildPath(url), {
await fetchErrorHandle(await fetch(buildPath(url), {
method: 'DELETE',
...buildAuthHeaders()
});
}));
}
export async function postHistory(videoId: string) {
await fetch(buildPath(`auth/history/${videoId}`), {
await fetchErrorHandle(await fetch(buildPath(`auth/history/${videoId}`), {
method: 'POST',
...buildAuthHeaders()
});
}));
}
export async function getPlaylist(playlistId: string, page: number = 1): Promise<PlaylistPage> {
@@ -167,44 +180,45 @@ export async function getPlaylist(playlistId: string, page: number = 1): Promise
} else {
resp = await fetch(buildPath(`playlists/${playlistId}?page=${page}`));
}
await fetchErrorHandle(resp);
return await resp.json();
}
export async function getPersonalPlaylists(): Promise<PlaylistPage[]> {
const resp = await fetch(buildPath('auth/playlists'), buildAuthHeaders());
const resp = await fetchErrorHandle(await fetch(buildPath('auth/playlists'), buildAuthHeaders()));
return await resp.json();
}
export async function deletePersonalPlaylist(playlistId: string) {
await fetch(buildPath(`auth/playlists/${playlistId}`), {
await fetchErrorHandle(await fetch(buildPath(`auth/playlists/${playlistId}`), {
method: 'DELETE',
...buildAuthHeaders()
});
}));
}
export async function postPersonalPlaylist(title: string, privacy: 'public' | 'private' | 'unlisted') {
let headers: Record<string, Record<string, string>> = buildAuthHeaders();
headers['headers']['Content-type'] = 'application/json';
await fetch(buildPath('auth/playlists'), {
await fetchErrorHandle(await fetch(buildPath('auth/playlists'), {
method: 'POST',
body: JSON.stringify({
title: title,
privacy: privacy
}),
...headers
});
}));
}
export async function addPlaylistVideo(playlistId: string, videoId: string) {
let headers: Record<string, Record<string, string>> = buildAuthHeaders();
headers['headers']['Content-type'] = 'application/json';
await fetch(buildPath(`auth/playlists/${playlistId}/videos`), {
await fetchErrorHandle(await fetch(buildPath(`auth/playlists/${playlistId}/videos`), {
method: 'POST',
body: JSON.stringify({
videoId: videoId
}),
...headers
});
}));
}
materialious/src/routes/+layout.svelte
+1 -5
View File
@@ -186,11 +186,7 @@
}
if (isLoggedIn) {
try {
loadNotifications();
} catch {
auth.set(null);
}
loadNotifications().catch(() => auth.set(null));
}
});
</script>
materialious/src/routes/channel/[slug]/+page.ts
+10 -1
View File
@@ -1,7 +1,16 @@
import { getChannel } from '$lib/Api/index.js';
import { error } from '@sveltejs/kit';
export async function load({ params }) {
let channel;
try {
channel = await getChannel(params.slug);
} catch (errorMessage: any) {
error(500, errorMessage);
}
return {
channel: await getChannel(params.slug)
channel: channel
};
}
materialious/src/routes/history/+page.svelte
+12 -7
View File
@@ -2,6 +2,7 @@
import { deleteHistory, getHistory, getVideo } from '$lib/Api';
import type { VideoPlay } from '$lib/Api/model';
import VideoList from '$lib/VideoList.svelte';
import { error } from '@sveltejs/kit';
import { onDestroy, onMount } from 'svelte';
import { activePage } from '../../store';
@@ -13,14 +14,18 @@
let currentPage = 1;
async function loadPageHistory() {
const videoIds = await getHistory(currentPage);
let promises = [];
for (const videoId of videoIds) {
promises.push(getVideo(videoId));
}
try {
const videoIds = await getHistory(currentPage);
let promises = [];
for (const videoId of videoIds) {
promises.push(getVideo(videoId));
}
const loadedHistory = await Promise.all(promises);
history = [...history, ...loadedHistory];
const loadedHistory = await Promise.all(promises);
history = [...history, ...loadedHistory];
} catch (errorMessage: any) {
error(500, errorMessage);
}
}
async function handleScroll() {
materialious/src/routes/playlist/[slug]/+page.ts
+9 -1
View File
@@ -1,7 +1,15 @@
import { getPlaylist } from '$lib/Api/index.js';
import { error } from '@sveltejs/kit';
export async function load({ params }) {
let playlist;
try {
playlist = await getPlaylist(params.slug);
} catch (errorMessage: any) {
error(500, errorMessage);
}
return {
playlist: await getPlaylist(params.slug)
playlist: playlist
};
}
materialious/src/routes/playlists/+page.ts
+8 -1
View File
@@ -1,7 +1,14 @@
import { getPersonalPlaylists } from "$lib/Api";
import { error } from "@sveltejs/kit";
export async function load() {
let playlists;
try {
playlists = await getPersonalPlaylists();
} catch (errorMessage: any) {
error(500, errorMessage);
}
return {
playlists: await getPersonalPlaylists()
playlists: playlists
};
}
materialious/src/routes/search/[slug]/+page.ts
+11 -1
View File
@@ -1,4 +1,5 @@
import { getSearch } from '$lib/Api/index';
import { error } from '@sveltejs/kit';
export async function load({ params, url }) {
let type: "playlist" | "all" | "video" | "channel";
@@ -9,8 +10,17 @@ export async function load({ params, url }) {
} else {
type = 'all';
}
let search;
try {
search = await getSearch(params.slug, { type: type });
} catch (errorMessage: any) {
error(500, errorMessage);
}
return {
search: await getSearch(params.slug, { type: type }),
search: search,
slug: params.slug,
searchType: type
};
materialious/src/routes/subscriptions/+page.ts
+7 -6
View File
@@ -2,13 +2,14 @@ import { getFeed } from '$lib/Api/index.js';
import { error } from '@sveltejs/kit';
export async function load({ params }) {
const feed = await getFeed(100, 1);
if ('errorBacktrace' in feed) (
error(500, (feed as { errorBacktrace: string; }).errorBacktrace)
);
let feed;
try {
feed = await getFeed(100, 1);
} catch (errorMessage: any) {
error(500, errorMessage);
}
return {
feed: await getFeed(100, 1)
feed: feed
};
}
materialious/src/routes/trending/+page.ts
+8 -6
View File
@@ -1,12 +1,14 @@
import { getTrending } from '$lib/Api/index.js';
import type { Video } from '$lib/Api/model';
import { error } from '@sveltejs/kit';
export async function load({ params }) {
const trending = await getTrending();
if ('errorBacktrace' in trending) (
error(500, (trending as { errorBacktrace: string; }).errorBacktrace)
);
export async function load() {
let trending: Video[];
try {
trending = await getTrending();
} catch (errorMessage: any) {
error(500, errorMessage);
}
return { trending: trending };
}
materialious/src/routes/watch/[slug]/+page.svelte
+6
View File
@@ -190,6 +190,12 @@
{/each}
</menu>
</button>
{:else}
<button disabled class="border no-margin">
<i>add</i>
<span>Playlist</span>
<div class="tooltip">Login required</div>
</button>
{/if}
</div>
</div>
materialious/src/routes/watch/[slug]/+page.ts
+5 -5
View File
@@ -7,11 +7,11 @@ import { auth, playerProxyVideos, returnYtDislikes } from '../../../store';
export async function load({ params, url }) {
let video;
video = await getVideo(params.slug, get(playerProxyVideos));
if ('errorBacktrace' in video) (
error(500, (video as { errorBacktrace: string; }).errorBacktrace)
);
try {
video = await getVideo(params.slug, get(playerProxyVideos));
} catch (errorMessage: any) {
error(500, errorMessage);
}
let personalPlaylists: PlaylistPage[] | null;