Merge branch 'develop' into edit_post_form

Author: kozakura913

.config/docker_example.yml

@@ -141,6 +141,8 @@ fulltextSearch:
   # - meilisearch
   #   Use Meilisearch.
   #   You need to install Meilisearch and configure.
+  # - opensearch
+  #   高度な検索と同様の部分一致検索になります
   provider: sqlLike
 
 # For Meilisearch settings.

.config/example.yml

@@ -223,6 +223,8 @@ fulltextSearch:
   # - meilisearch
   #   Use Meilisearch.
   #   You need to install Meilisearch and configure.
+  # - opensearch
+  #   高度な検索と同様の部分一致検索になります
   provider: sqlLike
 
 # For Meilisearch settings.

.github/cherrypick/test-opensearch.yml

@@ -14,6 +14,9 @@ redis:
   port: 56312
 id: aidx
 
+fulltextSearch:
+  provider: opensearch
+
 opensearch:
   host: 127.0.0.1
   port: 59200

CHANGELOG_YOJO.md

@@ -7,13 +7,17 @@ Misskey 2025.2.0
 ### General
 - ロックダウン機能を削除 [#650](https://github.com/yojo-art/cherrypick/pull/650)
   - リモートユーザーの設定は反映します
+- Feat: リモートインスタンスのソフトウェア一覧 [#659](https://github.com/yojo-art/cherrypick/pull/659)
+  -　エンドポイント:`api/federation/remote-software` 
+  - フロントエンドでは`/about#charts` で確認できます
 
 ### Client
 - yojo-art アップデートを開くとサーバー設定が更新される問題を修正 [#651](https://github.com/yojo-art/cherrypick/pull/651)
 - リアクション付ける前に確認ダイアログを追加するオプション [#657](https://github.com/yojo-art/cherrypick/pull/657)
 
 ### Server
 - リモートのイベントを表示できるように [#658](https://github.com/yojo-art/cherrypick/pull/658)
+- 通常の検索でもOpenSearchを利用できるように [#661](https://github.com/yojo-art/cherrypick/pull/661)
 
 ## 1.3.1
 Cherrypick 4.13.0  

packages/backend/src/config.ts

@@ -247,7 +247,7 @@ export type Config = {
 	pidFile: string;
 };
 
-export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch';
+export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch' | 'opensearch';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);

packages/backend/src/core/AdvancedSearchService.ts

@@ -15,13 +15,13 @@ import { MiUser } from '@/models/_.js';
 import type { NotesRepository, UsersRepository, PollVotesRepository, PollsRepository, NoteReactionsRepository, ClipNotesRepository, NoteFavoritesRepository } from '@/models/_.js';
 import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
 import { CacheService } from '@/core/CacheService.js';
+import { DriveService } from '@/core/DriveService.js';
 import { QueryService } from '@/core/QueryService.js';
 import { IdService } from '@/core/IdService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import type Logger from '@/logger.js';
-import { DriveService } from './DriveService.js';
 
 type OpenSearchHit = {
 	_index: string
@@ -452,10 +452,10 @@ export class AdvancedSearchService {
 				script: {
 					lang: 'painless',
 					source: 'if (ctx._source.containsKey("reactions")) {' +
-										'if (ctx._source.reactions.stream().anyMatch(r -> r.emoji == params.emoji))' +
-										' { ctx._source.reactions.stream().filter(r -> r.emoji == params.emoji && r.count < 32700).forEach(r -> r.count += 1); }' +
-										' else { ctx._source.reactions.add(params.record); }' +
-									'} else { ctx._source.reactions = new ArrayList(); ctx._source.reactions.add(params.record);}',
+						'if (ctx._source.reactions.stream().anyMatch(r -> r.emoji == params.emoji))' +
+						' { ctx._source.reactions.stream().filter(r -> r.emoji == params.emoji && r.count < 32700).forEach(r -> r.count += 1); }' +
+						' else { ctx._source.reactions.add(params.record); }' +
+						'} else { ctx._source.reactions = new ArrayList(); ctx._source.reactions.add(params.record);}',
 					params: {
 						emoji: opts.reaction,
 						record: {
@@ -506,7 +506,7 @@ export class AdvancedSearchService {
 			await this.opensearch.indices.create({
 				index: this.opensearchNoteIndex as string,
 				body: noteIndexBody,
-			},
+				},
 			).catch((error) => {
 				this.logger.error(error);
 				throw error;
@@ -754,13 +754,13 @@ export class AdvancedSearchService {
 				script: {
 					lang: 'painless',
 					source: 'if (ctx._source.containsKey("reactions")) {' +
-										'for (int i = 0; i < ctx._source.reactions.length; i++) {' +
-										' if (ctx._source.reactions[i].emoji == params.emoji) { ctx._source.reactions[i].count -= 1;' +
-										//DBに格納されるノートのリアクションデータは数が0でも保持されるのでそれに合わせてデータを消さない
-										//' if (ctx._source.reactions[i].count <= 0) { ctx._source.reactions.remove(i) }' +
-										'break; }' +
-										'}' +
-									'}',
+						'for (int i = 0; i < ctx._source.reactions.length; i++) {' +
+						' if (ctx._source.reactions[i].emoji == params.emoji) { ctx._source.reactions[i].count -= 1;' +
+						//DBに格納されるノートのリアクションデータは数が0でも保持されるのでそれに合わせてデータを消さない
+						//' if (ctx._source.reactions[i].count <= 0) { ctx._source.reactions.remove(i) }' +
+						'break; }' +
+						'}' +
+						'}',
 					params: {
 						emoji: emoji,
 					},
@@ -813,10 +813,10 @@ export class AdvancedSearchService {
 	}
 
 	/**
-	* user削除時に使う
-	* お気に入りとクリップの削除
-	* ノートは個別で削除されるからそこで
-	*/
+	 * user削除時に使う
+	 * お気に入りとクリップの削除
+	 * ノートは個別で削除されるからそこで
+	 */
 	@bindThis
 	public async unindexUserFavorites (id: string) {
 		this.unindexByQuery(this.favoriteIndex,
@@ -829,6 +829,33 @@ export class AdvancedSearchService {
 			});
 	}
 
+	@bindThis
+	public async searchOrFail(me: MiUser | null, opts: {
+		reactions?: string[] | null;
+		reactionsExclude?: string[] | null;
+		userId?: MiNote['userId'] | null;
+		host?: string | null;
+		origin?: string | null;
+		fileOption?: string | null;
+		visibility?: MiNote['visibility'] | null;
+		excludeCW?: boolean;
+		excludeReply?: boolean;
+		excludeQuote?: boolean;
+		sensitiveFilter?: string | null;
+		followingFilter?: string | null;
+		offset?: number | null;
+		useStrictSearch?: boolean | null;
+		wildCard?: boolean;
+	}, pagination: {
+		untilId?: MiNote['id'];
+		sinceId?: MiNote['id'];
+		limit?: number;
+	},
+	q?: string): Promise<MiNote[]> {
+		if (!this.opensearch) throw new Error('OpenSearch is not available');
+		return await this.searchNote(me, opts, pagination, q);
+	}
+
 	/**
 	 * エンドポイントから呼ばれるところ
 	 */
@@ -848,6 +875,7 @@ export class AdvancedSearchService {
 		followingFilter?: string | null;
 		offset?: number | null;
 		useStrictSearch?: boolean | null;
+		wildCard?: boolean;
 	}, pagination: {
 		untilId?: MiNote['id'];
 		sinceId?: MiNote['id'];
@@ -883,6 +911,7 @@ export class AdvancedSearchService {
 				});
 				osFilter.bool.must.push(reactionsQuery);
 			}
+
 			if (opts.reactionsExclude && 0 < opts.reactionsExclude.length) {
 				const reactionsExcludeQuery = {
 					nested: {
@@ -922,6 +951,7 @@ export class AdvancedSearchService {
 					}
 				}
 			}
+
 			if (opts.origin) {
 				if (opts.origin === 'local') {
 					osFilter.bool.must_not.push({ exists: { field: 'userHost' } });
@@ -953,13 +983,14 @@ export class AdvancedSearchService {
 
 			if (q && q !== '') {
 				if (opts.useStrictSearch) {
+					const query = opts.wildCard ? `*${q}*` : q;
 					osFilter.bool.must.push({
 						bool: {
 							should: [
-								{ wildcard: { 'text.keyword': q } },
-								{ wildcard: { 'cw.keyword': q } },
-								{ wildcard: { 'pollChoices.keyword': q } },
-								{ wildcard: { 'tags': q } },
+								{ wildcard: { 'text.keyword': query } },
+								{ wildcard: { 'cw.keyword': query } },
+								{ wildcard: { 'pollChoices.keyword': query } },
+								{ wildcard: { 'tags': query } },
 							],
 							minimum_should_match: 1,
 						},

packages/backend/src/core/SearchService.ts

@@ -13,6 +13,7 @@ import type { NotesRepository } from '@/models/_.js';
 import { MiUser } from '@/models/_.js';
 import { sqlLikeEscape } from '@/misc/sql-like-escape.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
+import { AdvancedSearchService } from '@/core/AdvancedSearchService.js';
 import { CacheService } from '@/core/CacheService.js';
 import { QueryService } from '@/core/QueryService.js';
 import { IdService } from '@/core/IdService.js';
@@ -90,6 +91,7 @@ export class SearchService {
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
+		private advancedSearchService: AdvancedSearchService,
 		private cacheService: CacheService,
 		private queryService: QueryService,
 		private idService: IdService,
@@ -189,6 +191,14 @@ export class SearchService {
 			case 'meilisearch': {
 				return this.searchNoteByMeiliSearch(q, me, opts, pagination);
 			}
+			case 'opensearch': {
+				return this.advancedSearchService.searchOrFail(me, {
+					userId: opts.userId,
+					host: opts.host,
+					useStrictSearch: true,
+					wildCard: true,
+				}, pagination, q);
+			}
 			default: {
 				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				const typeCheck: never = this.provider;

packages/backend/src/server/api/endpoint-list.ts

@@ -432,6 +432,7 @@ export * as 'admin/unset-user-mutual-link' from './endpoints/admin/unset-user-mu
 export * as 'admin/full-index' from './endpoints/admin/full-index.js';
 export * as 'admin/recreate-index' from './endpoints/admin/recreate-index.js';
 export * as 'ap/fetch-outbox' from './endpoints/ap/fetch-outbox.js';
+export * as 'federation/remote-software' from './endpoints/federation/remote-software.js';
 export * as 'messaging/messages/search' from './endpoints/messaging/messages/search.js';
 export * as 'notes/advanced-search' from './endpoints/notes/advanced-search.js';
 export * as 'notifications/delete' from './endpoints/notifications/delete.js';