Feat:AdvancedSearch/Fix:Reaction Viewer

.config/example.yml

@@ -129,6 +129,9 @@ dbReplications: false
 #    user:
 #    pass:
 
+# You can use PGroonga when enabled.
+#pgroonga: false
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
@@ -186,6 +189,22 @@ redis:
 #  index: ''
 #  scope: local
 
+
+#   ┌───────────────────────────┐
+#───┘ OpenSearch configuration └─────────────────────────────
+
+# You can use OpenSearch when you enabled AdvancedSearch.
+# THIS DOES NOT WORK BECAUSE OF WIP
+
+#opensearch:
+#  host: localhost
+#  port: 9200
+#  user: ''
+#  pass: ''
+#  ssl: false
+#  index: ''
+#  dictName: ''
+
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 

CHANGELOG_engawa.md

@@ -1,5 +1,5 @@
 <!--
-## engawa-x.x.x (unreleased)
+## x.x.x (unreleased)
 
 ### Release Date
 
@@ -15,6 +15,19 @@
 ### Misc
 
 -->
+## 0.3.1
+
+### Release Date
+
+### General
+- feat: 高度な検索機能の追加
+  - PGroongaやOpenSearchを利用できるようになります
+
+### Client
+- fix: 投稿にされたリアクションが正常に表示されない問題
+
+### Server
+
 ## 0.3.0
 
 ### Release Date

locales/en-US.yml

@@ -2837,3 +2837,20 @@ _imageCompressionMode:
   noResizeCompress: "Compression without resize"
   resizeCompressLossy: "Resize and lossy compression"
   noResizeCompressLossy: "Lossy compression without resize"
+
+_advancedSearch:
+  _fileOption:
+    title: "File attachment status"
+    fileAttachedOnly: "with file"
+    noFile: "No file"
+    combined: "both"
+  _searchOption:
+    toggleNsfw: "Exclude CW"
+    toggleReply: "Exclude Reply"
+    toggleDate: "Specify date and time"
+    toggleAdvancedSearch: "Enable Advanced Search"
+  _specifyDate:
+    startDate: "From"
+    endDate: "Until"
+  _description:
+    other: "Other settings"

locales/index.d.ts

@@ -7328,6 +7328,10 @@ export interface Locale extends ILocale {
              * ノート検索の利用
              */
             "canSearchNotes": string;
+            /**
+             * 高度な検索の利用
+             */
+            "canAdvancedSearchNotes": string;
             /**
              * 翻訳機能の利用
              */
@@ -7878,7 +7882,7 @@ export interface Locale extends ILocale {
          */
         "blockCode": string;
         /**
-         * 複数行のプログラムなどのコードをブロックでシンタックスハイライトします。
+         * 複数行のプログラムなどのコードをブロックでシンタックスハイライトします。いくつかの言語を指定するとその言語に合わせたシンタックスハイライトになります。
          */
         "blockCodeDescription": string;
         /**
@@ -8105,14 +8109,14 @@ export interface Locale extends ILocale {
          * 文字の上にルビを表示します。
          */
         "rubyDescription": string;
-				/**
-				 * ボーダー
-				 */
-				"border": string;
-				/**
-				 * 内容を枠線で囲みます。
-				 */
-				"borderDescription": string;
+        /**
+         * ボーダー
+         */
+        "border": string;
+        /**
+         * 内容を枠線で囲むことができます。
+         */
+        "borderDescription": string;
     };
     "_instanceTicker": {
         /**
@@ -11026,6 +11030,60 @@ export interface Locale extends ILocale {
          */
         "noResizeCompressLossy": string;
     };
+    "_advancedSearch": {
+        "_fileOption": {
+            /**
+             * ファイルの添付状態
+             */
+            "title": string;
+            /**
+             * あり
+             */
+            "fileAttachedOnly": string;
+            /**
+             * なし
+             */
+            "noFile": string;
+            /**
+             * 全て
+             */
+            "combined": string;
+        };
+        "_searchOption": {
+            /**
+             * CW付きを除外する
+             */
+            "toggleNsfw": string;
+            /**
+             * リプライを除外する
+             */
+            "toggleReply": string;
+            /**
+             * 日時を指定する
+             */
+            "toggleDate": string;
+            /**
+             * 高度な検索を有効にする
+             */
+            "toggleAdvancedSearch": string;
+        };
+        "_specifyDate": {
+            /**
+             * から
+             */
+            "startDate": string;
+            /**
+             * まで
+             */
+            "endDate": string;
+        };
+				"_description": {
+					/**
+					 * その他
+					 */
+					"other": string;
+				}
+    };
 }
 declare const locales: {
     [lang: string]: Locale;

locales/ja-JP.yml

@@ -1899,6 +1899,7 @@ _role:
     descriptionOfRateLimitFactor: "小さいほど制限が緩和され、大きいほど制限が強化されます。"
     canHideAds: "広告の非表示"
     canSearchNotes: "ノート検索の利用"
+    canAdvancedSearchNotes: "高度な検索の利用"
     canUseTranslator: "翻訳機能の利用"
     avatarDecorationLimit: "アイコンデコレーションの最大取付個数"
   _condition:
@@ -2935,3 +2936,20 @@ _imageCompressionMode:
   noResizeCompress: "縮小せず再圧縮する"
   resizeCompressLossy: "縮小して非可逆圧縮する"
   noResizeCompressLossy: "縮小せず非可逆圧縮する"
+
+_advancedSearch:
+  _fileOption:
+    title: "ファイルの添付状態"
+    fileAttachedOnly: "あり"
+    noFile: "なし"
+    combined: "全て"
+  _searchOption:
+    toggleNsfw: "CW付きを除外する"
+    toggleReply: "リプライを除外する"
+    toggleDate: "日時を指定する"
+    toggleAdvancedSearch: "高度な検索を有効にする"
+  _specifyDate:
+    startDate: "から"
+    endDate: "まで"
+  _description:
+    other: "その他の設定"

package.json

@@ -7,7 +7,7 @@
 		"type": "git",
 		"url": "https://github.com/kokonect-link/cherrypick.git"
 	},
