Merge remote-branch 'misskey/develop'

.config/example.yml

@@ -159,6 +159,9 @@ id: 'aid'
 #deliverJobMaxAttempts: 12
 #inboxJobMaxAttempts: 8
 
+# Local address used for outgoing requests
+#outgoingAddress: 127.0.0.1
+
 # IP address family used for outgoing request (ipv4, ipv6 or dual)
 #outgoingAddressFamily: ipv4
 

.github/workflows/api-cherrypick-js.yml

@@ -14,7 +14,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version-file: '.node-version'
           cache: 'pnpm'

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
       with:
         version: 8
         run_install: false
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -46,7 +46,7 @@ jobs:
       with:
         version: 7
         run_install: false
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'
@@ -72,7 +72,7 @@ jobs:
       with:
         version: 7
         run_install: false
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/storybook.yml

@@ -38,7 +38,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js 20.x
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version-file: '.node-version'
         cache: 'pnpm'

.github/workflows/test-backend.yml

@@ -38,7 +38,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.github/workflows/test-cherrypick-js.yml

@@ -26,7 +26,7 @@ jobs:
       - run: corepack enable
 
       - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'pnpm'

.github/workflows/test-frontend.yml

@@ -25,7 +25,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'
@@ -83,7 +83,7 @@ jobs:
         version: 7
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

.github/workflows/test-production.yml

@@ -28,7 +28,7 @@ jobs:
         version: 8
         run_install: false
     - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'pnpm'

CHANGELOG.md

@@ -12,7 +12,7 @@
 
 -->
 
-## 2023.8.0 (unreleased)
+## 2023.9.0 (unreleased)
 
 ### General
 - OAuth 2.0のサポート
@@ -27,17 +27,24 @@
 - 絵文字ピッカーの検索の表示件数を100件に増加
 - Enhance: ユーザーメニューでスイッチでユーザーリストに追加・削除できるように
 - Enhance: 自分が押したリアクションのデザインを改善
+- Enhance: ノート検索にローカルのみ検索可能なオプションの追加
+- Enhance: AiScriptで`LOCALE`として現在の設定言語を取得できるように
 - Fix: サーバー情報画面(`/instance-info/{domain}`)でブロックができないのを修正
 - Fix: 未読のお知らせの「わかった」をクリック・タップしてもその場で「わかった」が消えない問題を修正
 - Fix: iOSで画面を回転させるとテキストサイズが変わる問題を修正
 - Fix: word mute for sub note is not applied
 - Fix: タイムラインを下にスクロールしてノート画面に移動して再び戻ったら以前のスクロール位置を失う問題を修正
+- Fix: Misskeyプラグインをインストールする際のAiScriptバージョンのチェックが0.14.0以降に対応していない問題を修正
+- Fix: 他のサーバーのユーザーへ「メッセージを送信」した時の初期テキストのメンションが間違っている問題を修正
+- Playの操作を行うAPI TokenをAPIコンソールから発行できるように
 
 ### Server
+- Fix: ノート検索 `notes/search` にてhostを指定した際に検索結果に反映されるように
 - cacheRemoteFilesの初期値はfalseになりました
 - ファイルアップロード時等にファイル名の拡張子を修正する関数(correctFilename)の挙動を改善
 - Fix: 一部のfeatured noteを照会できない問題を修正
 - Fix: muteがapiからのuser list timeline取得で機能しない問題を修正
+- Fix: ジョブキュー管理画面の認証を回避できる問題を修正
 
 ## 13.14.2
 
@@ -52,6 +59,7 @@
 ### Server
 - Fix: APIのオフセットが壊れていたせいで「もっと見る」でもっと見れない問題を修正
 - Fix: 外部サーバーの投稿がタイムラインに表示されないことがある問題を修正
+- Enhance: Add address bind config option (outgoingAddress)
 
 ## 13.14.1
 

locales/index.d.ts

@@ -2097,6 +2097,10 @@ export interface Locale {
         "write:gallery": string;
         "read:gallery-likes": string;
         "write:gallery-likes": string;
+        "read:flash": string;
+        "write:flash": string;
+        "read:flash-likes": string;
+        "write:flash-likes": string;
     };
     "_auth": {
         "shareAccessTitle": string;

locales/ja-JP.yml

@@ -2013,6 +2013,10 @@ _permissions:
   "write:gallery": "ギャラリーを操作する"
   "read:gallery-likes": "ギャラリーのいいねを見る"
   "write:gallery-likes": "ギャラリーのいいねを操作する"
+  "read:flash": "Playを見る"
+  "write:flash": "Playを操作する"
+  "read:flash-likes": "Playのいいねを見る"
+  "write:flash-likes": "Playのいいねを操作する"
 
 _auth:
   shareAccessTitle: "アプリへのアクセス許可"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "13.14.2-cp-4.2.0",
+	"version": "2023.9.0-beta.1-cp-4.2.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/migration/1665091090561-add-renote-muting.js

@@ -16,5 +16,9 @@ export class addRenoteMuting1665091090561 {
 	}
 
 	async down(queryRunner) {
+		await queryRunner.query(`DROP INDEX "IDX_renote_muting_muterId"`);
+		await queryRunner.query(`DROP INDEX "IDX_renote_muting_muteeId"`);
+		await queryRunner.query(`DROP INDEX "IDX_renote_muting_createdAt"`);
+		await queryRunner.query(`DROP TABLE "renote_muting"`);
 	}
 }

