Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-21 19:43:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

move chan enums

Browse source
This commit is contained in:
Reto Brunner 2024-02-24 11:13:11 +01:00
parent b67e4699f5
commit 3f0ee6a961
22 changed files with 27 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/client.ts
View file

@ -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[];

20
server/models/chan.ts
View file

@ -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 & {

3
server/models/network.ts
View file

@ -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.

2
server/plugins/inputs/action.ts
View file

@ -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"];

2
server/plugins/inputs/ban.ts
View file

@ -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"];

2
server/plugins/inputs/ignore.ts
View file

@ -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"];

2
server/plugins/inputs/invite.ts
View file

@ -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"];

2
server/plugins/inputs/kick.ts
View file

@ -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"];

2
server/plugins/inputs/mode.ts
View file

@ -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"];

3
server/plugins/inputs/msg.ts
View file

@ -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"];

2
server/plugins/inputs/part.ts
View file

@ -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;

2
server/plugins/inputs/rejoin.ts
View file

@ -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"];

2
server/plugins/inputs/topic.ts
View file

@ -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"];

2
server/plugins/irc-events/away.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

2
server/plugins/irc-events/connection.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

2
server/plugins/irc-events/join.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

2
server/plugins/irc-events/kick.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

3
server/plugins/irc-events/list.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

3
server/plugins/irc-events/message.ts
View file

@ -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;

2
server/plugins/irc-events/modelist.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

2
server/plugins/irc-events/whois.ts
View file

@ -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 <IrcEventHandler>function (irc, network) {
const client = this;

2
server/server.ts
View file

@ -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;