philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix redirecting to DCC CHATs with /REL* commands

Browse Source 
to + 1 is the correct destination, not to + 3.
This commit is contained in:
Kevin Easton
2017-12-20 20:25:27 +11:00
parent 2c94010d65
commit c7a72b79ae
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@@ -1,5 +1,7 @@
[Changes 1.2.2] [Changes 1.2.2]
* Fix redirecting to DCC CHATs with /REL* commands. (caf)
* Update arcfour example module to use exported dcc_chat_socketread() * Update arcfour example module to use exported dcc_chat_socketread()
callback. (caf) callback. (caf)

22
source/misc.c
View File

@@ -1233,7 +1233,7 @@ int isme(char *nick)
enum REDIR_TYPES { PRIVMSG = 0, KICK, TOPIC, WALL, WALLOP, NOTICE, KBOOT, KILL, DCC, LIST}; enum REDIR_TYPES { PRIVMSG = 0, KICK, TOPIC, WALL, WALLOP, NOTICE, KBOOT, KILL, DCC, LIST};
void userhost_ban(UserhostItem *stuff, char *nick1, char *args); void userhost_ban(UserhostItem *stuff, char *nick1, char *args);
int redirect_msg(char *to, enum REDIR_TYPES what, char *str, int showansi) static int redirect_msg(char *to, enum REDIR_TYPES what, char *str, int showansi)
{ {
char *new_str; char *new_str;
if (showansi) if (showansi)
@@ -1243,16 +1243,20 @@ char *new_str;
switch(what) switch(what)
{ {
case PRIVMSG: case PRIVMSG:
if (is_channel(to)) if (*to == '=')
put_it("%s", convert_output_format(fget_string_var(FORMAT_SEND_PUBLIC_FSET), "%s %s %s %s", update_clock(GET_TIME), to, get_server_nickname(from_server), new_str)); {
else if ((*to == '=') && dcc_activechat(to+1)) to++;
; if (dcc_activechat(to))
else dcc_chat_transmit(to, new_str, new_str, 0);
put_it("%s", convert_output_format(fget_string_var(FORMAT_SEND_MSG_FSET), "%s %s %s %s", update_clock(GET_TIME), to, get_server_nickname(from_server), new_str)); }
if ((*to == '=') && dcc_activechat(to+1))
dcc_chat_transmit(to + 3, new_str, new_str, 0);
else else
{
if (is_channel(to))
put_it("%s", convert_output_format(fget_string_var(FORMAT_SEND_PUBLIC_FSET), "%s %s %s %s", update_clock(GET_TIME), to, get_server_nickname(from_server), new_str));
else
put_it("%s", convert_output_format(fget_string_var(FORMAT_SEND_MSG_FSET), "%s %s %s %s", update_clock(GET_TIME), to, get_server_nickname(from_server), new_str));
send_to_server("PRIVMSG %s :%s", to, new_str); send_to_server("PRIVMSG %s :%s", to, new_str);
}
break; break;
case KILL: case KILL:
send_to_server("KILL %s :%s", to, new_str); send_to_server("KILL %s :%s", to, new_str);