move channel greeting to under channel info and NAMES
This commit is contained in:
@@ -1913,18 +1913,6 @@ class WTVIRC {
|
|||||||
var channelObj = this.channelData.get(ch);
|
var channelObj = this.channelData.get(ch);
|
||||||
channelObj.users.add(socket.nickname);
|
channelObj.users.add(socket.nickname);
|
||||||
await this.broadcastChannelJoin(ch, socket);
|
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 modes = channelObj.modes;
|
||||||
let prefix = '';
|
let prefix = '';
|
||||||
@@ -2006,6 +1994,18 @@ class WTVIRC {
|
|||||||
if (awaymsg) {
|
if (awaymsg) {
|
||||||
await this.broadcastUserIfCap(socket, `:${socket.nickname}!${socket.username}@${socket.host} AWAY :${awaymsg}\r\n`, socket, 'away-notify');
|
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) {
|
if (this.clientIsWebTV(socket) && this.enable_webtv_command_hacks) {
|
||||||
var output_lines = [];
|
var output_lines = [];
|
||||||
var channelObj = this.channelData.get(ch);
|
var channelObj = this.channelData.get(ch);
|
||||||
|
|||||||
Reference in New Issue
Block a user