From 2edc24cae3482f5c08ca15ec5a20e3daf9b14c9f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 13 Nov 2023 11:01:17 +0100 Subject: [PATCH] Reduce description indexation size --- client/src/views/Search.vue | 2 +- config/test.yaml | 6 +++--- server/lib/indexers/video-indexer.ts | 3 +-- server/lib/meilisearch/meilisearch-videos.ts | 1 + server/types/video.model.ts | 2 ++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/src/views/Search.vue b/client/src/views/Search.vue index 006d990..ffe1658 100644 --- a/client/src/views/Search.vue +++ b/client/src/views/Search.vue @@ -138,7 +138,7 @@ import Pagination from '../components/Pagination.vue' import SearchInput from '../components/SearchInput.vue' import SortButton from '../components/SortButton.vue' - import { VideoChannelsSearchQuery, ResultList, VideosSearchQuery } from '@peertube/peertube-types' + import type { VideoChannelsSearchQuery, ResultList, VideosSearchQuery } from '@peertube/peertube-types' import Nprogress from 'nprogress' import { APIPlaylist } from '../../../server/types/playlist.model' import { PlaylistsSearchQuery } from '../../../server/types/search-query/playlist-search.model' diff --git a/config/test.yaml b/config/test.yaml index 4e5f983..469d547 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -3,9 +3,9 @@ meilisearch: api_key: '4kMeZtP0QsgE3QCDSEMYUt_WFusGjq5JgOc9atujpKw' indexes: - videos: 'peertube-index-videos-test1' - channels: 'peertube-index-channels-test1' - playlists: 'peertube-index-playlists-test1' + videos: 'peertube-index-videos-test2' + channels: 'peertube-index-channels-test2' + playlists: 'peertube-index-playlists-test2' search-instance: name_image: '/theme/framasoft/img/title.svg' diff --git a/server/lib/indexers/video-indexer.ts b/server/lib/indexers/video-indexer.ts index 0e10d7e..f2df9ec 100644 --- a/server/lib/indexers/video-indexer.ts +++ b/server/lib/indexers/video-indexer.ts @@ -5,7 +5,6 @@ import { CONFIG, SORTABLE_COLUMNS } from '../../initializers/constants' import { formatVideoForDB } from '../meilisearch/meilisearch-videos' import { getVideo } from '../requests/peertube-instance' import { DBVideo, IndexableVideo } from '../../types/video.model' -import { client } from '../../helpers/meilisearch' export class VideoIndexer extends AbstractIndexer { protected readonly indexQueue: QueueObject @@ -34,7 +33,7 @@ export class VideoIndexer extends AbstractIndexer { 'tags', 'account.displayName', 'channel.displayName', - 'description' + 'searchableDescription' ] protected readonly rankingRules = [ diff --git a/server/lib/meilisearch/meilisearch-videos.ts b/server/lib/meilisearch/meilisearch-videos.ts index 483b519..8e953ab 100644 --- a/server/lib/meilisearch/meilisearch-videos.ts +++ b/server/lib/meilisearch/meilisearch-videos.ts @@ -109,6 +109,7 @@ export function formatVideoForDB (v: IndexableVideo | IndexableVideoDetails): DB truncatedDescription: v.truncatedDescription, description: v.description, + searchableDescription: (v.description || v.truncatedDescription || '').slice(0, 250), waitTranscoding: v.waitTranscoding, diff --git a/server/types/video.model.ts b/server/types/video.model.ts index cc6ff65..38e1327 100644 --- a/server/types/video.model.ts +++ b/server/types/video.model.ts @@ -21,6 +21,8 @@ interface DBVideoShared { host: string url: string + + searchableDescription: string } export interface DBVideo extends Omit, DBVideoShared {