zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use user hostname instead of socket host

Browse Source
This commit is contained in:
zefie
2025-06-22 21:36:14 -04:00
parent 3797712e98
commit c10bb7d6e2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zefie_wtvp_minisrv/includes/classes/WTVIRC.js
View File

@@ -930,6 +930,7 @@ class WTVIRC {
break; break;
} }
var sourceUsername = this.usernames.get(nickname) || nickname; var sourceUsername = this.usernames.get(nickname) || nickname;
const host = this.hostnames.get(nickname) || socketSource.host;
if (this.channelprefixes.some(prefix => targetUniqueId.startsWith(prefix))) { if (this.channelprefixes.some(prefix => targetUniqueId.startsWith(prefix))) {
// It's a channel, broadcast to all users in the channel except the source // It's a channel, broadcast to all users in the channel except the source
if (this.channelData.has(targetUniqueId)) { if (this.channelData.has(targetUniqueId)) {
@@ -937,7 +938,8 @@ class WTVIRC {
for (const user of users) { for (const user of users) {
const userSocket = Array.from(this.nicknames.keys()).find(s => this.nicknames.get(s) === user); const userSocket = Array.from(this.nicknames.keys()).find(s => this.nicknames.get(s) === user);
if (userSocket && userSocket.uniqueId !== sourceUniqueId) { if (userSocket && userSocket.uniqueId !== sourceUniqueId) {
await this.sendThrottled(userSocket, [`:${nickname}!${sourceUsername}@${sourceSocket.host} ${srvCommand} ${targetUniqueId} :${message}\r\n`], 30); const host = this.hostnames.get(user) || socketSource.host;
await this.sendThrottled(userSocket, [`:${nickname}!${sourceUsername}@${host} ${srvCommand} ${targetUniqueId} :${message}\r\n`], 30);
await this.broadcastToAllServers(`:${sourceUniqueId} ${srvCommand} ${targetUniqueId} :${message}\r\n`, socket); await this.broadcastToAllServers(`:${sourceUniqueId} ${srvCommand} ${targetUniqueId} :${message}\r\n`, socket);
} }
} }
@@ -956,7 +958,7 @@ class WTVIRC {
if (this.clientIsWebTV(targetSocket)) { if (this.clientIsWebTV(targetSocket)) {
srvCommand = 'PRIVMSG'; srvCommand = 'PRIVMSG';
} }
await this.sendThrottled(targetSocket, [`:${nickname}!${sourceUsername}@${sourceSocket.host} ${srvCommand} ${targetNickname} :${message}\r\n`], 30); await this.sendThrottled(targetSocket, [`:${nickname}!${sourceUsername}@${host} ${srvCommand} ${targetNickname} :${message}\r\n`], 30);
await this.broadcastToAllServers(`:${sourceUniqueId} ${srvCommand} ${targetUniqueId} :${message}\r\n`, socket); await this.broadcastToAllServers(`:${sourceUniqueId} ${srvCommand} ${targetUniqueId} :${message}\r\n`, socket);
break; break;
case "WHOIS": case "WHOIS":
@@ -4079,7 +4081,6 @@ class WTVIRC {
return; return;
} }
} }
} }
for (let j = 0; j < modeChars.length; j++) { for (let j = 0; j < modeChars.length; j++) {
let param = null; let param = null;