From b2402539961dbab9a69104c8edd06c71c03fc841 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 9 Feb 2024 10:14:11 +0100 Subject: [PATCH] More robust objects indexer --- server/lib/meilisearch/meilisearch-channels.ts | 2 ++ server/lib/meilisearch/meilisearch-playlists.ts | 5 +++++ server/lib/meilisearch/meilisearch-videos.ts | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/server/lib/meilisearch/meilisearch-channels.ts b/server/lib/meilisearch/meilisearch-channels.ts index da38cd3..9b78a31 100644 --- a/server/lib/meilisearch/meilisearch-channels.ts +++ b/server/lib/meilisearch/meilisearch-channels.ts @@ -89,6 +89,8 @@ export function formatChannelForAPI (c: DBChannel, fromHost?: string): APIVideoC } export function formatChannelForDB (c: IndexableChannel): DBChannel { + if (!c.ownerAccount) return undefined + return { primaryKey: buildDBChannelPrimaryKey(c), diff --git a/server/lib/meilisearch/meilisearch-playlists.ts b/server/lib/meilisearch/meilisearch-playlists.ts index f2a2517..43a6b20 100644 --- a/server/lib/meilisearch/meilisearch-playlists.ts +++ b/server/lib/meilisearch/meilisearch-playlists.ts @@ -39,6 +39,11 @@ export async function queryPlaylists (search: PlaylistsSearchQuery) { } export function formatPlaylistForAPI (p: DBPlaylist, fromHost?: string): APIPlaylist { + if (!p.ownerAccount) return undefined + if (!p.videoChannel) return undefined + if (!p.privacy) return undefined + if (!p.type) return undefined + return { id: p.id, uuid: p.uuid, diff --git a/server/lib/meilisearch/meilisearch-videos.ts b/server/lib/meilisearch/meilisearch-videos.ts index 86910af..5be4ad9 100644 --- a/server/lib/meilisearch/meilisearch-videos.ts +++ b/server/lib/meilisearch/meilisearch-videos.ts @@ -91,6 +91,11 @@ export async function getVideosUpdatedAt (uuids: string[]): Promise<{ updatedAt: } export function formatVideoForDB (v: IndexableVideo | IndexableVideoDetails): DBVideo | DBVideoDetails { + if (!v.category) return undefined + if (!v.licence) return undefined + if (!v.language) return undefined + if (!v.privacy) return undefined + const video = { id: v.id, uuid: v.uuid,