Merge branch 'frameworkInternals'

IronWill79 · Jun 24, 2023 · 14575c9 · 14575c9
2 parents 355c5d6 + 7f6059d
commit 14575c9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/server/models/network.ts b/server/models/network.ts
@@ -441,10 +441,8 @@ class Network {
 		}
 
 		if (this.irc) {
-			const connected = this.irc.connection && this.irc.connection.connected;
-
 			if (this.nick !== oldNick) {
-				if (connected) {
+				if (this.irc.connected) {
 					// Send new nick straight away
 					this.irc.changeNick(this.nick);
 				} else {
@@ -459,7 +457,7 @@ class Network {
 			}
 
 			if (
-				connected &&
+				this.irc.connected &&
 				this.realname !== oldRealname &&
 				this.irc.network.cap.isEnabled("setname")
 			) {

diff --git a/server/plugins/inputs/connect.ts b/server/plugins/inputs/connect.ts
@@ -15,7 +15,7 @@ const input: PluginInputHandler = function (network, chan, cmd, args) {
 			return;
 		}
 
-		if (irc.connection && irc.connection.connected) {
+		if (irc.connected) {
 			chan.pushMessage(
 				this,
 				new Msg({

diff --git a/server/plugins/inputs/nick.ts b/server/plugins/inputs/nick.ts
@@ -47,7 +47,7 @@ const input: PluginInputHandler = function (network, chan, cmd, args) {
 	// If connected to IRC, send to server and wait for ACK
 	// otherwise update the nick and UI straight away
 	if (network.irc) {
-		if (network.irc.connection && network.irc.connection.connected) {
+		if (network.irc.connected) {
 			network.irc.changeNick(newNick);
 
 			return;

diff --git a/server/plugins/inputs/part.ts b/server/plugins/inputs/part.ts
@@ -36,9 +36,7 @@ const input: PluginInputHandler = function (network, chan, cmd, args) {
 	if (
 		target.type !== ChanType.CHANNEL ||
 		target.state === ChanState.PARTED ||
-		!network.irc ||
-		!network.irc.connection ||
-		!network.irc.connection.connected
+		!network.irc.connected
 	) {
 		this.part(network, target);
 	} else {

diff --git a/server/plugins/inputs/raw.ts b/server/plugins/inputs/raw.ts
@@ -4,7 +4,7 @@ const commands = ["raw", "send", "quote"];
 
 const input: PluginInputHandler = function ({irc}, chan, cmd, args) {
 	if (args.length !== 0) {
-		irc.connection.write(args.join(" "));
+		irc.raw(...args);
 	}
 
 	return true;