chore(deps): bump @sentry/node from 8.20.0 to 8.37.1

Bumps [@sentry/node](https://github.com/getsentry/sentry-javascript) from 8.20.0 to 8.37.1.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/8.20.0...8.37.1)

---
updated-dependencies:
- dependency-name: "@sentry/node"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

CHANGELOG.md

@@ -1,10 +1,8 @@
-## 2024.11.0
+## 2024.10.2
 
 ### General
 - Feat: コンテンツの表示にログインを必須にできるように
 - Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
-- Enhance: 依存関係の更新
-- Enhance: l10nの更新
 
 ### Client
 - Enhance: Bull DashboardでRelationship Queueの状態も確認できるように  
@@ -18,7 +16,6 @@
   - 認証するアカウントを切り替えられるように
 - Enhance: Self-XSS防止用の警告を追加
 - Enhance: カタルーニャ語 (ca-ES) に対応  
-- Enhance: 個別お知らせページではMetaタグを出力するように
 - Fix: 通知の範囲指定の設定項目が必要ない通知設定でも範囲指定の設定がでている問題を修正
 - Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
@@ -27,25 +24,20 @@
 - Fix: リンク切れを修正
 = Fix: ノート投稿ボタンにホバー時のスタイルが適用されていないのを修正  
   (Cherry-picked from https://github.com/taiyme/misskey/pull/305)
-- Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
 
 ### Server
 - Enhance: 起動前の疎通チェックで、DBとメイン以外のRedisの疎通確認も行うように  
   (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/588)  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/715)
-- Enhance: リモートユーザーの照会をオリジナルにリダイレクトするように
+- fix(backend): フォロワーへのメッセージの絵文字をemojisに含めるように
-- Fix: フォロワーへのメッセージの絵文字をemojisに含めるように
 - Fix: Nested proxy requestsを検出した際にブロックするように
   [ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)
 - Fix: 招待コードの発行可能な残り数算出に使用すべきロールポリシーの値が違う問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/706)
 - Fix: 連合への配信時に、acctの大小文字が区別されてしまい正しくメンションが処理されないことがある問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/711)
-- Fix: ローカルユーザーへのメンションを含むノートが連合される際に正しいURLに変換されないことがある問題を修正  
-  (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/712)
 - Fix: FTT無効時にユーザーリストタイムラインが使用できない問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/709)
-- Fix: User Webhookテスト機能のMock Payloadを修正  
 
 ### Misskey.js
 - Fix: Stream初期化時、別途WebSocketを指定する場合の型定義を修正

CONTRIBUTING.md

@@ -83,10 +83,6 @@ One should not add property that has defined before by other implementation, or
 ## Reviewers guide
 Be willing to comment on the good points and not just the things you want fixed 💯
 
-読んでおくといいやつ
-- https://blog.lacolaco.net/posts/1e2cf439b3c2/
-- https://konifar-zatsu.hatenadiary.jp/entry/2024/11/05/192421
-
 ### Review perspective
 - Scope
 	- Are the goals of the PR clear?

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-alpha.0",
+	"version": "2024.10.2-alpha.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/package.json

@@ -88,7 +88,7 @@
 		"@nestjs/core": "10.4.4",
 		"@nestjs/testing": "10.4.4",
 		"@peertube/http-signature": "1.7.0",
-		"@sentry/node": "8.20.0",
+		"@sentry/node": "8.37.1",
 		"@sentry/profiling-node": "8.20.0",
 		"@simplewebauthn/server": "10.0.1",
 		"@sinonjs/fake-timers": "11.2.2",

packages/backend/src/core/MfmService.ts

@@ -407,9 +407,7 @@ export class MfmService {
 				const a = doc.createElement('a');
 				const { username, host, acct } = node.props;
 				const remoteUserInfo = mentionedRemoteUsers.find(remoteUser => remoteUser.username.toLowerCase() === username.toLowerCase() && remoteUser.host?.toLowerCase() === host?.toLowerCase());
-				a.setAttribute('href', remoteUserInfo
+				a.setAttribute('href', remoteUserInfo ? (remoteUserInfo.url ? remoteUserInfo.url : remoteUserInfo.uri) : `${this.config.url}/${acct}`);
-					? (remoteUserInfo.url ? remoteUserInfo.url : remoteUserInfo.uri)
-					: `${this.config.url}/${acct.endsWith(`@${this.config.url}`) ? acct.substring(0, acct.length - this.config.url.length - 1) : acct}`);
 				a.className = 'u-url mention';
 				a.textContent = acct;
 				return a;

packages/backend/src/core/QueueService.ts

@@ -7,7 +7,7 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiWebhook, WebhookEventTypes, webhookEventTypes } from '@/models/Webhook.js';
+import type { MiWebhook, webhookEventTypes } from '@/models/Webhook.js';
 import type { MiSystemWebhook, SystemWebhookEventType } from '@/models/SystemWebhook.js';
 import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
