From 194168c06272650696e822a9e1b737c38aaff8bd Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 8 Mar 2021 14:27:05 +0100
Subject: [PATCH] Display server messages in server buffer

References: https://todo.sr.ht/~emersion/gamja/21
---
 components/app.js | 6 +++++-
 lib/client.js     | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/components/app.js b/components/app.js
index 7bec072..bb54606 100644
--- a/components/app.js
+++ b/components/app.js
@@ -583,7 +583,11 @@ export default class App extends Component {
 		case "PRIVMSG":
 			var target = msg.params[0];
 			if (target == client.nick) {
-				target = msg.prefix.name;
+				if (msg.prefix.name == client.serverPrefix.name) {
+					target = SERVER_BUFFER;
+				} else {
+					target = msg.prefix.name;
+				}
 			}
 			this.addMessage(netID, target, msg);
 			break;
diff --git a/lib/client.js b/lib/client.js
index 698b215..bc1f457 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -24,6 +24,7 @@ export default class Client extends EventTarget {
 	};
 
 	status = Client.Status.DISCONNECTED;
+	serverPrefix = null;
 	nick = null;
 	availableCaps = {};
 	enabledCaps = {};
@@ -75,6 +76,8 @@ export default class Client extends EventTarget {
 
 			this.ws = null;
 			this.setStatus(Client.Status.DISCONNECTED);
+			this.nick = null;
+			this.serverPrefix = null;
 			this.availableCaps = {};
 			this.enabledCaps = {};
 			this.batches = new Map();
@@ -153,6 +156,7 @@ export default class Client extends EventTarget {
 
 			console.log("Registration complete");
 			this.setStatus(Client.Status.REGISTERED);
+			this.serverPrefix = msg.prefix;
 			break;
 		case "CAP":
 			this.handleCap(msg);