From 63a420ac21d43650cd3dba1beb6e3bc4962f572b Mon Sep 17 00:00:00 2001
From: Pavel Djundik <xPaw@users.noreply.github.com>
Date: Mon, 29 Jun 2020 10:51:17 +0300
Subject: [PATCH] Implement generic monospace blocks for INFO and MOTD numerics

Fixes #3961
---
 client/components/Message.vue                 |  1 +
 .../{motd.vue => monospace_block.vue}         |  2 +-
 client/css/style.css                          | 24 ++++++++++++++-----
 client/themes/morning.css                     |  2 +-
 src/client.js                                 |  2 ++
 src/models/msg.js                             |  4 ++--
 src/plugins/irc-events/help.js                | 20 ++++++++++++++++
 src/plugins/irc-events/info.js                | 20 ++++++++++++++++
 src/plugins/irc-events/motd.js                |  6 +++--
 9 files changed, 69 insertions(+), 12 deletions(-)
 rename client/components/MessageTypes/{motd.vue => monospace_block.vue} (95%)
 create mode 100644 src/plugins/irc-events/help.js
 create mode 100644 src/plugins/irc-events/info.js

diff --git a/client/components/Message.vue b/client/components/Message.vue
index 2003e22c..e931ac46 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -6,6 +6,7 @@
 			{self: message.self, highlight: message.highlight, 'previous-source': isPreviousSource},
 		]"
 		:data-type="message.type"
+		:data-command="message.command"
 		:data-from="message.from && message.from.nick"
 	>
 		<span :aria-label="messageTimeLocale" class="time tooltipped tooltipped-e"
diff --git a/client/components/MessageTypes/motd.vue b/client/components/MessageTypes/monospace_block.vue
similarity index 95%
rename from client/components/MessageTypes/motd.vue
rename to client/components/MessageTypes/monospace_block.vue
index b4013205..9647335a 100644
--- a/client/components/MessageTypes/motd.vue
+++ b/client/components/MessageTypes/monospace_block.vue
@@ -8,7 +8,7 @@
 import ParsedMessage from "../ParsedMessage.vue";
 
 export default {
-	name: "MessageTypeMOTD",
+	name: "MessageTypeMonospaceBlock",
 	components: {
 		ParsedMessage,
 	},
diff --git a/client/css/style.css b/client/css/style.css
index 17f7a7b7..4f082417 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -144,7 +144,7 @@ button {
 
 code,
 pre,
-#chat .msg[data-type="motd"] .text,
+#chat .msg[data-type="monospace_block"] .text,
 .irc-monospace,
 textarea#user-specified-css-input {
 	font-family: Consolas, Menlo, Monaco, "Lucida Console", "DejaVu Sans Mono", "Courier New", monospace;
@@ -303,7 +303,9 @@ p {
 #chat .msg[data-type="topic"] .from::before,
 #chat .msg[data-type="mode_channel"] .from::before,
 #chat .msg[data-type="mode"] .from::before,
-#chat .msg[data-type="motd"] .from::before,
+#chat .msg[data-command="motd"] .from::before,
+#chat .msg[data-command="help"] .from::before,
+#chat .msg[data-command="info"] .from::before,
 #chat .msg[data-type="ctcp"] .from::before,
 #chat .msg[data-type="ctcp_request"] .from::before,
 #chat .msg[data-type="whois"] .from::before,
@@ -427,11 +429,21 @@ p {
 	color: #2ecc40;
 }
 
-#chat .msg[data-type="motd"] .from::before {
+#chat .msg[data-command="motd"] .from::before {
 	content: "\f02e"; /* https://fontawesome.com/icons/bookmark?style=solid */
 	color: var(--body-color-muted);
 }
 
+#chat .msg[data-command="help"] .from::before {
+	content: "\f059"; /* https://fontawesome.com/icons/question-circle?style=solid */
+	color: var(--body-color-muted);
+}
+
+#chat .msg[data-command="info"] .from::before {
+	content: "\f05a"; /* https://fontawesome.com/icons/info-circle?style=solid */
+	color: var(--body-color-muted);
+}
+
 #chat .msg[data-type="ctcp"] .from::before,
 #chat .msg[data-type="ctcp_request"] .from::before {
 	content: "\f15c"; /* https://fontawesome.com/icons/file-alt?style=solid */
@@ -1454,11 +1466,11 @@ textarea.input {
 	width: 50px;
 }
 
-#chat.hide-motd .msg[data-type="motd"] {
+#chat.hide-motd .msg[data-command="motd"] {
 	display: none !important;
 }
 
