Merge branch 'custom-nj/develop' into custom-nj/main

.config/example.yml

@@ -202,6 +202,7 @@ redis:
 #  pass: ''
 #  ssl: true
 #  index: ''
+#  dictName: 'system_core.dic'
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

README.md

@@ -1,9 +1,9 @@
 <div align="center">
-<a href="https://nijimiss.moe/">
-	<img src="https://media.nijimiss.moe/nijimiss-moe-ja/null/dc158d85-683e-429f-b879-b8ad34f2712c.png" alt="Nijimiss logo" style="border-radius:50%" width="400"/>
+<a href="https://nijimiss.org/">
+	<img src="https://media.nijimiss.app/null/0bf9517b-35bd-4f0e-a454-e640fd509bcf.png" alt="Nijimiss Project logo" style="border-radius:50%" width="400"/>
 </a>
 
-### Fork of Misskey by Team Nijimiss
+### Fork of Misskey by Nijimiss Project.
 
 </div>
 
@@ -15,11 +15,15 @@
 - Add search filters to tag searches.
 - Add "日本語 (お嬢様)" to the display language. (Special Thanks to [緋色なつめ](https://nijimiss.moe/@Nattsume_hi_iro))
 - Add media timeline.
+- Add advanced search options using OpenSearch + Sudachi.
+- Add subscription system using Stripe as payment provider.
 
 **These changes were incorporated from a fork of [MisskeyIO](https://github.com/MisskeyIO/misskey/tree/io).**
 
 - Enhance the announcement function.
 - Do not display posts of frozen users.
+- Can now specify the report category when reporting.
+- ...many others
 
 
 <div align="center">

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.3.1-NJ-4.0.0",
+	"version": "2024.3.1-NJ-4.0.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/config.ts

@@ -65,6 +65,7 @@ type Source = {
 		ssl?: boolean;
 		rejectUnauthorized?: boolean;
 		index: string;
+		dictName: string;
 	};
 
 	publishTarballInsteadOfProvideRepositoryUrl?: boolean;
@@ -151,6 +152,7 @@ export type Config = {
 		ssl?: boolean;
 		rejectUnauthorized?: boolean;
 		index: string;
+		dictName: string;
 	} | undefined;
 	proxy: string | undefined;
 	proxySmtp: string | undefined;

packages/backend/src/core/SearchService.ts

@@ -140,13 +140,13 @@ export class SearchService {
 										tokenizer: {
 											sudachi_c_tokenizer: {
 												type: 'sudachi_tokenizer',
-												additional_settings: '{\'systemDict\':\'system_core.dic\'}',
+												additional_settings: `{\'systemDict\':\'${this.config.opensearch?.dictName}\'}`,
 												split_mode: 'C',
 												discard_punctuation: true,
 											},
 											sudachi_a_tokenizer: {
 												type: 'sudachi_tokenizer',
-												additional_settings: '{\'systemDict\':\'system_core.dic\'}',
+												additional_settings: `{\'systemDict\':\'${this.config.opensearch?.dictName}\'}`,
 												split_mode: 'A',
 												discard_punctuation: true,
 											},
@@ -266,6 +266,13 @@ export class SearchService {
 
 		if (this.meilisearch) {
 			this.meilisearchNoteIndex!.deleteDocument(note.id);
+		} else if (this.opensearch) {
+			this.opensearch.delete({
+				index: this.opensearchNoteIndex + `-${new Date().toISOString().slice(0, 7).replace(/-/g, '')}` as string,
+				id: note.id,
+			}).catch((error) => {
+				console.error(error);
+			});
 		}
 	}