pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-12 14:14:48 +02:00
Code Activity

irc: display command 437 on server buffer when nickname cannot change while banned on channel (closes #88)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-05-16 13:15:45 +02:00
parent 8d35e67dd6
commit 2a3d98c996
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.adoc
+1
View File
@@ -75,6 +75,7 @@ Bug fixes::
* irc: update autojoin option with redirected channels when autojoin_dynamic is enabled (issue #1898)
* irc: don't switch to buffer of joined channel if it was not manually joined nor present in server autojoin option
* irc: fix target buffer for commands 432/433 (erroneous nickname/nickname already in use) when the nickname looks like a channel
* irc: display command 437 on server buffer when nickname cannot change while banned on channel (issue #88)
* irc: add messages 415 (cannot send message to channel) and 742 (mode cannot be set)
* lua: fix crash with print when the value to print is not a string (issue #1904, issue #1905)
* ruby: fix crash on quit when a child process is still running (issue #1889, issue #1915)
src/plugins/irc/irc-protocol.c
+11 -3
View File
@@ -1511,7 +1511,7 @@ IRC_PROTOCOL_CALLBACK(error)
IRC_PROTOCOL_CALLBACK(generic_error)
{
int arg_error;
int arg_error, force_server_buffer;
char *str_error, str_target[512];
const char *pos_channel, *pos_nick;
struct t_irc_channel *ptr_channel;
@@ -1529,8 +1529,16 @@ IRC_PROTOCOL_CALLBACK(generic_error)
if (params[arg_error + 1])
{
if ((strcmp (command, "432") != 0)
&& (strcmp (command, "433") != 0)
/*
* force display on server buffer for these messages:
* - 432: erroneous nickname
* - 433: nickname already in use
* - 437: nick/channel temporarily unavailable
*/
force_server_buffer = ((strcmp (command, "432") == 0)
|| (strcmp (command, "433") == 0)
|| (strcmp (command, "437") == 0));
if (!force_server_buffer
&& irc_channel_is_channel (server, params[arg_error]))
{
pos_channel = params[arg_error];
tests/unit/plugins/irc/test-irc-protocol.cpp
+3 -1
View File
@@ -4289,7 +4289,7 @@ TEST(IrcProtocolWithServer, 437_not_connected)
TEST(IrcProtocolWithServer, 437_connected)
{
SRV_INIT;
SRV_INIT_JOIN;
/* not enough parameters */
RECV(":server 437");
@@ -4303,6 +4303,8 @@ TEST(IrcProtocolWithServer, 437_connected)
CHECK_SRV("-- * alice error");
RECV(":server 437 * alice :Nick/channel is temporarily unavailable");
CHECK_SRV("-- * alice Nick/channel is temporarily unavailable");
RECV(":server 437 alice #test :Cannot change nickname while banned on channel");
CHECK_SRV("-- #test: Cannot change nickname while banned on channel");
}
/*