From 19d69ba4c3eaee22d6156e605b7763ec110fb9d7 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Tue, 22 Oct 2019 18:44:05 +0200
Subject: [PATCH 1/3] Add message type for plugins

---
 client/components/Message.vue        |  7 +++++++
 src/models/msg.js                    |  4 +++-
 src/plugins/packages/publicClient.js | 22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/client/components/Message.vue b/client/components/Message.vue
index 4b8163a4..6178a71e 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -40,6 +40,13 @@
 					<span class="only-copy">&gt; </span>
 				</template>
 			</span>
+			<span v-else-if="message.type === 'plugin'" class="from">
+				<template v-if="message.from && message.from.nick">
+					<span class="only-copy">[</span>
+					*{{ message.from.nick }}
+					<span class="only-copy">] </span>
+				</template>
+			</span>
 			<span v-else class="from">
 				<template v-if="message.from && message.from.nick">
 					<span class="only-copy">-</span>
diff --git a/src/models/msg.js b/src/models/msg.js
index a96edef4..f398f227 100644
--- a/src/models/msg.js
+++ b/src/models/msg.js
@@ -48,7 +48,8 @@ class Msg {
 			this.type !== Msg.Type.TOPIC_SET_BY &&
 			this.type !== Msg.Type.MODE_CHANNEL &&
 			this.type !== Msg.Type.RAW &&
-			this.type !== Msg.Type.WHOIS
+			this.type !== Msg.Type.WHOIS &&
+			this.type !== Msg.Type.PLUGIN
 		);
 	}
 }
@@ -77,6 +78,7 @@ Msg.Type = {
 	TOPIC_SET_BY: "topic_set_by",
 	WHOIS: "whois",
 	RAW: "raw",
+	PLUGIN: "plugin",
 };
 
 module.exports = Msg;