packages/backend/migration/1690417561185-fix-renote-muting.js

@@ -0,0 +1,12 @@
+export class FixRenoteMuting1690417561185 {
+    name = 'FixRenoteMuting1690417561185'
+
+    async up(queryRunner) {
+      await queryRunner.query(`DELETE FROM "renote_muting" WHERE "muteeId" NOT IN (SELECT "id" FROM "user")`);
+      await queryRunner.query(`DELETE FROM "renote_muting" WHERE "muterId" NOT IN (SELECT "id" FROM "user")`);
+    }
+
+    async down(queryRunner) {
+
+    }
+}

packages/backend/src/config.ts

@@ -76,6 +76,7 @@ export type Source = {
 
 	id: string;
 
+	outgoingAddress?: string;
 	outgoingAddressFamily?: 'ipv4' | 'ipv6' | 'dual';
 
 	deliverJobConcurrency?: number;

packages/backend/src/core/FetchInstanceMetadataService.ts

@@ -142,10 +142,10 @@ export class FetchInstanceMetadataService {
 
 			const links = wellknown.links as any[];
 
-			const lnik1_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/1.0');
-			const lnik2_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.0');
-			const lnik2_1 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.1');
-			const link = lnik2_1 ?? lnik2_0 ?? lnik1_0;
+			const link1_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/1.0');
+			const link2_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.0');
+			const link2_1 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.1');
+			const link = link2_1 ?? link2_0 ?? link1_0;
 
 			if (link == null) {
 				throw new Error('No nodeinfo link provided');

packages/backend/src/core/HttpRequestService.ts

@@ -53,12 +53,14 @@ export class HttpRequestService {
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup as unknown as net.LookupFunction,
+			localAddress: config.outgoingAddress,
 		});
 
 		this.https = new https.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup as unknown as net.LookupFunction,
+			localAddress: config.outgoingAddress,
 		});
 
 		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
@@ -71,6 +73,7 @@ export class HttpRequestService {
 				maxFreeSockets: 256,
 				scheduling: 'lifo',
 				proxy: config.proxy,
+				localAddress: config.outgoingAddress,
 			})
 			: this.http;
 
@@ -82,6 +85,7 @@ export class HttpRequestService {
 				maxFreeSockets: 256,
 				scheduling: 'lifo',
 				proxy: config.proxy,
+				localAddress: config.outgoingAddress,
 			})
 			: this.https;
 	}

packages/backend/src/core/SearchService.ts

@@ -25,6 +25,8 @@ type Q =
 	{ op: '<', k: K, v: number } |
 	{ op: '>=', k: K, v: number } |
 	{ op: '<=', k: K, v: number } |
+	{ op: 'is null', k: K} |
+	{ op: 'is not null', k: K} |
 	{ op: 'and', qs: Q[] } |
 	{ op: 'or', qs: Q[] } |
 	{ op: 'not', q: Q };
@@ -50,6 +52,8 @@ function compileQuery(q: Q): string {
 		case '<=': return `(${q.k} <= ${compileValue(q.v)})`;
 		case 'and': return q.qs.length === 0 ? '' : `(${ q.qs.map(_q => compileQuery(_q)).join(' AND ') })`;
 		case 'or': return q.qs.length === 0 ? '' : `(${ q.qs.map(_q => compileQuery(_q)).join(' OR ') })`;
+		case 'is null': return `(${q.k} IS NULL)`;
+		case 'is not null': return `(${q.k} IS NOT NULL)`;
 		case 'not': return `(NOT ${compileQuery(q.q)})`;
 		default: throw new Error('unrecognized query operator');
 	}
