release: v2023.10.1-kakurega.1.20.1

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2023.10.1-kakurega.1.20.0",
+	"version": "2023.10.1-kakurega.1.20.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

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

@@ -118,57 +118,79 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw err;
 			});
 
-			// To subscribe
-			if (ps.notify === 'normal') {
-				// Check if already subscribing
-				const exist = await this.noteNotificationRepository.findOneBy({
-					userId: me.id,
-					targetUserId: target.id,
-				});
-
-				if (exist != null) {
-					throw new ApiError(meta.errors.alreadySubscribing);
-				}
-
-				// Check if blocking
-				if (await this.userBlockingService.checkBlocked(me.id, target.id)) {
-					throw new ApiError(meta.errors.blocking);
-				}
-
-				// Check if blocked
-				if (await this.userBlockingService.checkBlocked(target.id, me.id)) {
-					throw new ApiError(meta.errors.blocked);
+			// フォローしているかどうかに関わらず、ノート通知の設定だけは変更できるようにする
+			if (ps.notify != null) {
+				// To subscribe
+				if (ps.notify === 'normal') {
+					// Check if already subscribing
+					const exist = await this.noteNotificationRepository.findOneBy({
+						userId: me.id,
+						targetUserId: target.id,
+					});
+
+					if (exist != null) {
+						throw new ApiError(meta.errors.alreadySubscribing);
+					}
+
+					// Check if blocking
+					if (await this.userBlockingService.checkBlocked(me.id, target.id)) {
+						throw new ApiError(meta.errors.blocking);
+					}
+
+					// Check if blocked
+					if (await this.userBlockingService.checkBlocked(target.id, me.id)) {
+						throw new ApiError(meta.errors.blocked);
+					}
+
+					// Create
+					const noteNotification = await this.noteNotificationRepository.insert({
+						id: this.idService.genId(),
+						createdAt: new Date(),
+						userId: me.id,
+						targetUserId: target.id,
+					}).then(x => this.noteNotificationRepository.findOneByOrFail(x.identifiers[0]));
+
+					// Publish event
+					this.globalEventService.publishInternalEvent('noteNotificationCreated', noteNotification);
+				} else {
+					// Check if already unsubscribed
+					const noteNotification = await this.noteNotificationRepository.findOneBy({
+						userId: me.id,
+						targetUserId: target.id,
+					});
+
+					if (!noteNotification) {
+						throw new ApiError(meta.errors.alreadyUnsubscribed);
+					}
+
+					// Delete
+					await this.noteNotificationRepository.delete({
+						userId: me.id,
+						targetUserId: target.id,
+					});
+
+					// Publish event
+					this.globalEventService.publishInternalEvent('noteNotificationDeleted', noteNotification);
 				}
+			}
 
-				// Create
-				const noteNotification = await this.noteNotificationRepository.insert({
-					id: this.idService.genId(),
-					createdAt: new Date(),
-					userId: me.id,
-					targetUserId: target.id,
-				}).then(x => this.noteNotificationRepository.findOneByOrFail(x.identifiers[0]));
-
-				// Publish event
-				this.globalEventService.publishInternalEvent('noteNotificationCreated', noteNotification);
-			} else {
-				// Check if already unsubscribed
-				const noteNotification = await this.noteNotificationRepository.findOneBy({
-					userId: me.id,
-					targetUserId: target.id,
+			// withRepliesはフォローしている場合のみ変更できる
+			if (ps.withReplies != null) {
+				// Check not following
+				const exist = await this.followingsRepository.findOneBy({
+					followerId: follower.id,
+					followeeId: target.id,
 				});
 
-				if (!noteNotification) {
-					throw new ApiError(meta.errors.alreadyUnsubscribed);
+				if (exist == null) {
+					throw new ApiError(meta.errors.notFollowing);
 				}
 
-				// Delete
-				await this.noteNotificationRepository.delete({
-					userId: me.id,
-					targetUserId: target.id,
+				await this.followingsRepository.update({
+					id: exist.id,
+				}, {
+					withReplies: ps.withReplies,
 				});
-
-				// Publish event
-				this.globalEventService.publishInternalEvent('noteNotificationDeleted', noteNotification);
 			}
 
 			return await this.userEntityService.pack(follower.id, me);

packages/frontend/package.json

@@ -22,6 +22,7 @@
 		"@rollup/plugin-json": "6.0.1",
 		"@rollup/plugin-replace": "5.0.3",
 		"@rollup/pluginutils": "5.0.5",
+		"@sentry/vue": "^7.74.0",
 		"@syuilo/aiscript": "0.16.0",
 		"@tabler/icons-webfont": "2.37.0",
 		"@vitejs/plugin-vue": "4.4.0",

packages/frontend/src/boot/common.ts

@@ -4,6 +4,7 @@
  */
 
 import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent, App } from 'vue';
+import * as Sentry from '@sentry/vue';
 import { compareVersions } from 'compare-versions';
 import widgets from '@/widgets/index.js';
 import directives from '@/directives/index.js';
@@ -253,6 +254,13 @@ export async function common(createVue: () => App<Element>) {
 
 	const app = createVue();
 
+	if (!_DEV_) {
+		Sentry.init({
+			app,
+			dsn: 'https://[email protected]/2',
+		});
+	}
+
 	if (_DEV_) {
 		app.config.performance = true;
 	}