From c5109787eb88cb9ed7dc67963580f359fbc74798 Mon Sep 17 00:00:00 2001 From: Jilles Tjoelker Date: Wed, 12 Nov 2008 21:00:05 +0000 Subject: [PATCH] Remove /wallchops, do not suggest other commands in /help wall. The only major ircd supporting /wallchops also supports /notice @#channel. The /wall command has used /notice @#channel (if it is supported which is pretty much everywhere) for a while and so it can be used without problems on large channels. git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@4902 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- docs/help/in/wall.in | 3 --- docs/help/in/wallchops.in | 9 --------- src/fe-common/irc/fe-irc-commands.c | 20 -------------------- src/irc/core/irc-commands.c | 24 ------------------------ 4 files changed, 56 deletions(-) delete mode 100644 docs/help/in/wallchops.in diff --git a/docs/help/in/wall.in b/docs/help/in/wall.in index afa73722..41beb239 100644 --- a/docs/help/in/wall.in +++ b/docs/help/in/wall.in @@ -6,7 +6,4 @@ supports WALLCHOPS or STATUSMSG=@, it sends a notice to @#channel. Otherwise it sends a notice separately to each operator, which may not be a very good idea to use in a channel with lots of operators. -Many IRC servers support also /MSG @#channel or /WALLCHOPS which you should -use if possible. - See also: WALLCHOPS diff --git a/docs/help/in/wallchops.in b/docs/help/in/wallchops.in deleted file mode 100644 index 034b1f68..00000000 --- a/docs/help/in/wallchops.in +++ /dev/null @@ -1,9 +0,0 @@ - -@SYNTAX:wallchops@ - -Works only in the Undernet and Open Projects (ircu). - -Sends an message to all other channel operators of the current channel. - -See also: WALL - diff --git a/src/fe-common/irc/fe-irc-commands.c b/src/fe-common/irc/fe-irc-commands.c index 78a576f7..6f208447 100644 --- a/src/fe-common/irc/fe-irc-commands.c +++ b/src/fe-common/irc/fe-irc-commands.c @@ -191,24 +191,6 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, cmd_params_free(free_arg); } -static void cmd_wallchops(const char *data, IRC_SERVER_REC *server, - WI_ITEM_REC *item) -{ - char *channame, *msg; - void *free_arg; - - CMD_IRC_SERVER(server); - - if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | - PARAM_FLAG_GETREST, item, &channame, &msg)) - return; - if (*msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); - - signal_emit("message irc own_wall", 3, server, msg, channame); - - cmd_params_free(free_arg); -} - static void bans_ask_channel(const char *channel, IRC_SERVER_REC *server, WI_ITEM_REC *item) { @@ -439,7 +421,6 @@ void fe_irc_commands_init(void) command_bind_irc("ctcp", NULL, (SIGNAL_FUNC) cmd_ctcp); command_bind_irc("nctcp", NULL, (SIGNAL_FUNC) cmd_nctcp); command_bind_irc("wall", NULL, (SIGNAL_FUNC) cmd_wall); - command_bind_irc("wallchops", NULL, (SIGNAL_FUNC) cmd_wallchops); command_bind_irc("ban", NULL, (SIGNAL_FUNC) cmd_ban); command_bind_irc("ver", NULL, (SIGNAL_FUNC) cmd_ver); command_bind_irc("topic", NULL, (SIGNAL_FUNC) cmd_topic); @@ -456,7 +437,6 @@ void fe_irc_commands_deinit(void) command_unbind("ctcp", (SIGNAL_FUNC) cmd_ctcp); command_unbind("nctcp", (SIGNAL_FUNC) cmd_nctcp); command_unbind("wall", (SIGNAL_FUNC) cmd_wall); - command_unbind("wallchops", (SIGNAL_FUNC) cmd_wallchops); command_unbind("ban", (SIGNAL_FUNC) cmd_ban); command_unbind("ver", (SIGNAL_FUNC) cmd_ver); command_unbind("topic", (SIGNAL_FUNC) cmd_topic); diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c index fb94f1f3..2299f7cf 100644 --- a/src/irc/core/irc-commands.c +++ b/src/irc/core/irc-commands.c @@ -663,28 +663,6 @@ static void cmd_wall(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item cmd_params_free(free_arg); } -/* SYNTAX: WALLCHOPS */ -/* ircu is the only major server i can see which supports this - and it supports NOTICE @#channel anyway */ -static void cmd_wallchops(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) -{ - char *channame, *msg, *recoded; - void *free_arg; - - CMD_IRC_SERVER(server); - - if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | - PARAM_FLAG_GETREST, item, &channame, &msg)) - return; - if (*msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); - - recoded = recode_out(SERVER(server), msg, channame); - irc_send_cmdv(server, "WALLCHOPS %s :%s", channame, recoded); - - g_free(recoded); - cmd_params_free(free_arg); -} - /* SYNTAX: KICKBAN [] */ static void cmd_kickban(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) @@ -1054,7 +1032,6 @@ void irc_commands_init(void) command_bind_irc("userhost", NULL, (SIGNAL_FUNC) command_self); command_bind_irc("quote", NULL, (SIGNAL_FUNC) cmd_quote); command_bind_irc("wall", NULL, (SIGNAL_FUNC) cmd_wall); - command_bind_irc("wallchops", NULL, (SIGNAL_FUNC) cmd_wallchops); command_bind_irc("wait", NULL, (SIGNAL_FUNC) cmd_wait); /* SYNTAX: WALLOPS */ command_bind_irc("wallops", NULL, (SIGNAL_FUNC) command_1self); @@ -1126,7 +1103,6 @@ void irc_commands_deinit(void) command_unbind("userhost", (SIGNAL_FUNC) command_self); command_unbind("quote", (SIGNAL_FUNC) cmd_quote); command_unbind("wall", (SIGNAL_FUNC) cmd_wall); - command_unbind("wallchops", (SIGNAL_FUNC) cmd_wallchops); command_unbind("wait", (SIGNAL_FUNC) cmd_wait); command_unbind("wallops", (SIGNAL_FUNC) command_1self); command_unbind("kickban", (SIGNAL_FUNC) cmd_kickban);