Changes in root_commands.c [e67e513:da60f28]

File:

• root_commands.c (modified) (86 diffs)

root_commands.c

@@ -42 +42 @@
                         if( cmd[blaat] == NULL )                               \
                         {                                                      \
-                                irc_rootmsg( irc, "Not enough parameters given (need %d).", x ); \
+                                irc_usermsg( irc, "Not enough parameters given (need %d).", x ); \
                                 return y;                                      \
                         }                                                      \
@@ -69 +69 @@
                 }
         
-        irc_rootmsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
+        irc_usermsg( irc, "Unknown command: %s. Please use \x02help commands\x02 to get a list of available commands.", cmd[0] );
 }
 
@@ -90 +90 @@
         if( s )
         {
-                irc_rootmsg( irc, "%s", s );
+                irc_usermsg( irc, "%s", s );
                 g_free( s );
         }
         else
         {
-                irc_rootmsg( irc, "Error opening helpfile." );
+                irc_usermsg( irc, "Error opening helpfile." );
         }
 }
@@ -110 +110 @@
         if( irc->status & USTATUS_IDENTIFIED )
         {
-                irc_rootmsg( irc, "You're already logged in." );
+                irc_usermsg( irc, "You're already logged in." );
                 return;
         }
@@ -128 +128 @@
         else if( irc->b->accounts != NULL )
         {
-                irc_rootmsg( irc,
+                irc_usermsg( irc,
                              "You're trying to identify yourself, but already have "
                              "at least one IM account set up. "
@@ -138 +138 @@
         if( password == NULL )
         {
-                irc_rootmsg( irc, "About to identify, use /OPER to enter the password" );
+                irc_usermsg( irc, "About to identify, use /OPER to enter the password" );
                 irc->status |= OPER_HACK_IDENTIFY;
                 return;
@@ -150 +150 @@
         switch (status) {
         case STORAGE_INVALID_PASSWORD:
-                irc_rootmsg( irc, "Incorrect password" );
+                irc_usermsg( irc, "Incorrect password" );
                 break;
         case STORAGE_NO_SUCH_USER:
-                irc_rootmsg( irc, "The nick is (probably) not registered" );
+                irc_usermsg( irc, "The nick is (probably) not registered" );
                 break;
         case STORAGE_OK:
-                irc_rootmsg( irc, "Password accepted%s",
+                irc_usermsg( irc, "Password accepted%s",
                              load ? ", settings and accounts loaded" : "" );
                 irc_setpass( irc, password );
@@ -192 +192 @@
         case STORAGE_OTHER_ERROR:
         default:
-                irc_rootmsg( irc, "Unknown error while loading configuration" );
+                irc_usermsg( irc, "Unknown error while loading configuration" );
                 break;
         }
@@ -215 +215 @@
         if( global.conf->authmode == AUTHMODE_REGISTERED )
         {
-                irc_rootmsg( irc, "This server does not allow registering new accounts" );
+                irc_usermsg( irc, "This server does not allow registering new accounts" );
                 return;
         }
@@ -221 +221 @@
         if( cmd[1] == NULL )
         {
-                irc_rootmsg( irc, "About to register, use /OPER to enter the password" );
+                irc_usermsg( irc, "About to register, use /OPER to enter the password" );
                 irc->status |= OPER_HACK_REGISTER;
                 return;
@@ -228 +228 @@
         switch( storage_save( irc, cmd[1], FALSE ) ) {
                 case STORAGE_ALREADY_EXISTS:
-                        irc_rootmsg( irc, "Nick is already registered" );
+                        irc_usermsg( irc, "Nick is already registered" );
                         break;
                         
                 case STORAGE_OK:
-                        irc_rootmsg( irc, "Account successfully created" );
+                        irc_usermsg( irc, "Account successfully created" );
                         irc_setpass( irc, cmd[1] );
                         irc->status |= USTATUS_IDENTIFIED;
@@ -245 +245 @@
 
                 default:
-                        irc_rootmsg( irc, "Error registering" );
+                        irc_usermsg( irc, "Error registering" );
                         break;
         }
@@ -257 +257 @@
         switch (status) {
         case STORAGE_NO_SUCH_USER:
-                irc_rootmsg( irc, "That account does not exist" );
+                irc_usermsg( irc, "That account does not exist" );
                 break;
         case STORAGE_INVALID_PASSWORD:
-                irc_rootmsg( irc, "Password invalid" );
+                irc_usermsg( irc, "Password invalid" );
                 break;
         case STORAGE_OK:
@@ -266 +266 @@
                 irc->status &= ~USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "-R", 1 );
-                irc_rootmsg( irc, "Account `%s' removed", irc->user->nick );
+                irc_usermsg( irc, "Account `%s' removed", irc->user->nick );
                 break;
         default:
-                irc_rootmsg( irc, "Error: `%d'", status );
+                irc_usermsg( irc, "Error: `%d'", status );
                 break;
         }
@@ -277 +277 @@
 {
         if( ( irc->status & USTATUS_IDENTIFIED ) == 0 )
-                irc_rootmsg( irc, "Please create an account first" );
+                irc_usermsg( irc, "Please create an account first" );
         else if( storage_save( irc, NULL, TRUE ) == STORAGE_OK )
-                irc_rootmsg( irc, "Configuration saved" );
-        else
-                irc_rootmsg( irc, "Configuration could not be saved!" );
+                irc_usermsg( irc, "Configuration saved" );
+        else
+                irc_usermsg( irc, "Configuration could not be saved!" );
 }
 
@@ -290 +290 @@
         
         if( ( val = set_getstr( head, key ) ) )
-                irc_rootmsg( irc, "%s = `%s'", key, val );
+                irc_usermsg( irc, "%s = `%s'", key, val );
         else if( !( set = set_find( head, key ) ) )
         {
-                irc_rootmsg( irc, "Setting `%s' does not exist.", key );
+                irc_usermsg( irc, "Setting `%s' does not exist.", key );
                 if( *head == irc->b->set )
-                        irc_rootmsg( irc, "It might be an account or channel setting. "
+                        irc_usermsg( irc, "It might be an account or channel setting. "
                                      "See \x02help account set\x02 and \x02help channel set\x02." );
         }
         else if( set->flags & SET_PASSWORD )
-                irc_rootmsg( irc, "%s = `********' (hidden)", key );
-        else
-                irc_rootmsg( irc, "%s is empty", key );
+                irc_usermsg( irc, "%s = `********' (hidden)", key );
+        else
+                irc_usermsg( irc, "%s is empty", key );
 }
 
@@ -344 +344 @@
                            feedback. */
                         if( st )
-                                irc_rootmsg( irc, "Setting changed successfully" );
+                                irc_usermsg( irc, "Setting changed successfully" );
                         else
-                                irc_rootmsg( irc, "Failed to change setting" );
+                                irc_usermsg( irc, "Failed to change setting" );
                 }
                 else
@@ -377 +377 @@
         if( a->ic && s && s->flags & ACC_SET_OFFLINE_ONLY )
         {
-                irc_rootmsg( irc, "This setting can only be changed when the account is %s-line", "off" );
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "off" );
                 return 0;
         }
         else if( !a->ic && s && s->flags & ACC_SET_ONLINE_ONLY )
         {
-                irc_rootmsg( irc, "This setting can only be changed when the account is %s-line", "on" );
+                irc_usermsg( irc, "This setting can only be changed when the account is %s-line", "on" );
                 return 0;
         }
@@ -396 +396 @@
         if( global.conf->authmode == AUTHMODE_REGISTERED && !( irc->status & USTATUS_IDENTIFIED ) )
         {
-                irc_rootmsg( irc, "This server only accepts registered users" );
+                irc_usermsg( irc, "This server only accepts registered users" );
                 return;
         }
@@ -413 +413 @@
                                 if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
                                 {
-                                        irc_rootmsg( irc, "Enter password for account %s(%s) "
+                                        irc_usermsg( irc, "Enter password for account %s(%s) "
                                                      "first (use /OPER)", a->prpl->name, a->user );
                                         return;
@@ -425 +425 @@
                 if( prpl == NULL )
                 {
-                        irc_rootmsg( irc, "Unknown protocol" );
+                        irc_usermsg( irc, "Unknown protocol" );
                         return;
                 }
@@ -431 +431 @@
                 for( a = irc->b->accounts; a; a = a->next )
                         if( a->prpl == prpl && prpl->handle_cmp( a->user, cmd[3] ) == 0 )
-                                irc_rootmsg( irc, "Warning: You already have an account with "
+                                irc_usermsg( irc, "Warning: You already have an account with "
                                              "protocol `%s' and username `%s'. Are you accidentally "
                                              "trying to add it twice?", prpl->name, cmd[3] );
@@ -438 +438 @@
                 if( cmd[5] )
                 {
-                        irc_rootmsg( irc, "Warning: Passing a servername/other flags to `account add' "
+                        irc_usermsg( irc, "Warning: Passing a servername/other flags to `account add' "
                                           "is now deprecated. Use `account set' instead." );
                         set_setstr( &a->set, "server", cmd[5] );
                 }
                 
-                irc_rootmsg( irc, "Account successfully added%s", cmd[4] ? "" :
+                irc_usermsg( irc, "Account successfully added%s", cmd[4] ? "" :
                              ", now use /OPER to enter the password" );
                 
@@ -453 +453 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_rootmsg( irc, "Account list:" );
+                        irc_usermsg( irc, "Account list:" );
                 
                 for( a = irc->b->accounts; a; a = a->next )
@@ -468 +468 @@
                                 con = "";
                         
-                        irc_rootmsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
+                        irc_usermsg( irc, "%2d (%s): %s, %s%s", i, a->tag, a->prpl->name, a->user, con );
                         
                         i ++;
                 }
-                irc_rootmsg( irc, "End of account list" );
+                irc_usermsg( irc, "End of account list" );
                 
                 return;
@@ -484 +484 @@
                 if ( irc->b->accounts )
                 {
-                        irc_rootmsg( irc, "Trying to get all accounts connected..." );
+                        irc_usermsg( irc, "Trying to get all accounts connected..." );
                 
                         for( a = irc->b->accounts; a; a = a->next )
@@ -490 +490 @@
                                 {
                                         if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                                                irc_rootmsg( irc, "Enter password for account %s(%s) "
+                                                irc_usermsg( irc, "Enter password for account %s(%s) "
                                                              "first (use /OPER)", a->prpl->name, a->user );
                                         else
@@ -498 +498 @@
                 else
                 {
-                        irc_rootmsg( irc, "No accounts known. Use `account add' to add one." );
+                        irc_usermsg( irc, "No accounts known. Use `account add' to add one." );
                 }
                 
@@ -505 +505 @@
         else if( len >= 2 && g_strncasecmp( cmd[1], "off", len ) == 0 )
         {
-                irc_rootmsg( irc, "Deactivating all active (re)connections..." );
+                irc_usermsg( irc, "Deactivating all active (re)connections..." );
                 
                 for( a = irc->b->accounts; a; a = a->next )
@@ -530 +530 @@
             ( a = account_get( irc->b, cmd[1] ) ) == NULL )
         {
-                irc_rootmsg( irc, "Could not find account `%s'. Note that the syntax "
+                irc_usermsg( irc, "Could not find account `%s'. Note that the syntax "
                              "of the account command changed, see \x02help account\x02.", cmd[1] );
                 
@@ -540 +540 @@
                 if( a->ic )
                 {
-                        irc_rootmsg( irc, "Account is still logged in, can't delete" );
+                        irc_usermsg( irc, "Account is still logged in, can't delete" );
                 }
                 else
                 {
                         account_del( irc->b, a );
-                        irc_rootmsg( irc, "Account deleted" );
+                        irc_usermsg( irc, "Account deleted" );
                 }
         }
@@ -551 +551 @@
         {
                 if( a->ic )
-                        irc_rootmsg( irc, "Account already online" );
+                        irc_usermsg( irc, "Account already online" );
                 else if( strcmp( a->pass, PASSWORD_PENDING ) == 0 )
-                        irc_rootmsg( irc, "Enter password for account %s(%s) "
+                        irc_usermsg( irc, "Enter password for account %s(%s) "
                                      "first (use /OPER)", a->prpl->name, a->user );
                 else
@@ -567 +567 @@
                 {
                         cancel_auto_reconnect( a );
-                        irc_rootmsg( irc, "Reconnect cancelled" );
-                }
-                else
-                {
-                        irc_rootmsg( irc, "Account already offline" );
+                        irc_usermsg( irc, "Reconnect cancelled" );
+                }
+                else
+                {
+                        irc_usermsg( irc, "Account already offline" );
                 }
         }
@@ -580 +580 @@
         else
         {
-                irc_rootmsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[2] );
+                irc_usermsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "account", cmd[2] );
         }
 }
@@ -597 +597 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_rootmsg( irc, "Channel list:" );
+                        irc_usermsg( irc, "Channel list:" );
                 
                 for( l = irc->channels; l; l = l->next )
@@ -603 +603 @@
                         irc_channel_t *ic = l->data;
                         
-                        irc_rootmsg( irc, "%2d. %s, %s channel%s", i, ic->name,
+                        irc_usermsg( irc, "%2d. %s, %s channel%s", i, ic->name,
                                      set_getstr( &ic->set, "type" ),
                                      ic->flags & IRC_CHANNEL_JOINED ? " (joined)" : "" );
@@ -609 +609 @@
                         i ++;
                 }
-                irc_rootmsg( irc, "End of channel list" );
+                irc_usermsg( irc, "End of channel list" );
                 
                 return;
@@ -623 +623 @@
                         cmd_set_real( irc, cmd + 1, &ic->set, NULL );
                 else
-                        irc_rootmsg( irc, "Could not find channel `%s'", cmd[1] );
+                        irc_usermsg( irc, "Could not find channel `%s'", cmd[1] );
                 
                 return;
@@ -640 +640 @@
                     ic != ic->irc->default_channel )
                 {
-                        irc_rootmsg( irc, "Channel %s deleted.", ic->name );
+                        irc_usermsg( irc, "Channel %s deleted.", ic->name );
                         irc_channel_free( ic );
                 }
                 else
-                        irc_rootmsg( irc, "Couldn't remove channel (main channel %s or "
+                        irc_usermsg( irc, "Couldn't remove channel (main channel %s or "
                                           "channels you're still in cannot be deleted).",
                                           irc->default_channel->name );
@@ -650 +650 @@
         else
         {
-                irc_rootmsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
+                irc_usermsg( irc, "Unknown command: %s [...] %s. Please use \x02help commands\x02 to get a list of available commands.", "channel", cmd[1] );
         }
 }
@@ -668 +668 @@
         if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( a->ic && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -681 +681 @@
                 if( !nick_ok( cmd[3] ) )
                 {
-                        irc_rootmsg( irc, "The requested nick `%s' is invalid", cmd[3] );
+                        irc_usermsg( irc, "The requested nick `%s' is invalid", cmd[3] );
                         return;
                 }
                 else if( irc_user_by_name( irc, cmd[3] ) )
                 {
-                        irc_rootmsg( irc, "The requested nick `%s' already exists", cmd[3] );
+                        irc_usermsg( irc, "The requested nick `%s' already exists", cmd[3] );
                         return;
                 }
@@ -704 +704 @@
                     strcmp( s, "group" ) == 0 &&
                     ( group = set_getstr( &ic->set, "group" ) ) )
-                        irc_rootmsg( irc, "Adding `%s' to contact list (group %s)",
+                        irc_usermsg( irc, "Adding `%s' to contact list (group %s)",
                                      cmd[2], group );
                 else
-                        irc_rootmsg( irc, "Adding `%s' to contact list", cmd[2] );
+                        irc_usermsg( irc, "Adding `%s' to contact list", cmd[2] );
                 
                 a->prpl->add_buddy( a->ic, cmd[2], group );
@@ -720 +720 @@
                 if( ( bu = bee_user_new( irc->b, a->ic, cmd[2], BEE_USER_LOCAL ) ) &&
                     ( iu = bu->ui_data ) )
-                        irc_rootmsg( irc, "Temporarily assigned nickname `%s' "
+                        irc_usermsg( irc, "Temporarily assigned nickname `%s' "
                                      "to contact `%s'", iu->nick, cmd[2] );
         }
@@ -734 +734 @@
         if( !( iu = irc_user_by_name( irc, cmd[1] ) ) || !( bu = iu->bu ) )
         {
-                irc_rootmsg( irc, "Buddy `%s' not found", cmd[1] );
+                irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
                 return;
         }
@@ -744 +744 @@
                 bee_user_free( irc->b, bu );
         
-        irc_rootmsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
+        irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
         g_free( s );
         
@@ -760 +760 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -768 +768 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -779 +779 @@
         if( !ic->acc->prpl->get_info )
         {
-                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -796 +796 @@
         if( iu == NULL )
         {
-                irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
         }
         else if( del )
@@ -802 +802 @@
                 if( iu->bu )
                         bee_irc_user_nick_reset( iu );
-                irc_rootmsg( irc, "Nickname reset to `%s'", iu->nick );
+                irc_usermsg( irc, "Nickname reset to `%s'", iu->nick );
         }
         else if( iu == irc->user )
         {
-                irc_rootmsg( irc, "Use /nick to change your own nickname" );
+                irc_usermsg( irc, "Use /nick to change your own nickname" );
         }
         else if( !nick_ok( cmd[2] ) )
         {
-                irc_rootmsg( irc, "Nick `%s' is invalid", cmd[2] );
+                irc_usermsg( irc, "Nick `%s' is invalid", cmd[2] );
         }
         else if( ( old = irc_user_by_name( irc, cmd[2] ) ) && old != iu )
         {
-                irc_rootmsg( irc, "Nick `%s' already exists", cmd[2] );
+                irc_usermsg( irc, "Nick `%s' already exists", cmd[2] );
         }
         else
@@ -820 +820 @@
                 if( !irc_user_set_nick( iu, cmd[2] ) )
                 {
-                        irc_rootmsg( irc, "Error while changing nick" );
+                        irc_usermsg( irc, "Error while changing nick" );
                         return;
                 }
@@ -836 +836 @@
                 }
                 
-                irc_rootmsg( irc, "Nick successfully changed" );
+                irc_usermsg( irc, "Nick successfully changed" );
         }
 }
@@ -869 +869 @@
                         format = "%-32.32s  %-16.16s";
                 
-                irc_rootmsg( irc, format, "Handle", "Nickname" );
+                irc_usermsg( irc, format, "Handle", "Nickname" );
                 for( l = a->ic->deny; l; l = l->next )
                 {
                         bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
                         irc_user_t *iu = bu ? bu->ui_data : NULL;
-                        irc_rootmsg( irc, format, l->data, iu ? iu->nick : "(none)" );
-                }
-                irc_rootmsg( irc, "End of list." );
+                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
                 
                 return;
@@ -885 +885 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -893 +893 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -904 +904 @@
         if( !ic->acc->prpl->add_deny || !ic->acc->prpl->rem_permit )
         {
-                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -910 +910 @@
                 imc_rem_allow( ic, cmd[2] );
                 imc_add_block( ic, cmd[2] );
-                irc_rootmsg( irc, "Buddy `%s' moved from allow- to block-list", cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from allow- to block-list", cmd[2] );
         }
 }
@@ -929 +929 @@
                         format = "%-32.32s  %-16.16s";
                 
-                irc_rootmsg( irc, format, "Handle", "Nickname" );
+                irc_usermsg( irc, format, "Handle", "Nickname" );
                 for( l = a->ic->permit; l; l = l->next )
                 {
                         bee_user_t *bu = bee_user_by_handle( irc->b, a->ic, l->data );
                         irc_user_t *iu = bu ? bu->ui_data : NULL;
-                        irc_rootmsg( irc, format, l->data, iu ? iu->nick : "(none)" );
-                }
-                irc_rootmsg( irc, "End of list." );
+                        irc_usermsg( irc, format, l->data, iu ? iu->nick : "(none)" );
+                }
+                irc_usermsg( irc, "End of list." );
                 
                 return;
@@ -945 +945 @@
                 if( !iu || !iu->bu )
                 {
-                        irc_rootmsg( irc, "Nick `%s' does not exist", cmd[1] );
+                        irc_usermsg( irc, "Nick `%s' does not exist", cmd[1] );
                         return;
                 }
@@ -953 +953 @@
         else if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
-                irc_rootmsg( irc, "Invalid account" );
+                irc_usermsg( irc, "Invalid account" );
                 return;
         }
         else if( !( ( ic = a->ic ) && ( a->ic->flags & OPT_LOGGED_IN ) ) )
         {
-                irc_rootmsg( irc, "That account is not on-line" );
+                irc_usermsg( irc, "That account is not on-line" );
                 return;
         }
@@ -964 +964 @@
         if( !ic->acc->prpl->rem_deny || !ic->acc->prpl->add_permit )
         {
-                irc_rootmsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
+                irc_usermsg( irc, "Command `%s' not supported by this protocol", cmd[0] );
         }
         else
@@ -971 +971 @@
                 imc_add_allow( ic, cmd[2] );
                 
-                irc_rootmsg( irc, "Buddy `%s' moved from block- to allow-list", cmd[2] );
+                irc_usermsg( irc, "Buddy `%s' moved from block- to allow-list", cmd[2] );
         }
 }
@@ -998 +998 @@
                         if( ( ++times >= 3 ) )
                         {
-                                irc_rootmsg( irc, "%s", msg[rand()%(sizeof(msg)/sizeof(char*))] );
+                                irc_usermsg( irc, "%s", msg[rand()%(sizeof(msg)/sizeof(char*))] );
                                 last_irc = NULL;
                                 times = 0;
@@ -1011 +1011 @@
                 }
                 
-                irc_rootmsg( irc, "Did I ask you something?" );
+                irc_usermsg( irc, "Did I ask you something?" );
                 return;
         }
@@ -1021 +1021 @@
                 if( sscanf( cmd[1], "%d", &numq ) != 1 )
                 {
-                        irc_rootmsg( irc, "Invalid query number" );
+                        irc_usermsg( irc, "Invalid query number" );
                         return;
                 }
@@ -1031 +1031 @@
                 if( !q )
                 {
-                        irc_rootmsg( irc, "Uhm, I never asked you something like that..." );
+                        irc_usermsg( irc, "Uhm, I never asked you something like that..." );
                         return;
                 }
@@ -1071 +1071 @@
                 format = "%-16.16s  %-40.40s  %s";
         
-        irc_rootmsg( irc, format, "Nick", "Handle/Account", "Status" );
+        irc_usermsg( irc, format, "Nick", "Handle/Account", "Status" );
         
         if( irc->root->last_channel &&
@@ -1094 +1094 @@
                         
                         g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_rootmsg( irc, format, iu->nick, s, st );
+                        irc_usermsg( irc, format, iu->nick, s, st );
                 }
                 
@@ -1112 +1112 @@
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_rootmsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
+                        irc_usermsg( irc, format, iu->nick, s, irc_user_get_away( iu ) );
                 }
                 n_away ++;
