mirror of
https://github.com/thelounge/thelounge
synced 2024-11-22 03:53:08 +00:00
Use SharedTypes
This commit is contained in:
parent
f0ee3be6fb
commit
383907c2b8
3 changed files with 13 additions and 15 deletions
6
client/js/types.d.ts
vendored
6
client/js/types.d.ts
vendored
|
@ -1,6 +1,5 @@
|
|||
import {defineComponent} from "vue";
|
||||
|
||||
import {SharedMessage} from "../../shared/types/msg";
|
||||
import {SharedChan} from "../../shared/types/chan";
|
||||
import {SharedNetwork} from "../../shared/types/network";
|
||||
import {SharedUser} from "../../shared/models/user";
|
||||
|
@ -20,11 +19,6 @@ type ClientUser = SharedUser & {
|
|||
//
|
||||
};
|
||||
|
||||
type ClientMessage = Omit<SharedMessage, "users"> & {
|
||||
time: Date;
|
||||
users: string[];
|
||||
};
|
||||
|
||||
type ClientChan = Omit<SharedChan, "users" | "messages"> & {
|
||||
moreHistoryAvailable: boolean;
|
||||
editTopic: boolean;
|
||||
|
|
|
@ -96,3 +96,8 @@ export type SharedMsg = {
|
|||
statusmsgGroup?: string;
|
||||
params?: string[];
|
||||
};
|
||||
|
||||
export type ClientMessage = Omit<SharedMsg, "users"> & {
|
||||
time: Date;
|
||||
users: string[];
|
||||
};
|
||||
|
|
17
shared/types/socket-events.d.ts
vendored
17
shared/types/socket-events.d.ts
vendored
|
@ -1,9 +1,8 @@
|
|||
import {ClientMessage, ClientNetwork, InitClientChan} from "../../client/js/types";
|
||||
import {Mention} from "../client";
|
||||
import {ChanState} from "../models/chan";
|
||||
import Msg from "../models/msg";
|
||||
import Network from "../models/network";
|
||||
import User from "../models/user";
|
||||
import {ClientNetwork, InitClientChan} from "../../client/js/types";
|
||||
import {SharedMention} from "../../shared/types/mention";
|
||||
import {ChanState} from "../../shared/types/chan";
|
||||
import {SharedMsg, ClientMessage} from "../../shared/types/msg";
|
||||
import {SharedUser} from "../../shared/types/user";
|
||||
import {ChangelogData} from "../plugins/changelog";
|
||||
import {LinkPreview} from "../plugins/irc-events/link";
|
||||
import {ClientConfiguration} from "../server";
|
||||
|
@ -40,7 +39,7 @@ interface ServerToClientEvents {
|
|||
|
||||
"sessions:list": (data: Session[]) => void;
|
||||
|
||||
"mentions:list": (data: Mention[]) => void;
|
||||
"mentions:list": (data: SharedMention[]) => void;
|
||||
|
||||
"setting:new": ({name: string, value: any}) => void;
|
||||
"setting:all": (settings: {[key: string]: any}) => void;
|
||||
|
@ -49,7 +48,7 @@ interface ServerToClientEvents {
|
|||
|
||||
"mute:changed": (response: {target: number; status: boolean}) => void;
|
||||
|
||||
names: (data: {id: number; users: User[]}) => void;
|
||||
names: (data: {id: number; users: SharedUser[]}) => void;
|
||||
|
||||
network: (data: {networks: ClientNetwork[]}) => void;
|
||||
"network:options": (data: {network: string; serverOptions: {[key: string]: any}}) => void;
|
||||
|
@ -89,7 +88,7 @@ interface ServerToClientEvents {
|
|||
totalMessages,
|
||||
}: {
|
||||
chan: number;
|
||||
messages: Msg[];
|
||||
messages: SharedMsg[];
|
||||
totalMessages: number;
|
||||
}) => void;
|
||||
|
||||
|
|
Loading…
Reference in a new issue