diff options
| -rw-r--r-- | doc/user-guide/commands.xml | 16 | ||||
| -rw-r--r-- | irc_commands.c | 8 | ||||
| -rw-r--r-- | irc_send.c | 4 | ||||
| -rw-r--r-- | root_commands.c | 6 |
4 files changed, 24 insertions, 10 deletions
diff --git a/doc/user-guide/commands.xml b/doc/user-guide/commands.xml index 989fc392..a1554645 100644 --- a/doc/user-guide/commands.xml +++ b/doc/user-guide/commands.xml @@ -1463,44 +1463,44 @@ </description> </bitlbee-command> - <bitlbee-command name="transfers"> + <bitlbee-command name="transfer"> <short-description>Monitor, cancel, or reject file transfers</short-description> - <syntax>transfers [<cancel> id | <reject>]</syntax> + <syntax>transfer [<cancel> id | <reject>]</syntax> <description> <para> - Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfers <action></emphasis> for more information. + Without parameters the currently pending file transfers and their status will be listed. Available actions are <emphasis>cancel</emphasis> and <emphasis>reject</emphasis>. See <emphasis>help transfer <action></emphasis> for more information. </para> <ircexample> - <ircline nick="ulim">transfers</ircline> + <ircline nick="ulim">transfer</ircline> </ircexample> </description> <bitlbee-command name="cancel"> <short-description>Cancels the file transfer with the given id</short-description> - <syntax>transfers <cancel> id</syntax> + <syntax>transfer <cancel> id</syntax> <description> <para>Cancels the file transfer with the given id</para> </description> <ircexample> - <ircline nick="ulim">transfers cancel 1</ircline> + <ircline nick="ulim">transfer cancel 1</ircline> <ircline nick="root">Canceling file transfer for test</ircline> </ircexample> </bitlbee-command> <bitlbee-command name="reject"> <short-description>Rejects all incoming transfers</short-description> - <syntax>transfers <reject></syntax> + <syntax>transfer <reject></syntax> <description> <para>Rejects all incoming (not already transferring) file transfers. Since you probably have only one incoming transfer at a time, no id is neccessary. Or is it?</para> </description> <ircexample> - <ircline nick="ulim">transfers reject</ircline> + <ircline nick="ulim">transfer reject</ircline> </ircexample> </bitlbee-command> </bitlbee-command> diff --git a/irc_commands.c b/irc_commands.c index 4b1bc741..7874f519 100644 --- a/irc_commands.c +++ b/irc_commands.c @@ -301,11 +301,19 @@ static void irc_cmd_who( irc_t *irc, char **cmd ) { char *channel = cmd[1]; irc_channel_t *ic; + irc_user_t *iu; if( !channel || *channel == '0' || *channel == '*' || !*channel ) irc_send_who( irc, irc->users, "**" ); else if( ( ic = irc_channel_by_name( irc, channel ) ) ) irc_send_who( irc, ic->users, channel ); + else if( ( iu = irc_user_by_name( irc, channel ) ) ) + { + /* Tiny hack! */ + GSList *l = g_slist_append( NULL, iu ); + irc_send_who( irc, l, channel ); + g_slist_free( l ); + } else irc_send_num( irc, 403, "%s :No such channel", channel ); } @@ -263,7 +263,7 @@ void irc_send_whois( irc_user_t *iu ) void irc_send_who( irc_t *irc, GSList *l, const char *channel ) { - gboolean is_channel = strcmp( channel, "**" ) != 0; + gboolean is_channel = strchr( CTYPES, channel[0] ) != NULL; while( l ) { @@ -272,7 +272,7 @@ void irc_send_who( irc_t *irc, GSList *l, const char *channel ) iu = ((irc_channel_user_t*)iu)->iu; /* TODO(wilmer): Restore away/channel information here */ irc_send_num( irc, 352, "%s %s %s %s %s %c :0 %s", - channel ? : "*", iu->user, iu->host, irc->root->host, + is_channel ? channel : "*", iu->user, iu->host, irc->root->host, iu->nick, iu->flags & IRC_USER_AWAY ? 'G' : 'H', iu->fullname ); l = l->next; diff --git a/root_commands.c b/root_commands.c index 280c93a2..94d22933 100644 --- a/root_commands.c +++ b/root_commands.c @@ -1283,6 +1283,11 @@ static void cmd_transfer( irc_t *irc, char **cmd ) } } +static void cmd_nick( irc_t *irc, char **cmd ) +{ + irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] ); +} + /* Maybe this should be a stand-alone command as well? */ static void bitlbee_whatsnew( irc_t *irc ) { @@ -1337,6 +1342,7 @@ const command_t commands[] = { { "help", 0, cmd_help, 0 }, { "identify", 1, cmd_identify, 0 }, { "info", 1, cmd_info, 0 }, + { "nick", 1, cmd_nick, 0 }, { "no", 0, cmd_yesno, 0 }, { "qlist", 0, cmd_qlist, 0 }, { "register", 1, cmd_register, 0 }, |