@@ -171,7 +175,7 @@ export class SearchService {
 			if (opts.channelId) filter.qs.push({ op: '=', k: 'channelId', v: opts.channelId });
 			if (opts.host) {
 				if (opts.host === '.') {
-					// TODO: Meilisearchが2023/05/07現在値がNULLかどうかのクエリが書けない
+					filter.qs.push({ op: 'is null', k: 'userHost' });
 				} else {
 					filter.qs.push({ op: '=', k: 'userHost', v: opts.host });
 				}
@@ -211,6 +215,14 @@ export class SearchService {
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
+			if (opts.host) {
+				if (opts.host === '.') {
+					query.andWhere('user.host IS NULL');
+				} else {
+					query.andWhere('user.host = :host', { host: opts.host });
+				}
+			}
+
 			this.queryService.generateVisibilityQuery(query, me);
 			if (me) this.queryService.generateMutedUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);

packages/backend/src/server/web/ClientServerService.ts

@@ -143,7 +143,9 @@ export class ClientServerService {
 
 		// Authenticate
 		fastify.addHook('onRequest', async (request, reply) => {
-			if (request.url === bullBoardPath || request.url.startsWith(bullBoardPath + '/')) {
+			// %71ueueとかでリクエストされたら困るため
+			const url = decodeURI(request.url);
+			if (url === bullBoardPath || url.startsWith(bullBoardPath + '/')) {
 				const token = request.cookies.token;
 				if (token == null) {
 					reply.code(401);

packages/cherrypick-js/src/consts.ts

@@ -39,4 +39,8 @@ export const permissions = [
 	'write:gallery',
 	'read:gallery-likes',
 	'write:gallery-likes',
+	'read:flash',
+	'write:flash',
+	'read:flash-likes',
+	'write:flash-likes',
 ];

packages/frontend/src/pages/search.note.vue

@@ -17,18 +17,22 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkFolder>
 			<template #label>{{ i18n.ts.options }}</template>
 
-			<MkFolder>
-				<template #label>{{ i18n.ts.specifyUser }}</template>
-				<template v-if="user" #suffix>@{{ user.username }}</template>
-
-				<div style="text-align: center;" class="_gaps">
-					<div v-if="user">@{{ user.username }}</div>
-					<div>
-						<MkButton v-if="user == null" primary rounded inline @click="selectUser">{{ i18n.ts.selectUser }}</MkButton>
-						<MkButton v-else danger rounded inline @click="user = null">{{ i18n.ts.remove }}</MkButton>
+			<div class="_gaps_m">
+				<!-- <MkSwitch v-model="isLocalOnly">{{ i18n.ts.localOnly }}</MkSwitch> -->
+
+				<MkFolder>
+					<template #label>{{ i18n.ts.specifyUser }}</template>
+					<template v-if="user" #suffix>@{{ user.username }}</template>
+
+					<div style="text-align: center;" class="_gaps">
+						<div v-if="user">@{{ user.username }}</div>
+						<div>
+							<MkButton v-if="user == null" primary rounded inline @click="selectUser">{{ i18n.ts.selectUser }}</MkButton>
+							<MkButton v-else danger rounded inline @click="user = null">{{ i18n.ts.remove }}</MkButton>
+						</div>
 					</div>
-				</div>
-			</MkFolder>
+				</MkFolder>
+			</div>
 		</MkFolder>
 		<div>
 			<MkButton large primary gradate rounded style="margin: 0 auto;" @click="search">{{ i18n.ts.search }}</MkButton>
@@ -48,6 +52,7 @@ import MkNotes from '@/components/MkNotes.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkRadios from '@/components/MkRadios.vue';
 import MkButton from '@/components/MkButton.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
 import { i18n } from '@/i18n';
 import * as os from '@/os';
 import MkFoldableSection from '@/components/MkFoldableSection.vue';
@@ -64,6 +69,7 @@ let searchQuery = $ref('');
 let searchOrigin = $ref('combined');
 let notePagination = $ref();
 let user = $ref(null);
+let isLocalOnly = $ref(false);
 
 function selectUser() {
 	os.selectUser().then(_user => {
@@ -104,6 +110,8 @@ async function search() {
 		},
 	};
 
+	if (isLocalOnly) notePagination.params.host = '.';
+
 	key++;
 }
 

packages/frontend/src/scripts/aiscript/api.ts

@@ -10,6 +10,7 @@ import * as os from '@/os';
 import { $i } from '@/account';
 import { miLocalStorage } from '@/local-storage';
 import { customEmojis } from '@/custom-emojis';
+import { lang } from '@/config';
 
 export function createAiScriptEnv(opts) {
 	let apiRequests = 0;
@@ -22,6 +23,7 @@ export function createAiScriptEnv(opts) {
 		USER_NAME: $i ? values.STR($i.name) : values.NULL,
 		USER_USERNAME: $i ? values.STR($i.username) : values.NULL,
 		CUSTOM_EMOJIS: utils.jsToVal(customEmojis.value),
+		LOCALE: values.STR(lang),
 		'Mk:dialog': values.FN_NATIVE(async ([title, text, type]) => {
 			await os.alert({
 				type: type ? type.value : 'info',