deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-17 05:36:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'frameworkInternals'

Browse source
This commit is contained in:
Reto Brunner 2023-06-24 14:28:48 +02:00
parent 355c5d6fa4 7f6059d5b7
commit 14575c94cf
5 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/models/network.ts
View file

@ -441,10 +441,8 @@ class Network {
} }
if (this.irc) { if (this.irc) {
const connected = this.irc.connection && this.irc.connection.connected;
if (this.nick !== oldNick) { if (this.nick !== oldNick) {
if (connected) { if (this.irc.connected) {
// Send new nick straight away // Send new nick straight away
this.irc.changeNick(this.nick); this.irc.changeNick(this.nick);
} else { } else {
@ -459,7 +457,7 @@ class Network {
} }
if ( if (
connected && this.irc.connected &&
this.realname !== oldRealname && this.realname !== oldRealname &&
this.irc.network.cap.isEnabled("setname") this.irc.network.cap.isEnabled("setname")
) { ) {

2
server/plugins/inputs/connect.ts
View file

@ -15,7 +15,7 @@ const input: PluginInputHandler = function (network, chan, cmd, args) {
return; return;
} }
if (irc.connection && irc.connection.connected) { if (irc.connected) {
chan.pushMessage( chan.pushMessage(
this, this,
new Msg({ new Msg({

2
server/plugins/inputs/nick.ts
View file

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

4
server/plugins/inputs/part.ts
View file

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

2
server/plugins/inputs/raw.ts
View file

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