From 97676ea0e7448503b2e658148188a61624192f68 Mon Sep 17 00:00:00 2001 From: zefie Date: Fri, 27 Jun 2025 20:46:46 -0400 Subject: [PATCH] move channel greeting to under channel info and NAMES --- zefie_wtvp_minisrv/includes/classes/WTVIRC.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/zefie_wtvp_minisrv/includes/classes/WTVIRC.js b/zefie_wtvp_minisrv/includes/classes/WTVIRC.js index 20e6ac1f..ddf3cc81 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVIRC.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVIRC.js @@ -1913,18 +1913,6 @@ class WTVIRC { var channelObj = this.channelData.get(ch); channelObj.users.add(socket.nickname); await this.broadcastChannelJoin(ch, socket); - if ( - this.irc_config && - Array.isArray(this.irc_config.channels) - ) { - const channel_data = this.irc_config.channels.find(cfg => cfg.name === ch); - if (channel_data && channel_data.intro) { - // Send intro messages (array of lines) to the joining user only - for (const line of channel_data.intro) { - await this.safeWriteToSocket(socket, `:${ch}!system@${this.servername} PRIVMSG ${ch} :${line}\r\n`); - } - } - } let modes = channelObj.modes; let prefix = ''; @@ -2006,6 +1994,18 @@ class WTVIRC { if (awaymsg) { await this.broadcastUserIfCap(socket, `:${socket.nickname}!${socket.username}@${socket.host} AWAY :${awaymsg}\r\n`, socket, 'away-notify'); } + if ( + this.irc_config && + Array.isArray(this.irc_config.channels) + ) { + const channel_data = this.irc_config.channels.find(cfg => cfg.name === ch); + if (channel_data && channel_data.intro) { + // Send intro messages (array of lines) to the joining user only + for (const line of channel_data.intro) { + await this.safeWriteToSocket(socket, `:${ch}!system@${this.servername} PRIVMSG ${ch} :${line}\r\n`); + } + } + } if (this.clientIsWebTV(socket) && this.enable_webtv_command_hacks) { var output_lines = []; var channelObj = this.channelData.get(ch);