diff --git a/zefie_wtvp_minisrv/app.js b/zefie_wtvp_minisrv/app.js index 6a9dc102..bd1b9547 100644 --- a/zefie_wtvp_minisrv/app.js +++ b/zefie_wtvp_minisrv/app.js @@ -1263,6 +1263,7 @@ async function doHTTPProxy(socket, request_headers) { // configure connection to an external proxy if (minisrv_config.services[request_type].external_proxy_is_socks) { // configure connection to remote socks proxy + // this doesnt work, needs to be fixed const { ProxyAgent }= require('proxy-agent'); options.agent = new ProxyAgent("socks://" + (minisrv_config.services[request_type].external_proxy_host || "127.0.0.1") + ":" + minisrv_config.services[request_type].external_proxy_port); options.agents = { diff --git a/zefie_wtvp_minisrv/includes/classes/WTVIRC.js b/zefie_wtvp_minisrv/includes/classes/WTVIRC.js index 758f02d1..a3430fff 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVIRC.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVIRC.js @@ -582,7 +582,7 @@ class WTVIRC { var oldNick = this.findUserByUniqueId(parts[1]); var newNick = parts[3]; var targetSocket = this.findSocketByUniqueId(parts[1]); - this.broadcastUser(oldNick, `:${oldNick}!${this.usernames.get(oldNick)}@${targetSocket.host} NICK :${newNick}\r\n`); + this.broadcastUser(oldNick, `:${oldNick}!${this.usernames.get(oldNick)}@${targetSocket.host} NICK :${newNick}\r\n`); this.processNickChange(targetSocket, newNick); this.broadcastToAllServers(line, socket); break; @@ -4146,7 +4146,7 @@ class WTVIRC { const usersInChannel = this.channels.get(channel) || new Set(); for (const user of usersInChannel) { const userSocket = Array.from(this.nicknames.keys()).find(s => this.nicknames.get(s) === user); - if (userSocket && !this.getUserModes(user).includes('z')) { + if (userSocket && !userSocket.secure) { userSocket.write(`:${nickname}!${username}@${socket.host} KICK ${channel} ${userSocket.nickname} :Channel is now +S (SSL-only, +z usermode required)\r\n`); this.broadcastChannel(channel, `:${nickname}!${username}@${socket.host} KICK ${channel} ${userSocket.nickname} :Channel is now +S (SSL-only, +z usermode required)\r\n`, userSocket); this.broadcastToAllServers(`:${sourceUniqueId} KICK ${channel} ${userSocket.uniqueId} :Channel is now +S (SSL-only, +z usermode required)\r\n`);