Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 起動しなくなっていた問題の緊急修正 #254

Merged
merged 7 commits into from
Jun 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{
"name": "oreorebot2",
"version": "1.5.0",
"main": "index.js",
"exports": "./index.js",
"type": "module",
"license": "MIT",
"repository": "https://github.com/approvers/OreOreBot2",
"author": "merunno <[email protected]>",
"scripts": {
"start": "node ./build/server/index.js",
"start": "node ./build/index.js",
"setup": "pm2 start ./build/server/index.js --name OreOreBot2",
"debug": "ts-node ./src/server/index.ts",
"build": "tsc -p .",
"format": "prettier --write \"**/*.{js,ts,md}\"",
"check": "prettier --check \"**/*.{js,ts,md}\"",
"eslint": "eslint --ignore-path .gitignore \"**/*.{js,ts,md}\"",
"eslint:fix": "eslint --ignore-path .gitignore \"**/*.{js,ts,md}\" --fix",
"debug": "ts-node --esm ./src/server/index.ts",
"build": "esbuild ./src/server/index.ts --bundle --platform=node --target=node16 --format=esm --external:./node_modules/* --outfile=build/index.js",
"format": "prettier --write \"src/**/*.{js,ts,md}\"",
"check": "prettier --check \"src/**/*.{js,ts,md}\" && tsc -p . --noEmit",
"eslint": "eslint \"src/**/*.{js,ts,md}\"",
"eslint:fix": "eslint \"src/**/*.{js,ts,md}\" --fix",
"fix": "yarn run format && yarn run eslint:fix",
"test": "vitest run",
"coverage": "vitest run --coverage",
"prepare": "husky install",
"lint-staged": "lint-staged"
},
"engines": {
"node": ">=14.16",
"yarn": "1.x"
},
"lint-staged": {
Expand Down Expand Up @@ -48,6 +50,7 @@
"@typescript-eslint/eslint-plugin": "^5.27.1",
"@typescript-eslint/parser": "^5.27.1",
"c8": "^7.11.3",
"esbuild": "^0.14.43",
"eslint": "^8.17.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-markdown": "^2.2.1",
Expand Down
2 changes: 1 addition & 1 deletion src/adaptor/clock.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Clock } from '../runner';
import type { Clock } from '../runner/index.js';

export class MockClock implements Clock {
constructor(public placeholder: Date) {}
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/discord-member-stats.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Client } from 'discord.js';
import type { MemberStats } from '../service/kokusei-chousa';
import type { Snowflake } from '../model/id';
import type { MemberStats } from '../service/kokusei-chousa.js';
import type { Snowflake } from '../model/id.js';

export class DiscordMemberStats implements MemberStats {
constructor(
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/discord-output.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type Client, MessageEmbed } from 'discord.js';
import type { EmbedMessage } from '../model/embed-message';
import type { StandardOutput } from '../service/output';
import type { EmbedMessage } from '../model/embed-message.js';
import type { StandardOutput } from '../service/output.js';

export class DiscordOutput implements StandardOutput {
constructor(
Expand Down
2 changes: 1 addition & 1 deletion src/adaptor/discord-participant.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { VoiceChannelParticipant } from '../service/voice-diff';
import type { VoiceChannelParticipant } from '../service/voice-diff.js';
import type { VoiceState } from 'discord.js';

export class DiscordParticipant implements VoiceChannelParticipant {
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/discord-role.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Client } from 'discord.js';
import type { RoleManager } from '../service/kawaemon-has-all-roles';
import type { Snowflake } from '../model/id';
import type { RoleManager } from '../service/kawaemon-has-all-roles.js';
import type { Snowflake } from '../model/id.js';

export class DiscordRoleManager implements RoleManager {
constructor(
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/discord-sheriff.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Client } from 'discord.js';
import type { Sheriff } from '../service/stfu';
import type { Snowflake } from '../model/id';
import type { Sheriff } from '../service/stfu.js';
import type { Snowflake } from '../model/id.js';

export class DiscordSheriff implements Sheriff {
constructor(private readonly client: Client) {}
Expand Down
6 changes: 3 additions & 3 deletions src/adaptor/discord-voice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import { type Client, Permissions, type VoiceBasedChannel } from 'discord.js';
import type {
VoiceConnection,
VoiceConnectionFactory
} from '../service/voice-connection';
import type { Snowflake } from '../model/id';
import type { VoiceRoomController } from '../service/kaere';
} from '../service/voice-connection.js';
import type { Snowflake } from '../model/id.js';
import type { VoiceRoomController } from '../service/kaere.js';

/**
* ボイスチャンネルへの接続が、復帰できない切断 (管理者の手で切断させられたなど) になったと判断するまでのミリ秒数。
Expand Down
2 changes: 1 addition & 1 deletion src/adaptor/discord-ws.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Client } from 'discord.js';
import type { Ping } from '../service/ping';
import type { Ping } from '../service/ping.js';

export class DiscordWS implements Ping {
constructor(private readonly client: Client) {}
Expand Down
2 changes: 1 addition & 1 deletion src/adaptor/embed-convert.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { EmbedMessage } from '../model/embed-message';
import type { EmbedMessage } from '../model/embed-message.js';
import { MessageEmbed } from 'discord.js';

export const convertEmbed = ({
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/emoji-proxy.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Client } from 'discord.js';
import type { EmojiData } from '../service/emoji-log';
import type { EmojiEventProvider } from '../runner';
import type { EmojiData } from '../service/emoji-log.js';
import type { EmojiEventProvider } from '../runner/index.js';

export type EmojiHandler<E> = (emoji: E) => Promise<void>;

Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/in-memory-reservation.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type { Reservation, ReservationTime } from '../model/reservation';
import type { Reservation, ReservationTime } from '../model/reservation.js';
import type {
ReservationRepository,
ReservationResult
} from '../service/kaere';
} from '../service/kaere.js';

export class InMemoryReservationRepository implements ReservationRepository {
map: Map<string, Reservation> = new Map();
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/in-memory-typo.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Snowflake } from '../model/id';
import type { TypoRepository } from '../service/typo-record';
import type { Snowflake } from '../model/id.js';
import type { TypoRepository } from '../service/typo-record.js';

export class InMemoryTypoRepository implements TypoRepository {
private dict: Map<Snowflake, string[]> = new Map();
Expand Down
24 changes: 12 additions & 12 deletions src/adaptor/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
export * from './clock';
export * from './discord-voice';
export * from './embed-convert';
export * from './in-memory-reservation';
export * from './in-memory-typo';
export * from './message-proxy';
export * from './mock-voice';
export * from './random';
export * from './transformer';
export * from './voice-room-proxy';
export * from './discord-participant';
export * from './discord-output';
export * from './clock.js';
export * from './discord-voice.js';
export * from './embed-convert.js';
export * from './in-memory-reservation.js';
export * from './in-memory-typo.js';
export * from './message-proxy.js';
export * from './mock-voice.js';
export * from './random.js';
export * from './transformer/index.js';
export * from './voice-room-proxy.js';
export * from './discord-participant.js';
export * from './discord-output.js';
4 changes: 2 additions & 2 deletions src/adaptor/message-proxy.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type {
MessageEventProvider,
MessageUpdateEventProvider
} from '../runner';
import type { RawMessage, Transformer } from './transformer';
} from '../runner/index.js';
import type { RawMessage, Transformer } from './transformer/index.js';
import type { Client } from 'discord.js';

export type MessageHandler<M> = (message: M) => Promise<void>;
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/mock-voice.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type {
VoiceConnection,
VoiceConnectionFactory
} from '../service/voice-connection';
import EventEmitter from 'events';
} from '../service/voice-connection.js';
import EventEmitter from 'node:events';

export class MockVoiceConnectionFactory<K>
implements VoiceConnectionFactory<K>
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/random.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { RandomGenerator as JudgingRng } from '../service/judging';
import type { RandomGenerator as PartyRng } from '../service/party';
import type { RandomGenerator as JudgingRng } from '../service/judging.js';
import type { RandomGenerator as PartyRng } from '../service/party.js';

export class MathRandomGenerator implements PartyRng, JudgingRng {
minutes(): number {
Expand Down
6 changes: 3 additions & 3 deletions src/adaptor/role-proxy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Client, Role } from 'discord.js';
import type { NewRole } from '../service/kawaemon-has-all-roles';
import type { RoleResponseRunner } from '../runner';
import type { Snowflake } from '../model/id';
import type { NewRole } from '../service/kawaemon-has-all-roles.js';
import type { RoleResponseRunner } from '../runner/index.js';
import type { Snowflake } from '../model/id.js';

type AllRoleModel = NewRole;

Expand Down
2 changes: 1 addition & 1 deletion src/adaptor/transformer/bot-filter.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { RawMessage, Transformer } from '.';
import type { RawMessage, Transformer } from './index.js';

export const botFilter: Transformer<RawMessage, RawMessage> =
(func: (message: RawMessage) => Promise<void>) =>
Expand Down
13 changes: 8 additions & 5 deletions src/adaptor/transformer/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import type { Message, PartialMessage } from 'discord.js';
import { converterWithPrefix, observableTransformer } from './message-convert';
import type { EditingObservable } from '../../service/difference-detector';
import type { MessageHandler } from '..';
import { botFilter } from './bot-filter';
import { tupleTransformer } from './tuple';
import {
converterWithPrefix,
observableTransformer
} from './message-convert.js';
import type { EditingObservable } from '../../service/difference-detector.js';
import type { MessageHandler } from '../index.js';
import { botFilter } from './bot-filter.js';
import { tupleTransformer } from './tuple.js';

export type RawMessage = Message | PartialMessage;

Expand Down
18 changes: 9 additions & 9 deletions src/adaptor/transformer/message-convert.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { RawMessage, Transformer } from '.';
import type { BoldItalicCop } from '../../service/bold-italic-cop';
import type { CommandMessage } from '../../service/command-message';
import type { DeletionObservable } from '../../service/deletion-repeater';
import type { EditingObservable } from '../../service/difference-detector';
import type { MessageHandler } from '..';
import type { Snowflake } from '../../model/id';
import type { TypoObservable } from '../../service/typo-record';
import { convertEmbed } from '../embed-convert';
import type { RawMessage, Transformer } from './index.js';
import type { BoldItalicCop } from '../../service/bold-italic-cop.js';
import type { CommandMessage } from '../../service/command-message.js';
import type { DeletionObservable } from '../../service/deletion-repeater.js';
import type { EditingObservable } from '../../service/difference-detector.js';
import type { MessageHandler } from '../index.js';
import type { Snowflake } from '../../model/id.js';
import type { TypoObservable } from '../../service/typo-record.js';
import { convertEmbed } from '../embed-convert.js';

const getAuthorSnowflake = (message: RawMessage): Snowflake =>
(message.author?.id || 'unknown') as Snowflake;
Expand Down
4 changes: 2 additions & 2 deletions src/adaptor/transformer/tuple.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
\- A2=> <----------- B2=> <-/
*/

import type { MessageHandler } from '..';
import type { Transformer } from '.';
import type { MessageHandler } from '../index.js';
import type { Transformer } from './index.js';

// A1=> -> A2=> -> A1*A2=>
const merge =
Expand Down
2 changes: 1 addition & 1 deletion src/adaptor/voice-room-proxy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Client, VoiceState } from 'discord.js';
import type { VoiceRoomEventProvider } from '../runner';
import type { VoiceRoomEventProvider } from '../runner/index.js';

type ObserveExpectation = 'ChangingIntoFalsy' | 'ChangingIntoTruthy' | 'All';

Expand Down
4 changes: 2 additions & 2 deletions src/model/reservation.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Reservation, ReservationId, ReservationTime } from './reservation';
import { Reservation, ReservationId, ReservationTime } from './reservation.js';
import { expect, it } from 'vitest';
import type { Snowflake } from './id';
import type { Snowflake } from './id.js';

it('invalid time construction', () => {
expect(() => new ReservationTime(-1, 0)).toThrow(
Expand Down
2 changes: 1 addition & 1 deletion src/model/reservation.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Snowflake } from './id';
import type { Snowflake } from './id.js';
import { nanoid } from 'nanoid';

declare const reservationIdNominal: unique symbol;
Expand Down
10 changes: 5 additions & 5 deletions src/runner/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export * from './message';
export * from './schedule';
export * from './voice-room';
export * from './role';
export * from './emoji';
export * from './message.js';
export * from './schedule.js';
export * from './voice-room.js';
export * from './role.js';
export * from './emoji.js';
35 changes: 19 additions & 16 deletions src/server/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,44 @@ import {
transformerForCommand,
transformerForMessage,
transformerForUpdateMessage
} from '../adaptor';
} from '../adaptor/index.js';
import { Client, Intents, version } from 'discord.js';
import type {
CommandMessage,
CommandResponder
} from '../service/command-message';
} from '../service/command-message.js';
import {
EmojiResponseRunner,
MessageResponseRunner,
MessageUpdateResponseRunner,
RoleResponseRunner,
ScheduleRunner,
VoiceRoomResponseRunner
} from '../runner';
import { type VoiceChannelParticipant, VoiceDiff } from '../service/voice-diff';
} from '../runner/index.js';
import {
type VoiceChannelParticipant,
VoiceDiff
} from '../service/voice-diff.js';
import {
allEmojiResponder,
allMessageEventResponder,
allMessageUpdateEventResponder,
allRoleResponder,
registerAllCommandResponder
} from '../service';
import type { AssetKey } from '../service/party';
import { DiscordMemberStats } from '../adaptor/discord-member-stats';
import { DiscordRoleManager } from '../adaptor/discord-role';
import { DiscordSheriff } from '../adaptor/discord-sheriff';
import { DiscordWS } from '../adaptor/discord-ws';
import { EmojiProxy } from '../adaptor/emoji-proxy';
import type { KaereMusicKey } from '../service/kaere';
import { Snowflake } from '../model/id';
} from '../service/index.js';
import type { AssetKey } from '../service/party.js';
import { DiscordMemberStats } from '../adaptor/discord-member-stats.js';
import { DiscordRoleManager } from '../adaptor/discord-role.js';
import { DiscordSheriff } from '../adaptor/discord-sheriff.js';
import { DiscordWS } from '../adaptor/discord-ws.js';
import { EmojiProxy } from '../adaptor/emoji-proxy.js';
import type { KaereMusicKey } from '../service/kaere.js';
import { Snowflake } from '../model/id.js';
import dotenv from 'dotenv';
import { extractEnv } from './extract-env';
import { extractEnv } from './extract-env.js';
import { generateDependencyReport } from '@discordjs/voice';
import { join } from 'path';
import { roleProxy } from '../adaptor/role-proxy';
import { join } from 'node:path';
import { roleProxy } from '../adaptor/role-proxy.js';

dotenv.config();
const {
Expand Down
2 changes: 1 addition & 1 deletion src/service/bold-italic-cop.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { describe, expect, it, vi } from 'vitest';
import { BoldItalicCopReporter } from './bold-italic-cop';
import { BoldItalicCopReporter } from './bold-italic-cop.js';

describe('bold italic cop', () => {
const responder = new BoldItalicCopReporter();
Expand Down
2 changes: 1 addition & 1 deletion src/service/bold-italic-cop.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MessageEvent, MessageEventResponder } from '../runner';
import type { MessageEvent, MessageEventResponder } from '../runner/index.js';

const boldItalic = /\*\*\*/g;

Expand Down
6 changes: 3 additions & 3 deletions src/service/command-message.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { EmbedMessage } from '../model/embed-message';
import type { MessageEventResponder } from '../runner';
import type { Snowflake } from '../model/id';
import type { EmbedMessage } from '../model/embed-message.js';
import type { MessageEventResponder } from '../runner/index.js';
import type { Snowflake } from '../model/id.js';

/**
* コマンド形式のメッセージの抽象。
Expand Down
2 changes: 1 addition & 1 deletion src/service/deletion-repeater.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, it, vi } from 'vitest';
import { DeletionRepeater } from './deletion-repeater';
import { DeletionRepeater } from './deletion-repeater.js';

it('react to deleted message', async () => {
const responder = new DeletionRepeater();
Expand Down
2 changes: 1 addition & 1 deletion src/service/deletion-repeater.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MessageEvent, MessageEventResponder } from '../runner';
import type { MessageEvent, MessageEventResponder } from '../runner/index.js';

/**
* 監視するメッセージの抽象。
Expand Down
Loading