Merge ab678f1ef5 into 549c445853

client/tsconfig.json

@@ -36,6 +36,7 @@
     "../server/models/user.ts",
     "../server/models/msg.ts",
     "../server/models/prefix.ts",
+    "../server/models/client-tags.ts",
     "./js/helpers/fullnamemap.json",
     "./js/helpers/simplemap.json",
     "../webpack.config.ts",

server/models/client-tags.ts

@@ -0,0 +1,36 @@
+import _ from "lodash";
+
+export enum ClientTagKey {
+	// https://ircv3.net/specs/client-tags/reply
+	DRAFT_REPLY = "draft/reply",
+	// https://ircv3.net/specs/client-tags/react
+	DRAFT_REACT = "draft/react",
+	// https://ircv3.net/specs/client-tags/channel-context
+	DRAFT_CHANNEL_CONTEXT = "draft/channel-context",
+
+	// https://ircv3.net/specs/client-tags/typing.html
+	TYPING = "typing",
+}
+
+export class ClientTags {
+	reaction?: string;
+	repliedTo?: string;
+	channelContext?: string;
+	rawTags: Record<string, string>;
+
+	public constructor(rawClientTags: Record<string, string>) {
+		this.rawTags = rawClientTags;
+
+		this.reaction = this.get(ClientTagKey.DRAFT_REACT);
+		this.repliedTo = this.get(ClientTagKey.DRAFT_REPLY);
+		this.channelContext = this.get(ClientTagKey.DRAFT_CHANNEL_CONTEXT);
+	}
+
+	public get(key: string): string | undefined {
+		return this.rawTags[`+${key}`];
+	}
+
+	public has(key: string): boolean {
+		return Object.prototype.hasOwnProperty.call(this.rawTags, `+${key}`);
+	}
+}

server/models/msg.ts

@@ -1,6 +1,7 @@
 import _ from "lodash";
 import {LinkPreview} from "../plugins/irc-events/link";
 import User from "./user";
+import {ClientTags} from "./client-tags";
 
 export type UserInMessage = Partial<User> & {
 	mode: string;
@@ -18,6 +19,7 @@ export enum MessageType {
 	LOGIN = "login",
 	LOGOUT = "logout",
 	MESSAGE = "message",
+	TAGMSG = "tagmsg",
 	MODE = "mode",
 	MODE_CHANNEL = "mode_channel",
 	MODE_USER = "mode_user", // RPL_UMODEIS
@@ -61,6 +63,8 @@ class Msg {
 	gecos!: string;
 	account!: boolean;
 
+	client_tags: ClientTags;
+
 	// these are all just for error:
 	error!: string;
 	nick!: string;
@@ -87,6 +91,8 @@ class Msg {
 			});
 		}
 
+		this.client_tags = new ClientTags({});
+
 		_.defaults(this, attr, {
 			from: {},
 			id: 0,

server/plugins/irc-events/message.ts

@@ -5,8 +5,22 @@ import Helper from "../../helper";
 import {IrcEventHandler} from "../../client";
 import Chan, {ChanType} from "../../models/chan";
 import User from "../../models/user";
+import {ClientTags} from "../../models/client-tags";
 
 const nickRegExp = /(?:\x03[0-9]{1,2}(?:,[0-9]{1,2})?)?([\w[\]\\`^{|}-]+)/g;
+type MessageData = {
+	nick: string;
+	hostname: string;
+	ident: string;
+	target: string;
+	type: MessageType;
+	time: number;
+	tags: Record<string, string>;
+	text?: string;
+	from_server?: boolean;
+	message: string;
+	group?: string;
+};
 
 export default <IrcEventHandler>function (irc, network) {
 	const client = this;
@@ -26,6 +40,11 @@ export default <IrcEventHandler>function (irc, network) {
 		handleMessage(data);
 	});
 
+	irc.on("tagmsg", function (data) {
+		data.type = MessageType.TAGMSG;
+		// TODO: handleTagMessage(data);
+	});
+
 	irc.on("privmsg", function (data) {
 		data.type = MessageType.MESSAGE;
 		handleMessage(data);
@@ -37,18 +56,7 @@ export default <IrcEventHandler>function (irc, network) {
 		handleMessage(data);
 	});
 
-	function handleMessage(data: {
-		nick: string;
-		hostname: string;
-		ident: string;
-		target: string;
-		type: MessageType;
-		time: number;
-		text?: string;
-		from_server?: boolean;
-		message: string;
-		group?: string;
-	}) {
+	function handleMessage(data: MessageData) {
 		let chan: Chan | undefined;
 		let from: User;
 		let highlight = false;
@@ -131,6 +139,7 @@ export default <IrcEventHandler>function (irc, network) {
 			from: from,
 			highlight: highlight,
 			users: [],
+			client_tags: new ClientTags(data.tags),
 		});
 
 		if (showInActive) {

server/types/modules/irc-framework.d.ts

@@ -31,7 +31,7 @@ declare module "irc-framework" {
 		message: string;
 		nick: string;
 		reply: (message: string) => void;
-		tags: {[key: string]: string};
+		tags: Record<string, string>;
 		target: string;
 		time?: any;
 		type: "privmsg" | "action" | "notice" | "wallops";
@@ -44,6 +44,7 @@ declare module "irc-framework" {
 		ident: string;
 		nick: string;
 		time?: any;
+		tags: Record<string, string>;
 	}
 	export interface KickEventArgs {
 		kicked: string;
@@ -176,10 +177,23 @@ declare module "irc-framework" {
 
 		sendMessage(commandName: string, target: string, message: string): string[];
 
+		sendMessage(
+			commandName: string,
+			target: string,
+			message: string,
+			tags: Record<string, string> = {}
+		): string[];
+
 		say(target: string, message: string): string[];
 
+		say(target: string, message: string, tags: Record<string, string>): string[];
+
 		notice(target: string, message: string): string[];
 
+		notice(target: string, message: string, tags: Record<string, string>): string[];
+
+		tagmsg(target: string, tags: Record<string, string> = {}): string[];
+
 		join(channel: string, key?: string): void;
 
 		part(channel: string, message?: string): void;
@@ -292,7 +306,7 @@ declare module "irc-framework" {
 
 		reply(e: any): any;
 
-		tags: Record<string, unknown>;
+		tags: Record<string, string>;
 
 		// any
 		time?: any;