summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.adoc1
-rw-r--r--src/plugins/relay/irc/relay-irc.c21
2 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 8b50dfe3a..a1fec841e 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -43,6 +43,7 @@ Bug fixes::
* irc: add channel in "autojoin" server option only when the channel is actually joined (issue #1990)
* irc: add missing tags on multiline messages (issue #1987)
* irc: fix redirection of command `/list` when the reply doesn't start with message 321 (start of /list)
+ * relay: synchronize nick modes with IRC client upon connection (issue #1984)
* script: fix cursor position after `/script list -i` or `/script list -il`
* script: fix buffer used by command `/script list -i|-il|-o|-ol`
diff --git a/src/plugins/relay/irc/relay-irc.c b/src/plugins/relay/irc/relay-irc.c
index afe44ccc5..eaf37f407 100644
--- a/src/plugins/relay/irc/relay-irc.c
+++ b/src/plugins/relay/irc/relay-irc.c
@@ -1638,11 +1638,11 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
struct t_hashtable *hash_parsed, *hash_redirect;
struct t_infolist *infolist_server;
const char *irc_command, *str_num_params, *isupport, *pos_password;
- const char *ptr_data;
+ const char *ptr_data, *ptr_nick_modes;
char str_time[128], str_signal[128], str_server_channel[256], *nick;
char str_param[128], *str_args, *version, str_command[128], **params;
char *pos, *password, *irc_is_channel, *info, *error, *str_cmd_lower;
- char modifier_data[128], *new_data, *ctcp_type, *ctcp_params;
+ char modifier_data[128], *new_data, *ctcp_type, *ctcp_params, *nick_modes;
long num_params;
int i, redirect_msg;
@@ -1875,12 +1875,17 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
version);
if (version)
free (version);
+ nick_modes = NULL;
infolist_server = weechat_infolist_get ("irc_server", NULL,
client->protocol_args);
if (infolist_server)
{
if (weechat_infolist_next (infolist_server))
{
+ ptr_nick_modes = weechat_infolist_string (infolist_server,
+ "nick_modes");
+ if (ptr_nick_modes)
+ nick_modes = strdup (ptr_nick_modes);
isupport = weechat_infolist_string (infolist_server,
"isupport");
if (isupport && isupport[0])
@@ -1916,6 +1921,18 @@ relay_irc_recv (struct t_relay_client *client, const char *data)
RELAY_IRC_DATA(client, address),
RELAY_IRC_DATA(client, nick));
+ /* send nick modes */
+ if (nick_modes && nick_modes[0])
+ {
+ relay_irc_sendf (client,
+ ":%s MODE %s :+%s",
+ RELAY_IRC_DATA(client, address),
+ RELAY_IRC_DATA(client, nick),
+ nick_modes);
+ }
+ if (nick_modes)
+ free (nick_modes);
+
/* hook signals */
relay_irc_hook_signals (client);