CHANGELOG.md

@@ -22,7 +22,6 @@
 - fix: 「設定のバックアップ」で一部の項目がバックアップに含まれていなかった問題を修正
 
 ### Server
-- Fix: 時間経過により無効化されたアンテナを再有効化したとき、サーバ再起動までその状況が反映されないのを修正 #12303
 - Fix: ロールタイムラインが保存されない問題を修正
 
 ## 2023.11.1

packages/backend/src/core/AntennaService.ts

@@ -60,21 +60,11 @@ export class AntennaService implements OnApplicationShutdown {
 						lastUsedAt: new Date(body.lastUsedAt),
 					});
 					break;
-				case 'antennaUpdated': {
-					const idx = this.antennas.findIndex(a => a.id === body.id);
-					if (idx >= 0) {
-						this.antennas[idx] = {
-							...body,
-							lastUsedAt: new Date(body.lastUsedAt),
-						};
-					} else {
-						// サーバ起動時にactiveじゃなかった場合、リストに持っていないので追加する必要あり
-						this.antennas.push({
-							...body,
-							lastUsedAt: new Date(body.lastUsedAt),
-						});
-					}
-				}
+				case 'antennaUpdated':
+					this.antennas[this.antennas.findIndex(a => a.id === body.id)] = {
+						...body,
+						lastUsedAt: new Date(body.lastUsedAt),
+					};
 					break;
 				case 'antennaDeleted':
 					this.antennas = this.antennas.filter(a => a.id !== body.id);

packages/backend/src/models/json-schema/note.ts

@@ -134,19 +134,11 @@ export const packedNoteSchema = {
 				},
 				name: {
 					type: 'string',
-					optional: false, nullable: false,
-				},
-				color: {
-					type: 'string',
-					optional: false, nullable: false,
+					optional: false, nullable: true,
 				},
 				isSensitive: {
 					type: 'boolean',
-					optional: false, nullable: false,
-				},
-				allowRenoteToExternal: {
-					type: 'boolean',
-					optional: false, nullable: false,
+					optional: true, nullable: false,
 				},
 			},
 		},

packages/backend/src/server/api/endpoints/antennas/notes.ts

@@ -13,7 +13,6 @@ import { DI } from '@/di-symbols.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { IdService } from '@/core/IdService.js';
 import { FunoutTimelineService } from '@/core/FunoutTimelineService.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { ApiError } from '../../error.js';
 
 export const meta = {
@@ -72,7 +71,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queryService: QueryService,
 		private noteReadService: NoteReadService,
 		private funoutTimelineService: FunoutTimelineService,
-		private globalEventService: GlobalEventService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const untilId = ps.untilId ?? (ps.untilDate ? this.idService.gen(ps.untilDate!) : null);
@@ -87,16 +85,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				throw new ApiError(meta.errors.noSuchAntenna);
 			}
 
-			// falseだった場合はアンテナの配信先が増えたことを通知したい
-			const needPublishEvent = !antenna.isActive;
-
-			antenna.isActive = true;
-			antenna.lastUsedAt = new Date();
-			this.antennasRepository.update(antenna.id, antenna);
-
-			if (needPublishEvent) {
-				this.globalEventService.publishInternalEvent('antennaUpdated', antenna);
-			}
+			this.antennasRepository.update(antenna.id, {
+				isActive: true,
+				lastUsedAt: new Date(),
+			});
 
 			let noteIds = await this.funoutTimelineService.get(`antennaTimeline:${antenna.id}`, untilId, sinceId);
 			noteIds = noteIds.slice(0, ps.limit);