@@ -35,7 +35,6 @@ import type {
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
-import { type UserWebhookPayload } from './UserWebhookService.js';
 
 @Injectable()
 export class QueueService {
@@ -469,10 +468,10 @@ export class QueueService {
 	 * @see UserWebhookDeliverProcessorService
 	 */
 	@bindThis
-	public userWebhookDeliver<T extends WebhookEventTypes>(
+	public userWebhookDeliver(
 		webhook: MiWebhook,
-		type: T,
+		type: typeof webhookEventTypes[number],
-		content: UserWebhookPayload<T>,
+		content: unknown,
 		opts?: { attempts?: number },
 	) {
 		const data: UserWebhookDeliverJobData = {

packages/backend/src/core/UserWebhookService.ts

@@ -6,23 +6,11 @@
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
 import { type WebhooksRepository } from '@/models/_.js';
-import { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
+import { MiWebhook } from '@/models/Webhook.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { GlobalEvents } from '@/core/GlobalEventService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
-import type { Packed } from '@/misc/json-schema.js';
-
-export type UserWebhookPayload<T extends WebhookEventTypes> =
-	T extends 'note' | 'reply' | 'renote' |'mention' ? {
-		note: Packed<'Note'>,
-	} :
-	T extends 'follow' | 'unfollow' ? {
-		user: Packed<'UserDetailedNotMe'>,
-	} :
-	T extends 'followed' ? {
-		user: Packed<'UserLite'>,
-	} : never;
 
 @Injectable()
 export class UserWebhookService implements OnApplicationShutdown {

packages/backend/src/core/WebhookTestService.ts

@@ -10,7 +10,7 @@ import { MiSystemWebhook, type SystemWebhookEventType } from '@/models/SystemWeb
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { Packed } from '@/misc/json-schema.js';
 import { type WebhookEventTypes } from '@/models/Webhook.js';
-import { type UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js';
+import { UserWebhookService } from '@/core/UserWebhookService.js';
 import { QueueService } from '@/core/QueueService.js';
 import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 
@@ -306,10 +306,10 @@ export class WebhookTestService {
 	 * - 送信対象イベント（on）に関する設定
 	 */
 	@bindThis
-	public async testUserWebhook<T extends WebhookEventTypes>(
+	public async testUserWebhook(
 		params: {
 			webhookId: MiWebhook['id'],
-			type: T,
+			type: WebhookEventTypes,
 			override?: Partial<Omit<MiWebhook, 'id'>>,
 		},
 		sender: MiUser | null,
@@ -321,7 +321,7 @@ export class WebhookTestService {
 		}
 
 		const webhook = webhooks[0];
-		const send = <U extends WebhookEventTypes>(type: U, contents: UserWebhookPayload<U>) => {
+		const send = (contents: unknown) => {
 			const merged = {
 				...webhook,
 				...params.override,
@@ -329,7 +329,7 @@ export class WebhookTestService {
 
 			// テスト目的なのでUserWebhookServiceの機能を経由せず直接キューに追加する（チェック処理などをスキップする意図）.
 			// また、Jobの試行回数も1回だけ.
-			this.queueService.userWebhookDeliver(merged, type, contents, { attempts: 1 });
+			this.queueService.userWebhookDeliver(merged, params.type, contents, { attempts: 1 });
 		};
 
 		const dummyNote1 = generateDummyNote({
@@ -361,40 +361,33 @@ export class WebhookTestService {
 
 		switch (params.type) {
 			case 'note': {
-				send('note', { note: toPackedNote(dummyNote1) });
+				send(toPackedNote(dummyNote1));
 				break;
 			}
 			case 'reply': {
-				send('reply', { note: toPackedNote(dummyReply1) });
+				send(toPackedNote(dummyReply1));
 				break;
 			}
 			case 'renote': {
-				send('renote', { note: toPackedNote(dummyRenote1) });
+				send(toPackedNote(dummyRenote1));
 				break;
 			}
 			case 'mention': {
-				send('mention', { note: toPackedNote(dummyMention1) });
+				send(toPackedNote(dummyMention1));
 				break;
 			}
 			case 'follow': {
-				send('follow', { user: toPackedUserDetailedNotMe(dummyUser1) });
+				send(toPackedUserDetailedNotMe(dummyUser1));
 				break;
 			}
 			case 'followed': {
-				send('followed', { user: toPackedUserLite(dummyUser2) });
+				send(toPackedUserLite(dummyUser2));
 				break;
 			}
 			case 'unfollow': {
-				send('unfollow', { user: toPackedUserDetailedNotMe(dummyUser3) });
+				send(toPackedUserDetailedNotMe(dummyUser3));
 				break;
 			}
-			// まだ実装されていない (#9485)
-			case 'reaction': return;
-			default: {
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				const _exhaustiveAssertion: never = params.type;
-				return;
-			}
 		}
 	}
 

packages/backend/src/misc/sql-like-escape.ts

@@ -4,5 +4,5 @@
  */
 
 export function sqlLikeEscape(s: string) {
-	return s.replace(/([\\%_])/g, '\\$1');
+	return s.replace(/([%_])/g, '\\$1');
 }

packages/backend/src/server/ActivityPubServerService.ts

@@ -29,7 +29,6 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { IActivity } from '@/core/activitypub/type.js';
 import { isQuote, isRenote } from '@/misc/is-renote.js';
-import * as Acct from '@/misc/acct.js';
 import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify';
 import type { FindOptionsWhere } from 'typeorm';
 
@@ -487,16 +486,6 @@ export class ActivityPubServerService {
 			return;
 		}
 
-		// リモートだったらリダイレクト
-		if (user.host != null) {
-			if (user.uri == null || this.utilityService.isSelfHost(user.host)) {
-				reply.code(500);
-				return;
-			}
-			reply.redirect(user.uri, 301);
-			return;
-		}
-
 		reply.header('Cache-Control', 'public, max-age=180');
 		this.setResponseType(request, reply);
 		return (this.apRendererService.addContext(await this.apRendererService.renderPerson(user as MiLocalUser)));
@@ -665,20 +654,19 @@ export class ActivityPubServerService {
 
 			const user = await this.usersRepository.findOneBy({
 				id: userId,
+				host: IsNull(),
 				isSuspended: false,
 			});
 
 			return await this.userInfo(request, reply, user);
 		});
 
-		fastify.get<{ Params: { acct: string; } }>('/@:acct', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
+		fastify.get<{ Params: { user: string; } }>('/@:user', { constraints: { apOrHtml: 'ap' } }, async (request, reply) => {
 			vary(reply.raw, 'Accept');
 
-			const acct = Acct.parse(request.params.acct);
-
 			const user = await this.usersRepository.findOneBy({
-				usernameLower: acct.username,
+				usernameLower: request.params.user.toLowerCase(),
-				host: acct.host ?? IsNull(),
+				host: IsNull(),
 				isSuspended: false,
 			});
 

packages/backend/src/server/api/endpoints/i/update.ts

@@ -465,7 +465,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			const newName = updates.name === undefined ? user.name : updates.name;
 			const newDescription = profileUpdates.description === undefined ? profile.description : profileUpdates.description;
 			const newFields = profileUpdates.fields === undefined ? profile.fields : profileUpdates.fields;
-			const newFollowedMessage = profileUpdates.followedMessage === undefined ? profile.followedMessage : profileUpdates.followedMessage;
+			const newFollowedMessage = profileUpdates.description === undefined ? profile.followedMessage : profileUpdates.followedMessage;
 
 			if (newName != null) {
 				let hasProhibitedWords = false;

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

@@ -42,26 +42,13 @@ import { MetaEntityService } from '@/core/entities/MetaEntityService.js';
 import { GalleryPostEntityService } from '@/core/entities/GalleryPostEntityService.js';
 import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
 import { ChannelEntityService } from '@/core/entities/ChannelEntityService.js';
-import type {
+import type { ChannelsRepository, ClipsRepository, FlashsRepository, GalleryPostsRepository, MiMeta, NotesRepository, PagesRepository, ReversiGamesRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js';
-	AnnouncementsRepository,
-	ChannelsRepository,
-	ClipsRepository,
-	FlashsRepository,
-	GalleryPostsRepository,
-	MiMeta,
-	NotesRepository,
-	PagesRepository,
-	ReversiGamesRepository,
-	UserProfilesRepository,
-	UsersRepository,
-} from '@/models/_.js';
 import type Logger from '@/logger.js';
 import { handleRequestRedirectToOmitSearch } from '@/misc/fastify-hook-handlers.js';
 import { bindThis } from '@/decorators.js';
 import { FlashEntityService } from '@/core/entities/FlashEntityService.js';
 import { RoleService } from '@/core/RoleService.js';
 import { ReversiGameEntityService } from '@/core/entities/ReversiGameEntityService.js';
-import { AnnouncementEntityService } from '@/core/entities/AnnouncementEntityService.js';
 import { FeedService } from './FeedService.js';
 import { UrlPreviewService } from './UrlPreviewService.js';
 import { ClientLoggerService } from './ClientLoggerService.js';
@@ -116,9 +103,6 @@ export class ClientServerService {
 		@Inject(DI.reversiGamesRepository)
 		private reversiGamesRepository: ReversiGamesRepository,
 
-		@Inject(DI.announcementsRepository)
-		private announcementsRepository: AnnouncementsRepository,
-
 		private flashEntityService: FlashEntityService,
 		private userEntityService: UserEntityService,
 		private noteEntityService: NoteEntityService,
@@ -128,7 +112,6 @@ export class ClientServerService {
 		private clipEntityService: ClipEntityService,
 		private channelEntityService: ChannelEntityService,
 		private reversiGameEntityService: ReversiGameEntityService,
-		private announcementEntityService: AnnouncementEntityService,
 		private urlPreviewService: UrlPreviewService,
 		private feedService: FeedService,
 		private roleService: RoleService,
@@ -793,24 +776,6 @@ export class ClientServerService {
 				return await renderBase(reply);
 			}
 		});
-
-		// 個別お知らせページ
-		fastify.get<{ Params: { announcementId: string; } }>('/announcements/:announcementId', async (request, reply) => {
-			const announcement = await this.announcementsRepository.findOneBy({
-				id: request.params.announcementId,
-			});
-
-			if (announcement) {
-				const _announcement = await this.announcementEntityService.pack(announcement);
-				reply.header('Cache-Control', 'public, max-age=3600');
-				return await reply.view('announcement', {
-					announcement: _announcement,
-					...await this.generateCommonPugData(this.meta),
-				});
-			} else {
-				return await renderBase(reply);
-			}
-		});
 		//#endregion
 
 		//#region noindex pages

packages/backend/src/server/web/views/announcement.pug

@@ -1,21 +0,0 @@
-extends ./base
-
-block vars
-	- const title = announcement.title;
-	- const description = announcement.text.length > 100 ? announcement.text.slice(0, 100) + '…' : announcement.text;
-	- const url = `${config.url}/announcements/${announcement.id}`;
-
-block title
-	= `${title} | ${instanceName}`
-
-block desc
-	meta(name='description' content=description)
-
-block og
-	meta(property='og:type'        content='article')
-	meta(property='og:title'       content= title)
-	meta(property='og:description' content= description)
-	meta(property='og:url'         content= url)
-	if announcement.imageUrl
-		meta(property='og:image' content=announcement.imageUrl)
-		meta(property='twitter:card' content='summary_large_image')

packages/backend/src/server/web/views/base.pug

@@ -2,7 +2,6 @@ block vars
 
 block loadClientEntry
 	- const entry = config.frontendEntry;
-	- const baseUrl = config.url;
 
 doctype html
 
@@ -33,7 +32,7 @@ html
 		link(rel='icon' href= icon || '/favicon.ico')
 		link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')
 		link(rel='manifest' href='/manifest.json')
-		link(rel='search' type='application/opensearchdescription+xml' title=(title || "Misskey") href=`${baseUrl}/opensearch.xml`)
+		link(rel='search' type='application/opensearchdescription+xml' title=(title || "Misskey") href=`${url}/opensearch.xml`)
 		link(rel='prefetch' href=serverErrorImageUrl)
 		link(rel='prefetch' href=infoImageUrl)
 		link(rel='prefetch' href=notFoundImageUrl)

packages/backend/test/e2e/fetch-resource.ts

@@ -230,7 +230,6 @@ describe('Webリソース', () => {
 				path: path('xxxxxxxxxx'),
 				type: HTML,
 			}));
-			test.todo('HTMLとしてGETできる。(リモートユーザーでもリダイレクトせず)');
 		});
 
 		describe.each([
@@ -250,7 +249,6 @@ describe('Webリソース', () => {
 				path: path('xxxxxxxxxx'),
 				accept,
 			}));
-			test.todo('はオリジナルにリダイレクトされる。(リモートユーザー)');
 		});
 	});
 

packages/backend/test/unit/WebhookTestService.ts

@@ -7,7 +7,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { beforeAll, describe, jest } from '@jest/globals';
 import { WebhookTestService } from '@/core/WebhookTestService.js';
-import { UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js';
+import { UserWebhookService } from '@/core/UserWebhookService.js';
 import { SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { GlobalModule } from '@/GlobalModule.js';
 import { MiSystemWebhook, MiUser, MiWebhook, UserProfilesRepository, UsersRepository } from '@/models/_.js';
@@ -122,7 +122,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('note');
-			expect((calls[2] as UserWebhookPayload<'note'>).note.id).toBe('dummy-note-1');
+			expect((calls[2] as any).id).toBe('dummy-note-1');
 		});
 
 		test('reply', async () => {
@@ -131,7 +131,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('reply');
-			expect((calls[2] as UserWebhookPayload<'reply'>).note.id).toBe('dummy-reply-1');
+			expect((calls[2] as any).id).toBe('dummy-reply-1');
 		});
 
 		test('renote', async () => {
@@ -140,7 +140,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('renote');
-			expect((calls[2] as UserWebhookPayload<'renote'>).note.id).toBe('dummy-renote-1');
+			expect((calls[2] as any).id).toBe('dummy-renote-1');
 		});
 
 		test('mention', async () => {
@@ -149,7 +149,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('mention');
-			expect((calls[2] as UserWebhookPayload<'mention'>).note.id).toBe('dummy-mention-1');
+			expect((calls[2] as any).id).toBe('dummy-mention-1');
 		});
 
 		test('follow', async () => {
@@ -158,7 +158,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('follow');
-			expect((calls[2] as UserWebhookPayload<'follow'>).user.id).toBe('dummy-user-1');
+			expect((calls[2] as any).id).toBe('dummy-user-1');
 		});
 
 		test('followed', async () => {
@@ -167,7 +167,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('followed');
-			expect((calls[2] as UserWebhookPayload<'followed'>).user.id).toBe('dummy-user-2');
+			expect((calls[2] as any).id).toBe('dummy-user-2');
 		});
 
 		test('unfollow', async () => {
@@ -176,7 +176,7 @@ describe('WebhookTestService', () => {
 			const calls = queueService.userWebhookDeliver.mock.calls[0];
 			expect((calls[0] as any).id).toBe('dummy-webhook');
 			expect(calls[1]).toBe('unfollow');
-			expect((calls[2] as UserWebhookPayload<'unfollow'>).user.id).toBe('dummy-user-3');
+			expect((calls[2] as any).id).toBe('dummy-user-3');
 		});
 
 		describe('NoSuchWebhookError', () => {

packages/frontend/src/account.ts

@@ -22,66 +22,23 @@ type Account = Misskey.entities.MeDetailed & { token: string };
 const accountData = miLocalStorage.getItem('account');
 
 // TODO: 外部からはreadonlyに
-/**
- * Reactive state for the current account. "I" as in "I am logged in".
- * Initialized from local storage if available, otherwise null.
- *
- * @type {Account | null}
- */
 export const $i = accountData ? reactive(JSON.parse(accountData) as Account) : null;
 
-/**
- * Whether the current account is a moderator.
- *
- * @type {boolean}
- */
 export const iAmModerator = $i != null && ($i.isAdmin === true || $i.isModerator === true);
-
-/**
- * Whether the current account is an administrator.
- *
- * @type {boolean}
- */
 export const iAmAdmin = $i != null && $i.isAdmin;
 
-/**
- * Whether it is necessary to sign in; checks if the current
- * account is null and throws an error if so.
- *
- * @throws {Error} If the current account is null
- * @returns {Account} The current account
- */
 export function signinRequired() {
 	if ($i == null) throw new Error('signin required');
 	return $i;
 }
 
-/**
- * Extracts the current number of notes from the current account.
- *
- * Note: This appears to only be used for the "notes1" achievement.
- *
- * Also, separating it like this might cause counts to get out-of-sync.
- */
 export let notesCount = $i == null ? 0 : $i.notesCount;
-
-/**
- * Increments the number of notes by one.
- *
- * Documentation TODO: What about $i.notesCount? Why not increment that?
- */
 export function incNotesCount() {
 	notesCount++;
 }
 
 export async function signout() {
-
+	if (!$i) return;
-	// If we're not signed in, there's nothing to do.
-	if (!$i) {
-		// Error log:
-		console.error('signout() called when not signed in');
-		return;
-	}
 
 	waiting();
 	miLocalStorage.removeItem('account');

packages/frontend/src/boot/common.ts

@@ -15,7 +15,7 @@ import { updateI18n, i18n } from '@/i18n.js';
 import { $i, refreshAccount, login } from '@/account.js';
 import { defaultStore, ColdDeviceStorage } from '@/store.js';
 import { fetchInstance, instance } from '@/instance.js';
-import { deviceKind, updateDeviceKind } from '@/scripts/device-kind.js';
+import { deviceKind } from '@/scripts/device-kind.js';
 import { reloadChannel } from '@/scripts/unison-reload.js';
 import { getUrlWithoutLoginId } from '@/scripts/login-id.js';
 import { getAccountFromId } from '@/scripts/get-account-from-id.js';
@@ -185,10 +185,6 @@ export async function common(createVue: () => App<Element>) {
 		}
 	});
 
-	watch(defaultStore.reactiveState.overridedDeviceKind, (kind) => {
-		updateDeviceKind(kind);
-	}, { immediate: true });
-
 	watch(defaultStore.reactiveState.useBlurEffectForModal, v => {
 		document.documentElement.style.setProperty('--MI-modalBgFilter', v ? 'blur(4px)' : 'none');
 	}, { immediate: true });

packages/frontend/src/components/MkMediaVideo.vue

@@ -118,7 +118,7 @@ import { hms } from '@/filters/hms.js';
 import { defaultStore } from '@/store.js';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
-import { exitFullscreen, requestFullscreen } from '@/scripts/fullscreen.js';
+import { isFullscreenNotSupported } from '@/scripts/device-kind.js';
 import hasAudio from '@/scripts/media-has-audio.js';
 import MkMediaRange from '@/components/MkMediaRange.vue';
 import { $i, iAmModerator } from '@/account.js';
@@ -334,21 +334,26 @@ function togglePlayPause() {
 }
 
 function toggleFullscreen() {
-	if (playerEl.value == null || videoEl.value == null) return;
+	if (isFullscreenNotSupported && videoEl.value) {
-	if (isFullscreen.value) {
+		if (isFullscreen.value) {
-		exitFullscreen({
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			videoEl: videoEl.value,
+			//@ts-ignore
-		});
+			videoEl.value.webkitExitFullscreen();
-		isFullscreen.value = false;
+			isFullscreen.value = false;
-	} else {
+		} else {
-		requestFullscreen({
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-			videoEl: videoEl.value,
+			//@ts-ignore
-			playerEl: playerEl.value,
+			videoEl.value.webkitEnterFullscreen();
-			options: {
+			isFullscreen.value = true;
-				navigationUI: 'hide',
+		}
-			},
+	} else if (playerEl.value) {
-		});
+		if (isFullscreen.value) {
-		isFullscreen.value = true;
+			document.exitFullscreen();
+			isFullscreen.value = false;
+		} else {
+			playerEl.value.requestFullscreen({ navigationUI: 'hide' });
+			isFullscreen.value = true;
+		}
 	}
 }
 
@@ -449,10 +454,8 @@ watch(loop, (to) => {
 });
 
 watch(hide, (to) => {
-	if (videoEl.value && to && isFullscreen.value) {
+	if (to && isFullscreen.value) {
-		exitFullscreen({
+		document.exitFullscreen();
-			videoEl: videoEl.value,
-		});
 		isFullscreen.value = false;
 	}
 });

packages/frontend/src/components/MkSignupDialog.form.vue

@@ -277,7 +277,7 @@ async function onSubmit(): Promise<void> {
 		return null;
 	});
 
-	if (res && res.ok) {
+	if (res) {
 		if (res.status === 204 || instance.emailRequiredForSignup) {
 			os.alert({
 				type: 'success',
@@ -295,8 +295,6 @@ async function onSubmit(): Promise<void> {
 				await login(resJson.token);
 			}
 		}
-	} else {
-		onSignupApiError();
 	}
 
 	submitting.value = false;

packages/frontend/src/local-storage.ts

@@ -3,9 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-/**
- * A typesafe enum of keys for localStorage.
- */
 export type Keys =
 	'v' |
 	'lastVersion' |
@@ -47,45 +44,16 @@ export type Keys =
 // セッション毎に廃棄されるLocalStorage代替（セーフモードなどで使用できそう）
 //const safeSessionStorage = new Map<Keys, string>();
 
-
-/**
- * A utility object for interacting with the browser's localStorage.
- *
- * It's mostly a small wrapper around window.localStorage, but it validates
- * keys with a typesafe enum, and provides a few convenience methods for JSON.
- */
 export const miLocalStorage = {
-	/**
-	 * Retrieves an item from localStorage.
-	 * @param {Keys} key - The key of the item to retrieve.
-	 * @returns {string | null} The value of the item, or null if the item does not exist.
-	 */
 	getItem: (key: Keys): string | null => {
 		return window.localStorage.getItem(key);
 	},
-
-	/**
-	 * Stores an item in localStorage.
-	 * @param {Keys} key - The key of the item to store.
-	 * @param {string} value - The value of the item to store.
-	 */
 	setItem: (key: Keys, value: string): void => {
 		window.localStorage.setItem(key, value);
 	},
-
-	/**
-	 * Removes an item from localStorage.
-	 * @param {Keys} key - The key of the item to remove.
-	 */
 	removeItem: (key: Keys): void => {
 		window.localStorage.removeItem(key);
 	},
-
-	/**
-	 * Retrieves an item from localStorage and parses it as JSON.
-	 * @param {Keys} key - The key of the item to retrieve.
-	 * @returns {any | undefined} The parsed value of the item, or undefined if the item does not exist.
-	 */
 	getItemAsJson: (key: Keys): any | undefined => {
 		const item = miLocalStorage.getItem(key);
 		if (item === null) {
@@ -93,12 +61,6 @@ export const miLocalStorage = {
 		}
 		return JSON.parse(item);
 	},
-
-	/**
-	 * Stores an item in localStorage as a JSON string.
-	 * @param {Keys} key - The key of the item to store.
-	 * @param {any} value - The value of the item to store.
-	 */
 	setItemAsJson: (key: Keys, value: any): void => {
 		miLocalStorage.setItem(key, JSON.stringify(value));
 	},

packages/frontend/src/os.ts

@@ -136,16 +136,7 @@ export function promiseDialog<T extends Promise<any>>(
 	return promise;
 }
 
-/**
- * Counter for generating unique popup IDs.
- * @type {number}
- */
 let popupIdCount = 0;
-
-/**
- * A reactive list of the currently opened popups. This is used in a Vue component
- * in a v-for loop to render the popups.
- */
 export const popups = ref<{
 	id: number;
 	component: Component;
@@ -153,23 +144,12 @@ export const popups = ref<{
 	events: Record<string, any>;
 }[]>([]);
 
-/**
- * An object containing z-index values for different priority levels.
- */
 const zIndexes = {
 	veryLow: 500000,
 	low: 1000000,
 	middle: 2000000,
 	high: 3000000,
 };
-
-/**
- * Claims a z-index value for a given priority level.
- * Increments the z-index value for the specified priority by 100 and returns the new value.
- *
- * @param {keyof typeof zIndexes} [priority='low'] - The priority level for which to claim a z-index.
- * @returns {number} The new z-index value for the specified priority.
- */
 export function claimZIndex(priority: keyof typeof zIndexes = 'low'): number {
 	zIndexes[priority] += 100;
 	return zIndexes[priority];
@@ -197,15 +177,6 @@ type EmitsExtractor<T> = {
 	[K in keyof T as K extends `onVnode${string}` ? never : K extends `on${infer E}` ? Uncapitalize<E> : K extends string ? never : K]: T[K];
 };
 
-/**
- * Opens a popup with the specified component, props, and events.
- *
- * @template T - The type of the component.
- * @param {T} component - The Vue component to display in the popup.
- * @param {ComponentProps<T>} props - The props to pass to the component.
- * @param {ComponentEmit<T>} [events={}] - The events to bind to the component.
- * @returns {{ dispose: () => void }} An object containing a dispose function to close the popup.
- */
 export function popup<T extends Component>(
 	component: T,
 	props: ComponentProps<T>,
@@ -213,18 +184,13 @@ export function popup<T extends Component>(
 ): { dispose: () => void } {
 	markRaw(component);
 
-	// Generate a unique ID for this popup.
 	const id = ++popupIdCount;
-
-	// On disposal, remove this popup from the list of open popups.
 	const dispose = () => {
 		// このsetTimeoutが無いと挙動がおかしくなる(autocompleteが閉じなくなる)。Vueのバグ？
 		window.setTimeout(() => {
 			popups.value = popups.value.filter(p => p.id !== id);
 		}, 0);
 	};
-
-	// Bundle the component, props, and events into a state object.
 	const state = {
 		component,
 		props,
@@ -232,19 +198,13 @@ export function popup<T extends Component>(
 		id,
 	};
 
-	// Add the popup to the list of open popups.
 	popups.value.push(state);
 
-	// Return a function that can be called to close the popup.
 	return {
 		dispose,
 	};
 }
 
-/**
- * Open the page with the given path in a pop-up window.
- * @param path The path of the page to open.
- */
 export function pageWindow(path: string) {
 	const { dispose } = popup(MkPageWindow, {
 		initialPath: path,
@@ -253,11 +213,6 @@ export function pageWindow(path: string) {
 	});
 }
 
-/**
- * Displays a toast message to the user.
- *
- * @param {string} message - The message to display in the toast.
- */
 export function toast(message: string) {
 	const { dispose } = popup(MkToast, {
 		message,
@@ -266,15 +221,6 @@ export function toast(message: string) {
 	});
 }
 
-/**
- * Displays an alert dialog to the user.
- *
- * @param {Object} props - The properties for the alert dialog.
- * @param {'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question'} [props.type] - The type of the alert.
- * @param {string} [props.title] - The title of the alert dialog.
- * @param {string} [props.text] - The text content of the alert dialog.
- * @returns {Promise<void>} A promise that resolves when the alert dialog is closed.
- */
 export function alert(props: {
 	type?: 'error' | 'info' | 'success' | 'warning' | 'waiting' | 'question';
 	title?: string;

packages/frontend/src/pages/about-misskey.vue

@@ -272,9 +272,6 @@ const patronsWithIcon = [{
 }, {
 	name: 'Yatoigawa',
 	icon: 'https://assets.misskey-hub.net/patrons/505e3568885a4a488431a8f22b4553d0.jpg',
-}, {
-	name: '秋瀬カヲル',
-	icon: 'https://assets.misskey-hub.net/patrons/0f22aeb866484f4fa51db6721e3f9847.jpg',
 }];
 
 const patrons = [
@@ -383,7 +380,6 @@ const patrons = [
 	'ケモナーのケシン',
 	'こまつぶり',
 	'まゆつな空高',
-	'asata',
 ];
 
 const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));

packages/frontend/src/pages/announcement.vue

@@ -103,7 +103,7 @@ const headerActions = computed(() => []);
 const headerTabs = computed(() => []);
 
 definePageMetadata(() => ({
-	title: announcement.value ? announcement.value.title : i18n.ts.announcements,
+	title: announcement.value ? `${i18n.ts.announcements}: ${announcement.value.title}` : i18n.ts.announcements,
 	icon: 'ti ti-speakerphone',
 }));
 </script>

packages/frontend/src/pages/auth.vue

@@ -62,7 +62,7 @@ function accepted() {
 	state.value = 'accepted';
 	if (session.value && session.value.app.callbackUrl) {
 		const url = new URL(session.value.app.callbackUrl);
-		if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:', 'vbscript:'].includes(url.protocol)) throw new Error('invalid url');
+		if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(url.protocol)) throw new Error('invalid url');
 		location.href = `${session.value.app.callbackUrl}?token=${session.value.token}`;
 	}
 }

packages/frontend/src/pages/miauth.vue

@@ -65,7 +65,7 @@ async function onAccept(token: string) {
 
 	if (props.callback && props.callback !== '') {
 		const cbUrl = new URL(props.callback);
-		if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:', 'vbscript:'].includes(cbUrl.protocol)) throw new Error('invalid url');
+		if (['javascript:', 'file:', 'data:', 'mailto:', 'tel:'].includes(cbUrl.protocol)) throw new Error('invalid url');
 		cbUrl.searchParams.set('session', props.session);
 		location.href = cbUrl.toString();
 	} else {

packages/frontend/src/pages/settings/webhook.edit.vue

@@ -44,7 +44,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkButton transparent :class="$style.testButton" :disabled="!(active && event_renote)" @click="test('renote')"><i class="ti ti-send"></i></MkButton>
 				</div>
 				<div :class="$style.switchBox">
-					<MkSwitch v-model="event_reaction" :disabled="true">{{ i18n.ts._webhookSettings._events.reaction }}</MkSwitch>
+					<MkSwitch v-model="event_reaction">{{ i18n.ts._webhookSettings._events.reaction }}</MkSwitch>
 					<MkButton transparent :class="$style.testButton" :disabled="!(active && event_reaction)" @click="test('reaction')"><i class="ti ti-send"></i></MkButton>
 				</div>
 				<div :class="$style.switchBox">

packages/frontend/src/pages/settings/webhook.new.vue

@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<MkSwitch v-model="event_note">{{ i18n.ts._webhookSettings._events.note }}</MkSwitch>
 			<MkSwitch v-model="event_reply">{{ i18n.ts._webhookSettings._events.reply }}</MkSwitch>
 			<MkSwitch v-model="event_renote">{{ i18n.ts._webhookSettings._events.renote }}</MkSwitch>
-			<MkSwitch v-model="event_reaction" :disabled="true">{{ i18n.ts._webhookSettings._events.reaction }}</MkSwitch>
+			<MkSwitch v-model="event_reaction">{{ i18n.ts._webhookSettings._events.reaction }}</MkSwitch>
 			<MkSwitch v-model="event_mention">{{ i18n.ts._webhookSettings._events.mention }}</MkSwitch>
 		</div>
 	</FormSection>

packages/frontend/src/scripts/device-kind.ts

@@ -3,22 +3,22 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-export type DeviceKind = 'smartphone' | 'tablet' | 'desktop';
+import { defaultStore } from '@/store.js';
+
+await defaultStore.ready;
 
 const ua = navigator.userAgent.toLowerCase();
 const isTablet = /ipad/.test(ua) || (/mobile|iphone|android/.test(ua) && window.innerWidth > 700);
 const isSmartphone = !isTablet && /mobile|iphone|android/.test(ua);
 
-export const DEFAULT_DEVICE_KIND: DeviceKind = (
+const isIPhone = /iphone|ipod/gi.test(ua) && navigator.maxTouchPoints > 1;
-	isSmartphone
+// navigator.platform may be deprecated but this check is still required
-		? 'smartphone'
+const isIPadOS = navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1;
-		: isTablet
+const isIos = /ipad|iphone|ipod/gi.test(ua) && navigator.maxTouchPoints > 1;
-			? 'tablet'
-			: 'desktop'
-);
 
-export let deviceKind: DeviceKind = DEFAULT_DEVICE_KIND;
+export const isFullscreenNotSupported = isIPhone || isIos;
 
-export function updateDeviceKind(kind: DeviceKind | null) {
+export const deviceKind: 'smartphone' | 'tablet' | 'desktop' = defaultStore.state.overridedDeviceKind ? defaultStore.state.overridedDeviceKind
-	deviceKind = kind ?? DEFAULT_DEVICE_KIND;
+	: isSmartphone ? 'smartphone'
-}
+	: isTablet ? 'tablet'
+	: 'desktop';

packages/frontend/src/scripts/fullscreen.ts

@@ -1,46 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-type PartiallyPartial<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-
-type VideoEl = PartiallyPartial<HTMLVideoElement, 'requestFullscreen'> & {
-	webkitEnterFullscreen?(): void;
-	webkitExitFullscreen?(): void;
-};
-
-type PlayerEl = PartiallyPartial<HTMLElement, 'requestFullscreen'>;
-
-type RequestFullscreenProps = {
-	readonly videoEl: VideoEl;
-	readonly playerEl: PlayerEl;
-	readonly options?: FullscreenOptions | null;
-};
-
-type ExitFullscreenProps = {
-	readonly videoEl: VideoEl;
-};
-
-export const requestFullscreen = ({ videoEl, playerEl, options }: RequestFullscreenProps) => {
-	if (playerEl.requestFullscreen != null) {
-		playerEl.requestFullscreen(options ?? undefined);
-		return;
-	}
-	if (videoEl.webkitEnterFullscreen != null) {
-		videoEl.webkitEnterFullscreen();
-		return;
-	}
-};
-
-export const exitFullscreen = ({ videoEl }: ExitFullscreenProps) => {
-	// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-	if (document.exitFullscreen != null) {
-		document.exitFullscreen();
-		return;
-	}
-	if (videoEl.webkitExitFullscreen != null) {
-		videoEl.webkitExitFullscreen();
-		return;
-	}
-};

packages/frontend/src/scripts/idb-proxy.ts

@@ -26,7 +26,6 @@ if (window.Cypress) {
 	console.log('Cypress detected. It will use localStorage.');
 }
 
-// Check for the availability of indexedDB.
 if (idbAvailable) {
 	await iset('idb-test', 'test')
 		.catch(err => {
@@ -38,36 +37,16 @@ if (idbAvailable) {
 	console.error('indexedDB is unavailable. It will use localStorage.');
 }
 
-/**
- * Get a value from indexedDB (or localStorage as a fallback).
- *
- * @param key	The key of the item to retrieve.
- *
- * @returns The value of the item.
- */
 export async function get(key: string) {
 	if (idbAvailable) return iget(key);
 	return miLocalStorage.getItemAsJson(`${PREFIX}${key}`);
 }
 
-/**
- * Set a value in indexedDB (or localStorage as a fallback).
- *
- * @param {string} key - The key of the item to set.
- * @param {any} val - The value of the item to set.
- * @returns {Promise<void>} - A promise that resolves when the value has been set.`
- */
 export async function set(key: string, val: any) {
 	if (idbAvailable) return iset(key, val);
 	return miLocalStorage.setItemAsJson(`${PREFIX}${key}`, val);
 }
 
-/**
- * Delete a value from indexedDB (or localStorage as a fallback).
- *
- * @param {string} key - The key of the item to delete.
- * @returns {Promise<void>} - A promise that resolves when the value has been deleted.
- */
 export async function del(key: string) {
 	if (idbAvailable) return idel(key);
 	return miLocalStorage.removeItem(`${PREFIX}${key}`);

packages/frontend/src/store.ts

@@ -8,9 +8,8 @@ import * as Misskey from 'misskey-js';
 import { hemisphere } from '@@/js/intl-const.js';
 import lightTheme from '@@/themes/l-light.json5';
 import darkTheme from '@@/themes/d-green-lime.json5';
+import { miLocalStorage } from './local-storage.js';
 import type { SoundType } from '@/scripts/sound.js';
-import { DEFAULT_DEVICE_KIND, type DeviceKind } from '@/scripts/device-kind.js';
-import { miLocalStorage } from '@/local-storage.js';
 import { Storage } from '@/pizzax.js';
 import type { Ast } from '@syuilo/aiscript';
 
@@ -208,7 +207,7 @@ export const defaultStore = markRaw(new Storage('base', {
 
 	overridedDeviceKind: {
 		where: 'device',
-		default: null as DeviceKind | null,
+		default: null as null | 'smartphone' | 'tablet' | 'desktop',
 	},
 	serverDisconnectedBehavior: {
 		where: 'device',
@@ -264,11 +263,11 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	useBlurEffectForModal: {
 		where: 'device',
-		default: DEFAULT_DEVICE_KIND === 'desktop',
+		default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない
 	},
 	useBlurEffect: {
 		where: 'device',
-		default: DEFAULT_DEVICE_KIND === 'desktop',
+		default: !/mobile|iphone|android/.test(navigator.userAgent.toLowerCase()), // 循環参照するのでdevice-kind.tsは参照できない
 	},
 	showFixedPostForm: {
 		where: 'device',

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0-alpha.0",
+	"version": "2024.10.2-alpha.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",