jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Recode a WALL message also when sending a notice to @#channel.

Browse Source 
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4887 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-11-08 22:09:20 +00:00 committed by exg
parent b230d73dd8
commit 110f94ceb6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/irc/core/irc-commands.c
View File

@ -644,37 +644,36 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
chanrec = irc_channel_find(server, channame); chanrec = irc_channel_find(server, channame);
if (chanrec == NULL) cmd_param_error(CMDERR_CHAN_NOT_FOUND); if (chanrec == NULL) cmd_param_error(CMDERR_CHAN_NOT_FOUND);
recoded = recode_out(SERVER(server), msg, channame);
/* See if the server has advertised support of wallchops */ /* See if the server has advertised support of wallchops */
if (g_hash_table_lookup(chanrec->server->isupport, "statusmsg") || if (g_hash_table_lookup(chanrec->server->isupport, "statusmsg") ||
g_hash_table_lookup(chanrec->server->isupport, "wallchops")) g_hash_table_lookup(chanrec->server->isupport, "wallchops"))
irc_send_cmdv(server, "NOTICE @%s :%s", chanrec->name, msg); irc_send_cmdv(server, "NOTICE @%s :%s", chanrec->name, recoded);
else { else {
/* Fall back to manually noticing each op */ /* Fall back to manually noticing each op */
nicks = NULL; nicks = NULL;
g_hash_table_foreach(chanrec->nicks, g_hash_table_foreach(chanrec->nicks,
(GHFunc) cmd_wall_hash, &nicks); (GHFunc) cmd_wall_hash, &nicks);
args = g_strconcat(chanrec->name, " ", msg, NULL); args = g_strconcat(chanrec->name, " ", recoded, NULL);
msg = parse_special_string(settings_get_str("wall_format"), msg = parse_special_string(settings_get_str("wall_format"),
SERVER(server), item, args, NULL, 0); SERVER(server), item, args, NULL, 0);
g_free(args); g_free(args);
recoded = recode_out(SERVER(server), msg, channame);
for (tmp = nicks; tmp != NULL; tmp = tmp->next) { for (tmp = nicks; tmp != NULL; tmp = tmp->next) {
NICK_REC *rec = tmp->data; NICK_REC *rec = tmp->data;
if (rec != chanrec->ownnick) { if (rec != chanrec->ownnick) {
irc_send_cmdv(server, "NOTICE %s :%s", irc_send_cmdv(server, "NOTICE %s :%s",
rec->nick, recoded); rec->nick, msg);
} }
} }
g_free(recoded);
g_free(msg); g_free(msg);
g_slist_free(nicks); g_slist_free(nicks);
} }
g_free(recoded);
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }