fix code quality issues

This commit is contained in:
まっちゃとーにゅ 2024-01-23 06:16:10 +09:00
parent 8aa76868b3
commit d8d2188b4d
No known key found for this signature in database
GPG key ID: 143DE582A97FE052
10 changed files with 12 additions and 34 deletions

View file

@ -22,12 +22,12 @@ import { IdService } from '@/core/IdService.js';
import { NotificationService } from '@/core/NotificationService.js'; import { NotificationService } from '@/core/NotificationService.js';
import { Serialized } from '@/types.js'; import { Serialized } from '@/types.js';
import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js'; import { ReversiGameEntityService } from './entities/ReversiGameEntityService.js';
import type { OnApplicationShutdown, OnModuleInit } from '@nestjs/common'; import type { OnModuleInit } from '@nestjs/common';
const MATCHING_TIMEOUT_MS = 1000 * 15; // 15sec const MATCHING_TIMEOUT_MS = 1000 * 15; // 15sec
@Injectable() @Injectable()
export class ReversiService implements OnApplicationShutdown, OnModuleInit { export class ReversiService implements OnModuleInit {
private notificationService: NotificationService; private notificationService: NotificationService;
constructor( constructor(
@ -543,13 +543,4 @@ export class ReversiService implements OnApplicationShutdown, OnModuleInit {
return null; return null;
} }
} }
@bindThis
public dispose(): void {
}
@bindThis
public onApplicationShutdown(signal?: string | undefined): void {
this.dispose();
}
} }

View file

@ -38,8 +38,8 @@ export class ReversiGameEntityService {
return await awaitAll({ return await awaitAll({
id: game.id, id: game.id,
createdAt: game.createdAt.toISOString(), createdAt: game.createdAt.toISOString(),
startedAt: game.startedAt && game.startedAt.toISOString(), startedAt: game.startedAt?.toISOString() ?? null,
endedAt: game.endedAt && game.endedAt.toISOString(), endedAt: game.endedAt?.toISOString() ?? null,
isStarted: game.isStarted, isStarted: game.isStarted,
isEnded: game.isEnded, isEnded: game.isEnded,
form1: game.form1, form1: game.form1,
@ -90,8 +90,8 @@ export class ReversiGameEntityService {
return await awaitAll({ return await awaitAll({
id: game.id, id: game.id,
createdAt: game.createdAt.toISOString(), createdAt: game.createdAt.toISOString(),
startedAt: game.startedAt && game.startedAt.toISOString(), startedAt: game.startedAt?.toISOString() ?? null,
endedAt: game.endedAt && game.endedAt.toISOString(), endedAt: game.endedAt?.toISOString() ?? null,
isStarted: game.isStarted, isStarted: game.isStarted,
isEnded: game.isEnded, isEnded: game.isEnded,
user1Id: game.user1Id, user1Id: game.user1Id,

View file

@ -35,7 +35,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
super(meta, paramDef, async (ps, me) => { super(meta, paramDef, async (ps, me) => {
if (ps.userId) { if (ps.userId) {
await this.reversiService.matchSpecificUserCancel(me, ps.userId); await this.reversiService.matchSpecificUserCancel(me, ps.userId);
return;
} else { } else {
await this.reversiService.matchAnyUserCancel(me); await this.reversiService.matchAnyUserCancel(me);
} }

View file

@ -3,9 +3,8 @@
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
import { Inject, Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { Endpoint } from '@/server/api/endpoint-base.js'; import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { ReversiService } from '@/core/ReversiService.js'; import { ReversiService } from '@/core/ReversiService.js';

View file

@ -13,13 +13,6 @@ class ReversiChannel extends Channel {
public static requireCredential = true as const; public static requireCredential = true as const;
public static kind = 'read:account'; public static kind = 'read:account';
constructor(
id: string,
connection: Channel['connection'],
) {
super(id, connection);
}
@bindThis @bindThis
public async init(params: any) { public async init(params: any) {
this.subscriber.on(`reversiStream:${this.user!.id}`, this.send); this.subscriber.on(`reversiStream:${this.user!.id}`, this.send);
@ -38,10 +31,6 @@ export class ReversiChannelService implements MiChannelService<true> {
public readonly requireCredential = ReversiChannel.requireCredential; public readonly requireCredential = ReversiChannel.requireCredential;
public readonly kind = ReversiChannel.kind; public readonly kind = ReversiChannel.kind;
constructor(
) {
}
@bindThis @bindThis
public create(id: string, connection: Channel['connection']): ReversiChannel { public create(id: string, connection: Channel['connection']): ReversiChannel {
return new ReversiChannel( return new ReversiChannel(

View file

@ -18,7 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup> <script lang="ts" setup>
import { computed, watch, onUnmounted, provide, shallowRef } from 'vue'; import { computed, watch, onUnmounted, provide, shallowRef } from 'vue';
import { Connection } from 'misskey-js/built/streaming.js'; import { Connection } from 'misskey-js/streaming.js';
import MkNotes from '@/components/MkNotes.vue'; import MkNotes from '@/components/MkNotes.vue';
import MkPullToRefresh from '@/components/MkPullToRefresh.vue'; import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
import { useStream } from '@/stream.js'; import { useStream } from '@/stream.js';

View file

@ -99,7 +99,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, watch, ref, onMounted, shallowRef, onUnmounted } from 'vue'; import { computed, watch, ref, onUnmounted } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import * as Reversi from 'misskey-reversi'; import * as Reversi from 'misskey-reversi';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';

View file

@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { computed, watch, ref, onMounted, shallowRef, onUnmounted } from 'vue'; import { computed, watch, onMounted, shallowRef, onUnmounted } from 'vue';
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
import GameSetting from './game.setting.vue'; import GameSetting from './game.setting.vue';
import GameBoard from './game.board.vue'; import GameBoard from './game.board.vue';

View file

@ -87,6 +87,7 @@ export class DropAndFusionGame extends EventEmitter<{
case 'square': return SQUARE_MONOS; case 'square': return SQUARE_MONOS;
case 'sweets': return SWEETS_MONOS; case 'sweets': return SWEETS_MONOS;
case 'space': return NORAML_MONOS; case 'space': return NORAML_MONOS;
default: throw new Error('unrecognized game mode');
} }
} }
@ -302,7 +303,6 @@ export class DropAndFusionGame extends EventEmitter<{
this.gameOver(); this.gameOver();
break; break;
} }
continue;
} }
} }
} }

View file

@ -1,5 +1,5 @@
import { ModerationLogPayloads } from './consts.js'; import { ModerationLogPayloads } from './consts.js';
import { Announcement, EmojiDetailed, MeDetailed, MeDetailedOnly, Page, User, UserDetailed } from './autogen/models.js'; import { Announcement, EmojiDetailed, MeDetailed, Page, User, UserDetailed } from './autogen/models.js';
export * from './autogen/entities.js'; export * from './autogen/entities.js';
export * from './autogen/models.js'; export * from './autogen/models.js';