@@ -1129 +1129 @@
                 {
                         g_snprintf( s, sizeof( s ) - 1, "%s %s(%s)", bu->handle, bu->ic->acc->prpl->name, bu->ic->acc->user );
-                        irc_rootmsg( irc, format, iu->nick, s, "Offline" );
+                        irc_usermsg( irc, format, iu->nick, s, "Offline" );
                 }
                 n_offline ++;
         }
         
-        irc_rootmsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
+        irc_usermsg( irc, "%d buddies (%d available, %d away, %d offline)", n_online + n_away + n_offline, n_online, n_away, n_offline );
 }
 
@@ -1144 +1144 @@
         if( !q )
         {
-                irc_rootmsg( irc, "There are no pending questions." );
-                return;
-        }
-        
-        irc_rootmsg( irc, "Pending queries:" );
+                irc_usermsg( irc, "There are no pending questions." );
+                return;
+        }
+        
+        irc_usermsg( irc, "Pending queries:" );
         
         for( num = 0; q; q = q->next, num ++ )
                 if( q->ic ) /* Not necessary yet, but it might come later */
-                        irc_rootmsg( irc, "%d, %s(%s): %s", num, q->ic->acc->prpl->name, q->ic->acc->user, q->question );
-                else
-                        irc_rootmsg( irc, "%d, BitlBee: %s", num, q->question );
+                        irc_usermsg( irc, "%d, %s(%s): %s", num, q->ic->acc->prpl->name, q->ic->acc->user, q->question );
+                else
+                        irc_usermsg( irc, "%d, BitlBee: %s", num, q->question );
 }
 
