Changes in root_commands.c [0baed0d:b8a491d]

File:

• root_commands.c (modified) (5 diffs)

root_commands.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2004 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -654 +654 @@
                 irc_usermsg( irc, "Nick `%s' can't be changed", cmd[1] );
         }
-        else if( g_strcasecmp( cmd[1], irc->channel ) == 0 )
-        {
-                if( strchr( CTYPES, cmd[2][0] ) && nick_ok( cmd[2] + 1 ) )
-                {
-                        u = user_find( irc, irc->nick );
-                        
-                        irc_part( irc, u, irc->channel );
-                        g_free( irc->channel );
-                        irc->channel = g_strdup( cmd[2] );
-                        irc_join( irc, u, irc->channel );
-                        
-                        if( strcmp( cmd[0], "set_rename" ) != 0 )
-                                set_setstr( &irc->set, "control_channel", cmd[2] );
-                }
-        }
         else if( user_find( irc, cmd[2] ) && ( nick_cmp( cmd[1], cmd[2] ) != 0 ) )
         {
@@ -716 +701 @@
         
         return strcmp( irc->mynick, new_nick ) == 0 ? new_nick : SET_INVALID;
-}
-
-char *set_eval_control_channel( set_t *set, char *new_name )
-{
-        irc_t *irc = set->data;
-        
-        if( strcmp( irc->channel, new_name ) != 0 )
-        {
-                char *cmd[] = { "set_rename", irc->channel, new_name, NULL };
-                
-                cmd_rename( irc, cmd );
-        }
-        
-        return strcmp( irc->channel, new_name ) == 0 ? new_name : SET_INVALID;
 }
 
@@ -1154 +1125 @@
         {
                 irc_usermsg( irc, "Unknown command: %s %s. Please use \x02help commands\x02 to get a list of available commands.", "chat", cmd[1] );
+        }
+}
+
+static void cmd_transfer( irc_t *irc, char **cmd )
+{
+        GSList *files = irc->file_transfers;
+        enum { LIST, REJECT, CANCEL };
+        int subcmd = LIST;
+        int fid;
+
+        if( !files )
+        {
+                irc_usermsg( irc, "No pending transfers" );
+                return;
+        }
+
+        if( cmd[1] && ( strcmp( cmd[1], "reject" ) == 0 ) )
+        {
+                subcmd = REJECT;
+        }
+        else if( cmd[1] && ( strcmp( cmd[1], "cancel" ) == 0 ) && 
+                 cmd[2] && ( sscanf( cmd[2], "%d", &fid ) == 1 ) )
+        {
+                subcmd = CANCEL;
+        }
+
+        for( ; files; files = g_slist_next( files ) )
+        {
+                file_transfer_t *file = files->data;
+                
+                switch( subcmd ) {
+                case LIST:
+                        if ( file->status == FT_STATUS_LISTENING )
+                                irc_usermsg( irc, 
+                                        "Pending file(id %d): %s (Listening...)", file->local_id, file->file_name);
+                        else 
+                        {
+                                int kb_per_s = 0;
+                                time_t diff = time( NULL ) - file->started ? : 1;
+                                if ( ( file->started > 0 ) && ( file->bytes_transferred > 0 ) )
+                                        kb_per_s = file->bytes_transferred / 1024 / diff;
+                                        
+                                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);
+                        }
+                        break;
+                case REJECT:
+                        if( file->status == FT_STATUS_LISTENING )
+                        {
+                                irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
+                                imcb_file_canceled( file, "Denied by user" );
+                        }
+                        break;
+                case CANCEL:
+                        if( file->local_id == fid )
+                        {
+                                irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
+                                imcb_file_canceled( file, "Canceled by user" );
+                        }
+                        break;
+                }
         }
 }
@@ -1178 +1211 @@
         { "join_chat",      2, cmd_join_chat,      0 },
         { "chat",           1, cmd_chat,           0 },
+        { "transfer",       0, cmd_transfer,       0 },
         { NULL }
 };