-#chat .msg[data-type="motd"] .text {
+#chat .msg[data-type="monospace_block"] .text {
 	background: #f6f6f6;
 	display: inline-block;
 	border-radius: 4px;
@@ -2818,7 +2830,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 .header .topic,
 #chat .msg[data-type="action"] .content,
 #chat .msg[data-type="message"] .content,
-#chat .msg[data-type="motd"] .content,
+#chat .msg[data-type="monospace_block"] .content,
 #chat .msg[data-type="notice"] .content,
 #chat .ctcp-message,
 #chat .part-reason,
diff --git a/client/themes/morning.css b/client/themes/morning.css
index dd407335..0890385f 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -124,7 +124,7 @@ body {
 	color: #f92772;
 }
 
-#chat .msg[data-type="motd"] .text,
+#chat .msg[data-type="monospace_block"] .text,
 code,
 .irc-monospace {
 	background: #28333d;
diff --git a/src/client.js b/src/client.js
index 5272863c..cd0359a8 100644
--- a/src/client.js
+++ b/src/client.js
@@ -28,6 +28,8 @@ const events = [
 	"ctcp",
 	"chghost",
 	"error",
+	"help",
+	"info",
 	"invite",
 	"join",
 	"kick",
diff --git a/src/models/msg.js b/src/models/msg.js
index f398f227..b3619b08 100644
--- a/src/models/msg.js
+++ b/src/models/msg.js
@@ -43,7 +43,7 @@ class Msg {
 		}
 
 		return (
-			this.type !== Msg.Type.MOTD &&
+			this.type !== Msg.Type.MONOSPACE_BLOCK &&
 			this.type !== Msg.Type.ERROR &&
 			this.type !== Msg.Type.TOPIC_SET_BY &&
 			this.type !== Msg.Type.MODE_CHANNEL &&
@@ -66,7 +66,7 @@ Msg.Type = {
 	MESSAGE: "message",
 	MODE: "mode",
 	MODE_CHANNEL: "mode_channel",
-	MOTD: "motd",
+	MONOSPACE_BLOCK: "monospace_block",
 	NICK: "nick",
 	NOTICE: "notice",
 	PART: "part",
diff --git a/src/plugins/irc-events/help.js b/src/plugins/irc-events/help.js
new file mode 100644
index 00000000..e44b129f
--- /dev/null
+++ b/src/plugins/irc-events/help.js
@@ -0,0 +1,20 @@
+"use strict";
+
+const Msg = require("../../models/msg");
+
+module.exports = function (irc, network) {
+	const client = this;
+
+	irc.on("help", function (data) {
+		const lobby = network.channels[0];
+
+		if (data.help) {
+			const msg = new Msg({
+				type: Msg.Type.MONOSPACE_BLOCK,
+				command: "help",
+				text: data.help,
+			});
+			lobby.pushMessage(client, msg);
+		}
+	});
+};
diff --git a/src/plugins/irc-events/info.js b/src/plugins/irc-events/info.js
new file mode 100644
index 00000000..b9ded9ae
--- /dev/null
+++ b/src/plugins/irc-events/info.js
@@ -0,0 +1,20 @@
+"use strict";
+
+const Msg = require("../../models/msg");
+
+module.exports = function (irc, network) {
+	const client = this;
+
+	irc.on("info", function (data) {
+		const lobby = network.channels[0];
+
+		if (data.info) {
+			const msg = new Msg({
+				type: Msg.Type.MONOSPACE_BLOCK,
+				command: "info",
+				text: data.info,
+			});
+			lobby.pushMessage(client, msg);
+		}
+	});
+};
diff --git a/src/plugins/irc-events/motd.js b/src/plugins/irc-events/motd.js
index 6c2e1442..13583840 100644
--- a/src/plugins/irc-events/motd.js
+++ b/src/plugins/irc-events/motd.js
@@ -10,7 +10,8 @@ module.exports = function (irc, network) {
 
 		if (data.motd) {
 			const msg = new Msg({
-				type: Msg.Type.MOTD,
+				type: Msg.Type.MONOSPACE_BLOCK,
+				command: "motd",
 				text: data.motd,
 			});
 			lobby.pushMessage(client, msg);
@@ -18,7 +19,8 @@ module.exports = function (irc, network) {
 
 		if (data.error) {
 			const msg = new Msg({
-				type: Msg.Type.MOTD,
+				type: Msg.Type.MONOSPACE_BLOCK,
+				command: "motd",
 				text: data.error,
 			});
 			lobby.pushMessage(client, msg);