drop: bye reversi (#132)

* bye reversi * bye reversi 2 * update changelog * drop: リバーシのテストを削除 --------- Co-authored-by: Esurio <esurio@esurio1673.net>
1673beta · Aug 10, 2024 · 4b1bdf6 · 4b1bdf6
1 parent 340a38d
commit 4b1bdf6
Show file tree

Hide file tree

Showing 62 changed files with 48 additions and 5,459 deletions.
diff --git a/.github/workflows/check-spdx-license-id.yml b/.github/workflows/check-spdx-license-id.yml
@@ -55,7 +55,6 @@ jobs:
             "packages/frontend/src"
             "packages/frontend/test"
             "packages/misskey-bubble-game/src"
-            "packages/misskey-reversi/src"
             "packages/sw/src"
             "scripts"
           )

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -112,6 +112,4 @@ jobs:
     - run: pnpm i --frozen-lockfile
     - run: pnpm --filter cherrypick-js run build
       if: ${{ matrix.workspace == 'backend' }}
-    - run: pnpm --filter misskey-reversi run build
-      if: ${{ matrix.workspace == 'backend' }}
     - run: pnpm --filter ${{ matrix.workspace }} run typecheck
diff --git a/CHANGELOG_engawa.md b/CHANGELOG_engawa.md
@@ -20,7 +20,7 @@
 ### Release Date
 
 ### General
--
+- リバーシは削除されました
 
 ### Client
 - 検索ウィジェットにオートフォーカスが当たらなくなりました

diff --git a/Dockerfile b/Dockerfile
@@ -24,7 +24,6 @@ COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
 COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/cherrypick-js/package.json", "./packages/cherrypick-js/"]
-COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
 COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
 
 ARG NODE_ENV=production
@@ -54,7 +53,6 @@ COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"]
 COPY --link ["scripts", "./scripts"]
 COPY --link ["packages/backend/package.json", "./packages/backend/"]
 COPY --link ["packages/cherrypick-js/package.json", "./packages/cherrypick-js/"]
-COPY --link ["packages/misskey-reversi/package.json", "./packages/misskey-reversi/"]
 COPY --link ["packages/misskey-bubble-game/package.json", "./packages/misskey-bubble-game/"]
 
 ARG NODE_ENV=production
@@ -89,11 +87,9 @@ RUN corepack install
 COPY --chown=cherrypick:cherrypick --from=target-builder /cherrypick/node_modules ./node_modules
 COPY --chown=cherrypick:cherrypick --from=target-builder /cherrypick/packages/backend/node_modules ./packages/backend/node_modules
 COPY --chown=cherrypick:cherrypick --from=target-builder /cherrypick/packages/cherrypick-js/node_modules ./packages/cherrypick-js/node_modules
-COPY --chown=cherrypick:cherrypick --from=target-builder /cherrypick/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules
 COPY --chown=cherrypick:cherrypick --from=target-builder /cherrypick/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules
 COPY --chown=cherrypick:cherrypick --from=native-builder /cherrypick/built ./built
 COPY --chown=cherrypick:cherrypick --from=native-builder /cherrypick/packages/cherrypick-js/built ./packages/cherrypick-js/built
-COPY --chown=cherrypick:cherrypick --from=native-builder /cherrypick/packages/misskey-reversi/built ./packages/misskey-reversi/built
 COPY --chown=cherrypick:cherrypick --from=native-builder /cherrypick/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
 COPY --chown=cherrypick:cherrypick --from=native-builder /cherrypick/packages/backend/built ./packages/backend/built
 COPY --chown=cherrypick:cherrypick --from=native-builder /cherrypick/fluent-emojis /cherrypick/fluent-emojis

diff --git a/package.json b/package.json
@@ -13,7 +13,6 @@
 		"packages/backend",
 		"packages/sw",
 		"packages/cherrypick-js",
-		"packages/misskey-reversi",
 		"packages/misskey-bubble-game"
 	],
 	"private": true,