@@ -1170 +1170 @@
                 if( !( acc = account_get( irc->b, cmd[2] ) ) )
                 {
-                        irc_rootmsg( irc, "Invalid account" );
+                        irc_usermsg( irc, "Invalid account" );
                         return;
                 }
                 else if( !acc->prpl->chat_join )
                 {
-                        irc_rootmsg( irc, "Named chatrooms not supported on that account." );
+                        irc_usermsg( irc, "Named chatrooms not supported on that account." );
                         return;
                 }
@@ -1205 +1205 @@
                     set_setstr( &ic->set, "room", cmd[3] ) )
                 {
-                        irc_rootmsg( irc, "Chatroom successfully added." );
+                        irc_usermsg( irc, "Chatroom successfully added." );
                 }
                 else
@@ -1212 +1212 @@
                                 irc_channel_free( ic );
                         
-                        irc_rootmsg( irc, "Could not add chatroom." );
+                        irc_usermsg( irc, "Could not add chatroom." );
                 }
                 g_free( channel );
@@ -1227 +1227 @@
                         if( !iu->bu->ic->acc->prpl->chat_with( iu->bu->ic, iu->bu->handle ) )
                         {
-                                irc_rootmsg( irc, "(Possible) failure while trying to open "
+                                irc_usermsg( irc, "(Possible) failure while trying to open "
                                                   "a groupchat with %s.", iu->nick );
                         }
@@ -1233 +1233 @@
                 else
                 {
-                        irc_rootmsg( irc, "Can't open a groupchat with %s.", cmd[2] );
+                        irc_usermsg( irc, "Can't open a groupchat with %s.", cmd[2] );
                 }
         }
