From 3f0ee6a9618f7fa8af982149a03c4fdb0b739632 Mon Sep 17 00:00:00 2001 From: Reto Brunner Date: Sat, 24 Feb 2024 11:13:11 +0100 Subject: [PATCH] move chan enums --- server/client.ts | 3 ++- server/models/chan.ts | 20 +------------------- server/models/network.ts | 3 ++- server/plugins/inputs/action.ts | 2 +- server/plugins/inputs/ban.ts | 2 +- server/plugins/inputs/ignore.ts | 2 +- server/plugins/inputs/invite.ts | 2 +- server/plugins/inputs/kick.ts | 2 +- server/plugins/inputs/mode.ts | 2 +- server/plugins/inputs/msg.ts | 3 ++- server/plugins/inputs/part.ts | 2 +- server/plugins/inputs/rejoin.ts | 2 +- server/plugins/inputs/topic.ts | 2 +- server/plugins/irc-events/away.ts | 2 +- server/plugins/irc-events/connection.ts | 2 +- server/plugins/irc-events/join.ts | 2 +- server/plugins/irc-events/kick.ts | 2 +- server/plugins/irc-events/list.ts | 3 ++- server/plugins/irc-events/message.ts | 3 ++- server/plugins/irc-events/modelist.ts | 2 +- server/plugins/irc-events/whois.ts | 2 +- server/server.ts | 2 +- 22 files changed, 27 insertions(+), 40 deletions(-) diff --git a/server/client.ts b/server/client.ts index 8464b9dc..d1034383 100644 --- a/server/client.ts +++ b/server/client.ts @@ -6,7 +6,7 @@ import crypto from "crypto"; import colors from "chalk"; import log from "./log"; -import Chan, {ChanConfig, Channel, ChanType} from "./models/chan"; +import Chan, {ChanConfig} from "./models/chan"; import Msg from "./models/msg"; import Config from "./config"; import {condensedTypes} from "../shared/irc"; @@ -21,6 +21,7 @@ import ClientManager from "./clientManager"; import {MessageStorage, SearchResponse} from "./plugins/messageStorage/types"; import {StorageCleaner} from "./storageCleaner"; import {SearchQuery} from "../shared/types/storage"; +import {ChanType} from "../shared/types/chan"; type OrderItem = Chan["id"] | Network["uuid"]; type Order = OrderItem[]; diff --git a/server/models/chan.ts b/server/models/chan.ts index 77addedd..d0decbdc 100644 --- a/server/models/chan.ts +++ b/server/models/chan.ts @@ -8,25 +8,7 @@ import Client from "../client"; import Network from "./network"; import Prefix from "./prefix"; import {MessageType} from "../../shared/types/msg"; - -export enum ChanType { - CHANNEL = "channel", - LOBBY = "lobby", - QUERY = "query", - SPECIAL = "special", -} - -export enum SpecialChanType { - BANLIST = "list_bans", - INVITELIST = "list_invites", - CHANNELLIST = "list_channels", - IGNORELIST = "list_ignored", -} - -export enum ChanState { - PARTED = 0, - JOINED = 1, -} +import {ChanType, SpecialChanType, ChanState} from "../../shared/types/chan"; // eslint-disable-next-line no-use-before-define export type FilteredChannel = Chan & { diff --git a/server/models/network.ts b/server/models/network.ts index 1952a3f1..07e65f1b 100644 --- a/server/models/network.ts +++ b/server/models/network.ts @@ -1,7 +1,7 @@ import _ from "lodash"; import {v4 as uuidv4} from "uuid"; import IrcFramework, {Client as IRCClient} from "irc-framework"; -import Chan, {ChanConfig, Channel, ChanType} from "./chan"; +import Chan, {ChanConfig, Channel} from "./chan"; import Msg from "./msg"; import Prefix from "./prefix"; import Helper, {Hostmask} from "../helper"; @@ -10,6 +10,7 @@ import STSPolicies from "../plugins/sts"; import ClientCertificate, {ClientCertificateType} from "../plugins/clientCertificate"; import Client from "../client"; import {MessageType} from "../../shared/types/msg"; +import {ChanType} from "../../shared/types/chan"; /** * List of keys which should be sent to the client by default. diff --git a/server/plugins/inputs/action.ts b/server/plugins/inputs/action.ts index a71f3312..b4fd1000 100644 --- a/server/plugins/inputs/action.ts +++ b/server/plugins/inputs/action.ts @@ -1,7 +1,7 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import {ChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["slap", "me"]; diff --git a/server/plugins/inputs/ban.ts b/server/plugins/inputs/ban.ts index 58036536..c67cd433 100644 --- a/server/plugins/inputs/ban.ts +++ b/server/plugins/inputs/ban.ts @@ -1,7 +1,7 @@ -import {ChanType} from "../../models/chan"; import Msg from "../../models/msg"; import {PluginInputHandler} from "./index"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["ban", "unban", "banlist", "kickban"]; diff --git a/server/plugins/inputs/ignore.ts b/server/plugins/inputs/ignore.ts index fa9330e0..f7a57093 100644 --- a/server/plugins/inputs/ignore.ts +++ b/server/plugins/inputs/ignore.ts @@ -2,8 +2,8 @@ import Msg from "../../models/msg"; import Helper from "../../helper"; import {PluginInputHandler} from "./index"; import {IgnoreListItem} from "../../models/network"; -import {ChanType, SpecialChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType, SpecialChanType} from "../../../shared/types/chan"; const commands = ["ignore", "unignore", "ignorelist"]; diff --git a/server/plugins/inputs/invite.ts b/server/plugins/inputs/invite.ts index 797a487f..e93b5f54 100644 --- a/server/plugins/inputs/invite.ts +++ b/server/plugins/inputs/invite.ts @@ -1,7 +1,7 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import {ChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["invite", "invitelist"]; diff --git a/server/plugins/inputs/kick.ts b/server/plugins/inputs/kick.ts index 6d09a957..7362bd9e 100644 --- a/server/plugins/inputs/kick.ts +++ b/server/plugins/inputs/kick.ts @@ -1,7 +1,7 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import {ChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["kick"]; diff --git a/server/plugins/inputs/mode.ts b/server/plugins/inputs/mode.ts index 8a5ff9d4..d4259172 100644 --- a/server/plugins/inputs/mode.ts +++ b/server/plugins/inputs/mode.ts @@ -1,8 +1,8 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import {ChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["mode", "umode", "op", "deop", "hop", "dehop", "voice", "devoice"]; diff --git a/server/plugins/inputs/msg.ts b/server/plugins/inputs/msg.ts index 722b9f25..e3a6502f 100644 --- a/server/plugins/inputs/msg.ts +++ b/server/plugins/inputs/msg.ts @@ -1,7 +1,8 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import Chan, {ChanType} from "../../models/chan"; +import Chan from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["query", "msg", "say"]; diff --git a/server/plugins/inputs/part.ts b/server/plugins/inputs/part.ts index 858882d4..2842e4f4 100644 --- a/server/plugins/inputs/part.ts +++ b/server/plugins/inputs/part.ts @@ -2,8 +2,8 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; import Config from "../../config"; -import {ChanType, ChanState} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType, ChanState} from "../../../shared/types/chan"; const commands = ["close", "leave", "part"]; const allowDisconnected = true; diff --git a/server/plugins/inputs/rejoin.ts b/server/plugins/inputs/rejoin.ts index a64cd4a0..0dc7f2d7 100644 --- a/server/plugins/inputs/rejoin.ts +++ b/server/plugins/inputs/rejoin.ts @@ -1,8 +1,8 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import {ChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["cycle", "rejoin"]; diff --git a/server/plugins/inputs/topic.ts b/server/plugins/inputs/topic.ts index 242b170e..5fb76994 100644 --- a/server/plugins/inputs/topic.ts +++ b/server/plugins/inputs/topic.ts @@ -1,8 +1,8 @@ import {PluginInputHandler} from "./index"; import Msg from "../../models/msg"; -import {ChanType} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const commands = ["topic"]; diff --git a/server/plugins/irc-events/away.ts b/server/plugins/irc-events/away.ts index 4212d205..af0460a4 100644 --- a/server/plugins/irc-events/away.ts +++ b/server/plugins/irc-events/away.ts @@ -1,7 +1,7 @@ import {IrcEventHandler} from "../../client"; -import {ChanType} from "../../models/chan"; import Msg from "../../models/msg"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/plugins/irc-events/connection.ts b/server/plugins/irc-events/connection.ts index 49bb4a10..0c6041ff 100644 --- a/server/plugins/irc-events/connection.ts +++ b/server/plugins/irc-events/connection.ts @@ -6,8 +6,8 @@ import log from "../../log"; import Msg from "../../models/msg"; import Helper from "../../helper"; import Config from "../../config"; -import {ChanType, ChanState} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType, ChanState} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/plugins/irc-events/join.ts b/server/plugins/irc-events/join.ts index 2bc7e96a..92be8811 100644 --- a/server/plugins/irc-events/join.ts +++ b/server/plugins/irc-events/join.ts @@ -1,8 +1,8 @@ import Msg from "../../models/msg"; import User from "../../models/user"; import type {IrcEventHandler} from "../../client"; -import {ChanState} from "../../models/chan"; import {MessageType} from "../../../shared/types/msg"; +import {ChanState} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/plugins/irc-events/kick.ts b/server/plugins/irc-events/kick.ts index d1b5110d..b40b72fd 100644 --- a/server/plugins/irc-events/kick.ts +++ b/server/plugins/irc-events/kick.ts @@ -1,9 +1,9 @@ import {IrcEventHandler} from "../../client"; -import {ChanState} from "../../models/chan"; import Msg from "../../models/msg"; import User from "../../models/user"; import {MessageType} from "../../../shared/types/msg"; +import {ChanState} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/plugins/irc-events/list.ts b/server/plugins/irc-events/list.ts index 59cf73fc..d93c2108 100644 --- a/server/plugins/irc-events/list.ts +++ b/server/plugins/irc-events/list.ts @@ -1,6 +1,7 @@ import {IrcEventHandler} from "../../client"; -import Chan, {ChanType, SpecialChanType} from "../../models/chan"; +import Chan from "../../models/chan"; +import {ChanType, SpecialChanType} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/plugins/irc-events/message.ts b/server/plugins/irc-events/message.ts index 41afd41e..f1482312 100644 --- a/server/plugins/irc-events/message.ts +++ b/server/plugins/irc-events/message.ts @@ -3,9 +3,10 @@ import LinkPrefetch from "./link"; import {cleanIrcMessage} from "../../../shared/irc"; import Helper from "../../helper"; import {IrcEventHandler} from "../../client"; -import Chan, {ChanType} from "../../models/chan"; +import Chan from "../../models/chan"; import User from "../../models/user"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; const nickRegExp = /(?:\x03[0-9]{1,2}(?:,[0-9]{1,2})?)?([\w[\]\\`^{|}-]+)/g; diff --git a/server/plugins/irc-events/modelist.ts b/server/plugins/irc-events/modelist.ts index f91a093b..3f93799d 100644 --- a/server/plugins/irc-events/modelist.ts +++ b/server/plugins/irc-events/modelist.ts @@ -1,8 +1,8 @@ import {IrcEventHandler} from "../../client"; -import {SpecialChanType, ChanType} from "../../models/chan"; import Msg from "../../models/msg"; import {MessageType} from "../../../shared/types/msg"; +import {SpecialChanType, ChanType} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/plugins/irc-events/whois.ts b/server/plugins/irc-events/whois.ts index 97cdaacb..915c284b 100644 --- a/server/plugins/irc-events/whois.ts +++ b/server/plugins/irc-events/whois.ts @@ -1,8 +1,8 @@ import {IrcEventHandler} from "../../client"; -import {ChanType} from "../../models/chan"; import Msg from "../../models/msg"; import {MessageType} from "../../../shared/types/msg"; +import {ChanType} from "../../../shared/types/chan"; export default function (irc, network) { const client = this; diff --git a/server/server.ts b/server/server.ts index 562d16a7..61a90595 100644 --- a/server/server.ts +++ b/server/server.ts @@ -24,7 +24,6 @@ themes.loadLocalThemes(); import packages from "./plugins/packages/index"; import {NetworkWithIrcFramework} from "./models/network"; -import {ChanType} from "./models/chan"; import Utils from "./command-line/utils"; import type { ClientToServerEvents, @@ -32,6 +31,7 @@ import type { InterServerEvents, SocketData, } from "../shared/types/socket-events"; +import {ChanType} from "../shared/types/chan"; type ServerOptions = { dev: boolean;