diff --git a/packages/backend/package.json b/packages/backend/package.json
@@ -146,7 +146,6 @@
 		"meilisearch": "0.41.0",
 		"microformats-parser": "2.0.2",
 		"mime-types": "2.1.35",
-		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.1",
 		"nanoid": "5.0.7",
 		"nested-property": "4.0.0",

diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
@@ -77,7 +77,6 @@ import { FeaturedService } from './FeaturedService.js';
 import { FanoutTimelineService } from './FanoutTimelineService.js';
 import { ChannelFollowingService } from './ChannelFollowingService.js';
 import { RegistryApiService } from './RegistryApiService.js';
-import { ReversiService } from './ReversiService.js';
 
 import { ChartLoggerService } from './chart/ChartLoggerService.js';
 import FederationChart from './chart/charts/federation.js';
@@ -130,7 +129,6 @@ import { UserListEntityService } from './entities/UserListEntityService.js';
 import { FlashEntityService } from './entities/FlashEntityService.js';
 import { FlashLikeEntityService } from './entities/FlashLikeEntityService.js';
 import { RoleEntityService } from './entities/RoleEntityService.js';
-import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
 import { MetaEntityService } from './entities/MetaEntityService.js';
 
 import { ApAudienceService } from './activitypub/ApAudienceService.js';