diff --git a/src/plugins/packages/publicClient.js b/src/plugins/packages/publicClient.js
index c18cf668..7754f6ea 100644
--- a/src/plugins/packages/publicClient.js
+++ b/src/plugins/packages/publicClient.js
@@ -1,3 +1,5 @@
+const Msg = require("../../models/msg");
+
 module.exports = class PublicClient {
 	constructor(client) {
 		this.client = client;
@@ -37,4 +39,24 @@ module.exports = class PublicClient {
 	getChannel(chanId) {
 		return this.client.find(chanId);
 	}
+
+	/**
+	 * Sends a message to this client, displayed in the given channel.
+	 *
+	 * @param {String} text the message to send
+	 * @param {Chan} chan the channel to send the message to
+	 * @param {String} identifier the identifier/name of the packages that is sending this message
+	 */
+	sendMessage(text, chan, identifier) {
+		chan.pushMessage(
+			this.client,
+			new Msg({
+				type: Msg.Type.PLUGIN,
+				text: text,
+				from: {
+					nick: identifier,
+				},
+			})
+		);
+	}
 };

From 8f7bee8dd3607154f6874f2a86dd7b9fca732cf7 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Tue, 22 Oct 2019 19:38:13 +0200
Subject: [PATCH 2/3] Add icon to message

---
 client/components/Message.vue | 2 +-
 client/css/style.css          | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/components/Message.vue b/client/components/Message.vue
index 6178a71e..966c584a 100644
--- a/client/components/Message.vue
+++ b/client/components/Message.vue
@@ -43,7 +43,7 @@
 			<span v-else-if="message.type === 'plugin'" class="from">
 				<template v-if="message.from && message.from.nick">
 					<span class="only-copy">[</span>
-					*{{ message.from.nick }}
+					{{ message.from.nick }}
 					<span class="only-copy">] </span>
 				</template>
 			</span>
diff --git a/client/css/style.css b/client/css/style.css
index 50b94b64..6f1d8cb4 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -276,6 +276,7 @@ kbd {
 #chat .whois .from::before,
 #chat .nick .from::before,
 #chat .action .from::before,
+#chat .plugin .from::before,
 #chat .raw .from::before,
 #chat .toggle-button::after,
 #chat .toggle-content .more-caret::before,
@@ -438,6 +439,13 @@ kbd {
 	content: "\f005"; /* http://fontawesome.io/icon/star/ */
 }
 
+#chat .plugin .from::before {
+	content: "\f1e6"; /* http://fontawesome.io/icon/plug/ */
+	transform: rotate(45deg);
+	display: inline-block;
+	padding: 1px;
+}
+
 #chat .toggle-button {
 	display: inline-block;
 	transition: opacity 0.2s, transform 0.2s;

From dbec8330ced4e59195bc469ca943c5da086b7c86 Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me>
Date: Tue, 22 Oct 2019 20:03:54 +0200
Subject: [PATCH 3/3] Pass package info around so it can be used as identifier

---
 src/client.js                        |  2 +-
 src/plugins/inputs/index.js          |  5 ++++-
 src/plugins/packages/index.js        | 11 ++++++-----
 src/plugins/packages/publicClient.js |  8 ++++----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/client.js b/src/client.js
index b6316dff..35f2c60a 100644
--- a/src/client.js
+++ b/src/client.js
@@ -374,7 +374,7 @@ Client.prototype.inputLine = function(data) {
 		if (typeof plugin.input === "function" && (connected || plugin.allowDisconnected)) {
 			connected = true;
 			plugin.input(
-				new PublicClient(client),
+				new PublicClient(client, plugin.packageInfo),
 				{network: target.network, chan: target.chan},
 				cmd,
 				args
diff --git a/src/plugins/inputs/index.js b/src/plugins/inputs/index.js
index 6ea9d8cc..7bae9e62 100644
--- a/src/plugins/inputs/index.js
+++ b/src/plugins/inputs/index.js
@@ -51,7 +51,10 @@ const getCommands = () =>
 		.concat(passThroughCommands)
 		.sort();
 
-const addPluginCommand = (command, func) => pluginCommands.set(command, func);
+const addPluginCommand = (packageInfo, command, func) => {
+	func.packageInfo = packageInfo;
+	pluginCommands.set(command, func);
+};
 
 module.exports = {
 	addPluginCommand,
diff --git a/src/plugins/packages/index.js b/src/plugins/packages/index.js
index 55825744..5a238b85 100644
--- a/src/plugins/packages/index.js
+++ b/src/plugins/packages/index.js
@@ -27,16 +27,16 @@ module.exports = {
 	outdated,
 };
 
-const packageApis = function(packageName) {
+const packageApis = function(packageInfo) {
 	return {
 		Stylesheets: {
-			addFile: addStylesheet.bind(this, packageName),
+			addFile: addStylesheet.bind(this, packageInfo.packageName),
 		},
 		PublicFiles: {
-			add: addFile.bind(this, packageName),
+			add: addFile.bind(this, packageInfo.packageName),
 		},
 		Commands: {
-			add: inputs.addPluginCommand,
+			add: inputs.addPluginCommand.bind(this, packageInfo),
 			runAsUser: (command, targetId, client) =>
 				client.inputLine({target: targetId, text: command}),
 		},
@@ -98,6 +98,7 @@ function loadPackages() {
 		}
 
 		packageInfo = packageInfo.thelounge;
+		packageInfo.packageName = packageName;
 
 		packageMap.set(packageName, packageFile);
 
@@ -112,7 +113,7 @@ function loadPackages() {
 		}
 
 		if (packageFile.onServerStart) {
-			packageFile.onServerStart(packageApis(packageName));
+			packageFile.onServerStart(packageApis(packageInfo));
 		}
 
 		log.info(`Package ${colors.bold(packageName)} loaded`);
diff --git a/src/plugins/packages/publicClient.js b/src/plugins/packages/publicClient.js
index 7754f6ea..f6507971 100644
--- a/src/plugins/packages/publicClient.js
+++ b/src/plugins/packages/publicClient.js
@@ -1,8 +1,9 @@
 const Msg = require("../../models/msg");
 
 module.exports = class PublicClient {
-	constructor(client) {
+	constructor(client, packageInfo) {
 		this.client = client;
+		this.packageInfo = packageInfo;
 	}
 
 	/**
@@ -45,16 +46,15 @@ module.exports = class PublicClient {
 	 *
 	 * @param {String} text the message to send
 	 * @param {Chan} chan the channel to send the message to
-	 * @param {String} identifier the identifier/name of the packages that is sending this message
 	 */
-	sendMessage(text, chan, identifier) {
+	sendMessage(text, chan) {
 		chan.pushMessage(
 			this.client,
 			new Msg({
 				type: Msg.Type.PLUGIN,
 				text: text,
 				from: {
-					nick: identifier,
+					nick: this.packageInfo.name || this.packageInfo.packageName,
 				},
 			})
 		);