-	"packageManager": "pnpm@8.15.1",
+	"packageManager": "pnpm@9.1.1+sha256.9551e803dcb7a1839fdf5416153a844060c7bce013218ce823410532504ac10b",
 	"workspaces": [
 		"packages/frontend",
 		"packages/backend",

packages/backend/package.json

@@ -87,6 +87,7 @@
 		"@nestjs/common": "10.2.10",
 		"@nestjs/core": "10.2.10",
 		"@nestjs/testing": "10.2.10",
+		"@opensearch-project/opensearch": "^2.7.0",
 		"@peertube/http-signature": "1.7.0",
 		"@simplewebauthn/server": "9.0.2",
 		"@sinonjs/fake-timers": "11.2.2",

packages/backend/src/GlobalModule.ts

@@ -8,6 +8,7 @@ import { Global, Inject, Module } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { DataSource } from 'typeorm';
 import { MeiliSearch } from 'meilisearch';
+import { Client as OpenSearch } from '@opensearch-project/opensearch';
 import { Logging } from '@google-cloud/logging';
 import { DI } from './di-symbols.js';
 import { Config, loadConfig } from './config.js';
@@ -45,6 +46,29 @@ const $meilisearch: Provider = {
 	inject: [DI.config],
 };
 
+const $opensearch: Provider = {
+	provide: DI.opensearch,
+	useFactory: (config: Config) => {
+		if (config.opensearch) {
+			return new OpenSearch({
+				nodes: {
+					url: new URL(`${config.opensearch.ssl ? 'https' : 'http'}://${config.opensearch.host}:${config.opensearch.port}`),
+					ssl: {
+						rejectUnauthorized: config.opensearch.rejectUnauthorized,
+					},
+				},
+				auth: {
+					username: config.opensearch.user,
+					password: config.opensearch.pass,
+				},
+			});
+		} else {
+			return null;
+		}
+	},
+	inject: [DI.config],
+};
+
 const $cloudLogging: Provider = {
 	provide: DI.cloudLogging,
 	useFactory: (config: Config) => {
@@ -109,8 +133,8 @@ const $redisForJobQueue: Provider = {
 @Global()
 @Module({
 	imports: [RepositoryModule],
-	providers: [$config, $db, $meilisearch, $cloudLogging, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForJobQueue],
-	exports: [$config, $db, $meilisearch, $cloudLogging, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForJobQueue, RepositoryModule],
+	providers: [$config, $db, $meilisearch, $opensearch, $cloudLogging, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForJobQueue],
+	exports: [$config, $db, $meilisearch, $opensearch, $cloudLogging, $redis, $redisForPub, $redisForSub, $redisForTimelines, $redisForJobQueue, RepositoryModule],
 })
 export class GlobalModule implements OnApplicationShutdown {
 	constructor(

packages/backend/src/config.ts

@@ -44,6 +44,7 @@ type Source = {
 		user: string;
 		pass: string;
 	}[];
+	pgroonga?: boolean;
 	redis: RedisOptionsSource;
 	redisForPubsub?: RedisOptionsSource;
 	redisForJobQueue?: RedisOptionsSource;
@@ -56,6 +57,15 @@ type Source = {
 		index: string;
 		scope?: 'local' | 'global' | string[];
 	};
+	opensearch?: {
+		host: string;
+		port: string;
+		user: string;
+		pass: string;
+		ssl?: boolean;
+		rejectUnauthorized?: boolean;
+		index: string;
+	} | undefined;
 
 	publishTarballInsteadOfProvideRepositoryUrl?: boolean;
 
@@ -126,6 +136,7 @@ export type Config = {
 		user: string;
 		pass: string;
 	}[] | undefined;
+	pgroonga: boolean | undefined;
 	meilisearch: {
 		host: string;
 		port: string;
@@ -134,6 +145,15 @@ export type Config = {
 		index: string;
 		scope?: 'local' | 'global' | string[];
 	} | undefined;
+	opensearch: {
+		host: string;
+		port: string;
+		user: string;
+		pass: string;
+		ssl?: boolean;
+		rejectUnauthorized?: boolean;
+		index: string;
+	} | undefined;
 	proxy: string | undefined;
 	proxySmtp: string | undefined;
 	proxyBypassHosts: string[] | undefined;
@@ -248,7 +268,9 @@ export function loadConfig(): Config {
 		db: config.db,
 		dbReplications: config.dbReplications,
 		dbSlaves: config.dbSlaves,
+		pgroonga: config.pgroonga,
 		meilisearch: config.meilisearch,
+		opensearch: config.opensearch,
 		redis,
 		redisForPubsub: config.redisForPubsub ? convertRedisOptions(config.redisForPubsub, host) : redis,
 		redisForJobQueue: config.redisForJobQueue ? convertRedisOptions(config.redisForJobQueue, host) : redis,

packages/backend/src/core/AchievementService.ts

@@ -84,6 +84,7 @@ export const ACHIEVEMENT_TYPES = [
 	'justPlainLucky',
 	'setNameToSyuilo',
 	'setNameToNoriDev',
+	'setNameToYojo',
 	'cookieClicked',
 	'brainDiver',
 	'smashTestNotificationButton',