@@ -1240 +1240 @@
                  g_strcasecmp( cmd[1], "del" ) == 0 )
         {
-                irc_rootmsg( irc, "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command." );
+                irc_usermsg( irc, "Warning: The \002chat\002 command was mostly replaced with the \002channel\002 command." );
                 cmd_channel( irc, cmd );
         }
         else
         {
-                irc_rootmsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
+                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
         }
 }
@@ -1260 +1260 @@
                 
                 if( strchr( irc->umode, 'b' ) )
-                        irc_rootmsg( irc, "Group list:" );
+                        irc_usermsg( irc, "Group list:" );
                 
                 for( l = irc->b->groups; l; l = l->next )
                 {
                         bee_group_t *bg = l->data;
-                        irc_rootmsg( irc, "%d. %s", n ++, bg->name );
-                }
-                irc_rootmsg( irc, "End of group list" );
-        }
-        else
-        {
-                irc_rootmsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "group", cmd[1] );
+                        irc_usermsg( irc, "%d. %s", n ++, bg->name );
+                }
+                irc_usermsg( irc, "End of group list" );
+        }
+        else
+        {
+                irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "group", cmd[1] );
         }
 }
@@ -1284 +1284 @@
         if( !files )
         {
-                irc_rootmsg( irc, "No pending transfers" );
+                irc_usermsg( irc, "No pending transfers" );
                 return;
         }
