mirror of
https://github.com/weechat/weechat.git
synced 2026-06-28 22:06:38 +02:00
irc: add argument "server_message" in function irc_nick_color_for_msg
This commit is contained in:
@@ -1298,8 +1298,7 @@ irc_command_ctcp (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
NULL),
|
||||
_("%sCTCP query to %s%s%s: %s%s%s%s%s"),
|
||||
weechat_prefix ("network"),
|
||||
irc_nick_color_for_message (ptr_server,
|
||||
NULL, argv[1]),
|
||||
irc_nick_color_for_msg (ptr_server, 0, NULL, argv[1]),
|
||||
argv[1],
|
||||
IRC_COLOR_RESET,
|
||||
IRC_COLOR_CHAT_CHANNEL,
|
||||
@@ -1322,8 +1321,7 @@ irc_command_ctcp (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
NULL),
|
||||
_("%sCTCP query to %s%s%s: %s%s%s%s%s"),
|
||||
weechat_prefix ("network"),
|
||||
irc_nick_color_for_message (ptr_server, NULL,
|
||||
argv[1]),
|
||||
irc_nick_color_for_msg (ptr_server, 0, NULL, argv[1]),
|
||||
argv[1],
|
||||
IRC_COLOR_RESET,
|
||||
IRC_COLOR_CHAT_CHANNEL,
|
||||
@@ -3083,9 +3081,8 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
"%sMSG%s(%s%s%s)%s: %s",
|
||||
weechat_prefix ("network"),
|
||||
IRC_COLOR_CHAT_DELIMITERS,
|
||||
irc_nick_color_for_message (ptr_server,
|
||||
NULL,
|
||||
targets[i]),
|
||||
irc_nick_color_for_msg (ptr_server, 0,
|
||||
NULL, targets[i]),
|
||||
targets[i],
|
||||
IRC_COLOR_CHAT_DELIMITERS,
|
||||
IRC_COLOR_RESET,
|
||||
@@ -3119,9 +3116,9 @@ irc_command_msg (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
"%sMSG%s(%s%s%s)%s: %s",
|
||||
weechat_prefix ("network"),
|
||||
IRC_COLOR_CHAT_DELIMITERS,
|
||||
irc_nick_color_for_message (ptr_server,
|
||||
NULL,
|
||||
targets[i]),
|
||||
irc_nick_color_for_msg (ptr_server, 0,
|
||||
NULL,
|
||||
targets[i]),
|
||||
targets[i],
|
||||
IRC_COLOR_CHAT_DELIMITERS,
|
||||
IRC_COLOR_RESET,
|
||||
@@ -3306,7 +3303,7 @@ irc_command_notice (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
|
||||
_("Notice"),
|
||||
IRC_COLOR_RESET,
|
||||
(is_channel) ? IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_message (ptr_server, NULL, argv[arg_target]),
|
||||
(is_channel) ? IRC_COLOR_CHAT_CHANNEL : irc_nick_color_for_msg (ptr_server, 0, NULL, argv[arg_target]),
|
||||
argv[arg_target],
|
||||
IRC_COLOR_RESET,
|
||||
(string) ? string : str_args);
|
||||
@@ -3409,9 +3406,8 @@ irc_command_notify (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
weechat_printf (ptr_server->buffer,
|
||||
_("%s: notification added for %s%s%s"),
|
||||
IRC_PLUGIN_NAME,
|
||||
irc_nick_color_for_server_message (ptr_server,
|
||||
NULL,
|
||||
ptr_notify->nick),
|
||||
irc_nick_color_for_msg (ptr_server, 1,
|
||||
NULL, ptr_notify->nick),
|
||||
ptr_notify->nick,
|
||||
weechat_color ("reset"));
|
||||
irc_notify_check_now (ptr_notify);
|
||||
@@ -3476,9 +3472,8 @@ irc_command_notify (void *data, struct t_gui_buffer *buffer, int argc,
|
||||
weechat_printf (ptr_server->buffer,
|
||||
_("%s: notification deleted for %s%s%s"),
|
||||
IRC_PLUGIN_NAME,
|
||||
irc_nick_color_for_server_message (ptr_server,
|
||||
NULL,
|
||||
ptr_notify->nick),
|
||||
irc_nick_color_for_msg (ptr_server, 1,
|
||||
NULL, ptr_notify->nick),
|
||||
ptr_notify->nick,
|
||||
weechat_color ("reset"));
|
||||
irc_notify_free (ptr_server, ptr_notify, 1);
|
||||
|
||||
Reference in New Issue
Block a user