@@ -228,7 +226,6 @@ const $FanoutTimelineService: Provider = { provide: 'FanoutTimelineService', use
 const $FanoutTimelineEndpointService: Provider = { provide: 'FanoutTimelineEndpointService', useExisting: FanoutTimelineEndpointService };
 const $ChannelFollowingService: Provider = { provide: 'ChannelFollowingService', useExisting: ChannelFollowingService };
 const $RegistryApiService: Provider = { provide: 'RegistryApiService', useExisting: RegistryApiService };
-const $ReversiService: Provider = { provide: 'ReversiService', useExisting: ReversiService };
 
 const $ChartLoggerService: Provider = { provide: 'ChartLoggerService', useExisting: ChartLoggerService };
 const $FederationChart: Provider = { provide: 'FederationChart', useExisting: FederationChart };
@@ -282,7 +279,6 @@ const $UserListEntityService: Provider = { provide: 'UserListEntityService', use
 const $FlashEntityService: Provider = { provide: 'FlashEntityService', useExisting: FlashEntityService };
 const $FlashLikeEntityService: Provider = { provide: 'FlashLikeEntityService', useExisting: FlashLikeEntityService };
 const $RoleEntityService: Provider = { provide: 'RoleEntityService', useExisting: RoleEntityService };
-const $ReversiGameEntityService: Provider = { provide: 'ReversiGameEntityService', useExisting: ReversiGameEntityService };
 const $MetaEntityService: Provider = { provide: 'MetaEntityService', useExisting: MetaEntityService };
 const $SystemWebhookEntityService: Provider = { provide: 'SystemWebhookEntityService', useExisting: SystemWebhookEntityService };
 
@@ -382,7 +378,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
 		RegistryApiService,
-		ReversiService,
 
 		ChartLoggerService,
 		FederationChart,
@@ -436,7 +431,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		FlashEntityService,
 		FlashLikeEntityService,
 		RoleEntityService,
-		ReversiGameEntityService,
 		MetaEntityService,
 		SystemWebhookEntityService,
 
@@ -532,7 +526,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
 		$RegistryApiService,
-		$ReversiService,
 
 		$ChartLoggerService,
 		$FederationChart,
@@ -586,7 +579,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		$FlashEntityService,
 		$FlashLikeEntityService,
 		$RoleEntityService,
-		$ReversiGameEntityService,
 		$MetaEntityService,
 		$SystemWebhookEntityService,
 
@@ -683,7 +675,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		FanoutTimelineEndpointService,
 		ChannelFollowingService,
 		RegistryApiService,
-		ReversiService,
 
 		FederationChart,
 		NotesChart,
@@ -736,7 +727,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		FlashEntityService,
 		FlashLikeEntityService,
 		RoleEntityService,
-		ReversiGameEntityService,
 		MetaEntityService,
 		SystemWebhookEntityService,
 
@@ -832,7 +822,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		$FanoutTimelineEndpointService,
 		$ChannelFollowingService,
 		$RegistryApiService,
-		$ReversiService,
 
 		$FederationChart,
 		$NotesChart,
@@ -885,7 +874,6 @@ const $ApEventService: Provider = { provide: 'ApEventService', useExisting: ApEv
 		$FlashEntityService,
 		$FlashLikeEntityService,
 		$RoleEntityService,
-		$ReversiGameEntityService,
 		$MetaEntityService,
 		$SystemWebhookEntityService,
 

diff --git a/packages/backend/src/core/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts
@@ -5,7 +5,6 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import * as Redis from 'ioredis';
-import * as Reversi from 'misskey-reversi';
 import type { MiChannel } from '@/models/Channel.js';
 import type { MiUser } from '@/models/User.js';
 import type { MiUserProfile } from '@/models/UserProfile.js';
@@ -23,7 +22,7 @@ import type { MiWebhook } from '@/models/Webhook.js';
 import type { MiSystemWebhook } from '@/models/SystemWebhook.js';
 import type { MiMeta } from '@/models/Meta.js';
 import type { MiNotification } from '@/models/Notification.js';
-import { MiAvatarDecoration, MiReversiGame, MiRole, MiRoleAssignment } from '@/models/_.js';
+import { MiAvatarDecoration, MiRole, MiRoleAssignment } from '@/models/_.js';
 import type { Packed } from '@/misc/json-schema.js';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
@@ -195,38 +194,6 @@ export interface AdminEventTypes {
 		comment: string;
 	};
 }
-
-export interface ReversiEventTypes {
-	matched: {
-		game: Packed<'ReversiGameDetailed'>;
-	};
-	invited: {
-		user: Packed<'User'>;
-	};
-}
-
-export interface ReversiGameEventTypes {
-	changeReadyStates: {
-		user1: boolean;
-		user2: boolean;
-	};
-	updateSettings: {
-		userId: MiUser['id'];
-		key: string;
-		value: any;
-	};
-	log: Reversi.Serializer.Log & { id: string | null };
-	started: {
-		game: Packed<'ReversiGameDetailed'>;
-	};
-	ended: {
-		winnerId: MiUser['id'] | null;
-		game: Packed<'ReversiGameDetailed'>;
-	};
-	canceled: {
-		userId: MiUser['id'];
-	};
-}
 //#endregion
 
 // 辞書(interface or type)から{ type, body }ユニオンを定義
@@ -344,14 +311,6 @@ export type GlobalEvents = {
 		name: 'notesStream';
 		payload: Serialized<Packed<'Note'>>;
 	};
-	reversi: {
-		name: `reversiStream:${MiUser['id']}`;
-		payload: EventTypesToEventPayload<ReversiEventTypes>;
-	};
-	reversiGame: {
-		name: `reversiGameStream:${MiReversiGame['id']}`;
-		payload: EventTypesToEventPayload<ReversiGameEventTypes>;
-	};
 };
 
 // API event definitions
@@ -456,14 +415,4 @@ export class GlobalEventService {
 	public publishAdminStream<K extends keyof AdminEventTypes>(userId: MiUser['id'], type: K, value?: AdminEventTypes[K]): void {
 		this.publish(`adminStream:${userId}`, type, typeof value === 'undefined' ? null : value);
 	}
-
-	@bindThis
-	public publishReversiStream<K extends keyof ReversiEventTypes>(userId: MiUser['id'], type: K, value?: ReversiEventTypes[K]): void {
-		this.publish(`reversiStream:${userId}`, type, typeof value === 'undefined' ? null : value);
-	}
-
-	@bindThis
-	public publishReversiGameStream<K extends keyof ReversiGameEventTypes>(gameId: MiReversiGame['id'], type: K, value?: ReversiGameEventTypes[K]): void {
-		this.publish(`reversiGameStream:${gameId}`, type, typeof value === 'undefined' ? null : value);
-	}
 }