@@ -1305 +1305 @@
                 case LIST:
                         if ( file->status == FT_STATUS_LISTENING )
-                                irc_rootmsg( irc, 
+                                irc_usermsg( irc, 
                                         "Pending file(id %d): %s (Listening...)", file->local_id, file->file_name);
                         else 
@@ -1314 +1314 @@
                                         kb_per_s = file->bytes_transferred / 1024 / diff;
                                         
-                                irc_rootmsg( irc, 
+                                irc_usermsg( irc, 
                                         "Pending file(id %d): %s (%10zd/%zd kb, %d kb/s)", file->local_id, file->file_name, 
                                         file->bytes_transferred/1024, file->file_size/1024, kb_per_s);
@@ -1322 +1322 @@
                         if( file->status == FT_STATUS_LISTENING )
                         {
-                                irc_rootmsg( irc, "Rejecting file transfer for %s", file->file_name );
+                                irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
                                 imcb_file_canceled( file->ic, file, "Denied by user" );
                         }
@@ -1329 +1329 @@
                         if( file->local_id == fid )
                         {
-                                irc_rootmsg( irc, "Canceling file transfer for %s", file->file_name );
+                                irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
                                 imcb_file_canceled( file->ic, file, "Canceled by user" );
                         }
@@ -1339 +1339 @@
 static void cmd_nick( irc_t *irc, char **cmd )
 {
-        irc_rootmsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
+        irc_usermsg( irc, "This command is deprecated. Try: account %s set display_name", cmd[1] );
 }
 
@@ -1354 +1354 @@
         
         if( msg )
-                irc_rootmsg( irc, "%s: This seems to be your first time using this "
+                irc_usermsg( irc, "%s: This seems to be your first time using this "
                                   "this version of BitlBee. Here's a list of new "
                                   "features you may like to know about:\n\n%s\n",