Changeset dbb0ce3

Timestamp:

2010-04-11T19:38:45Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ffa1173

Parents:

e00da63

Message:

Restored add/remove command and, oh, yes/no commands. Nice to be able to
answer the questions..

File:

• root_commands.c (modified) (8 diffs)

root_commands.c

@@ -567 +567 @@
 }
 
-#if 0
 static void cmd_add( irc_t *irc, char **cmd )
 {
@@ -580 +579 @@
         }
         
-        if( !( a = account_get( irc, cmd[1] ) ) )
+        if( !( a = account_get( irc->b, cmd[1] ) ) )
         {
                 irc_usermsg( irc, "Invalid account" );
@@ -598 +597 @@
                         return;
                 }
-                else if( user_find( irc, cmd[3] ) )
+                else if( irc_user_by_name( irc, cmd[3] ) )
                 {
                         irc_usermsg( irc, "The requested nick `%s' already exists", cmd[3] );
@@ -612 +611 @@
                 a->ic->acc->prpl->add_buddy( a->ic, cmd[2], NULL );
         else
-                /* Yeah, officially this is a call-*back*... So if we just
-                   called add_buddy, we'll wait for the IM server to respond
-                   before we do this. */
-                imcb_add_buddy( a->ic, cmd[2], NULL );
+                /* Only for add -tmp. For regular adds, this callback will
+                   be called once the IM server confirms. */
+                bee_user_new( irc->b, a->ic, cmd[2] );
         
         irc_usermsg( irc, "Adding `%s' to your contact list", cmd[2]  );
 }
 
+static void cmd_remove( irc_t *irc, char **cmd )
+{
+        irc_user_t *iu;
+        bee_user_t *bu;
+        char *s;
+        
+        if( !( iu = irc_user_by_name( irc, cmd[1] ) ) || !( bu = iu->bu ) )
+        {
+                irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
+                return;
+        }
+        s = g_strdup( bu->handle );
+        
+        bu->ic->acc->prpl->remove_buddy( bu->ic, bu->handle, NULL );
+        nick_del( bu->ic->acc, bu->handle );
+        irc_user_free( irc, cmd[1] );
+        
+        irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
+        g_free( s );
+        
+        return;
+}
+
+#if 0
 static void cmd_info( irc_t *irc, char **cmd )
 {
@@ -733 +755 @@
 }
 
-static void cmd_remove( irc_t *irc, char **cmd )
-{
-        user_t *u;
-        char *s;
-        
-        if( !( u = user_find( irc, cmd[1] ) ) || !u->ic )
-        {
-                irc_usermsg( irc, "Buddy `%s' not found", cmd[1] );
-                return;
-        }
-        s = g_strdup( u->handle );
-        
-        u->ic->acc->prpl->remove_buddy( u->ic, u->handle, NULL );
-        nick_del( u->ic->acc, u->handle );
-        user_del( irc, cmd[1] );
-        
-        irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );
-        g_free( s );
-        
-        return;
-}
-
 static void cmd_block( irc_t *irc, char **cmd )
 {
@@ -873 +873 @@
         }
 }
+#endif
 
 static void cmd_yesno( irc_t *irc, char **cmd )
@@ -917 +918 @@
 }
 
+#if 0
 static void cmd_blist( irc_t *irc, char **cmd )
 {
@@ -1184 +1186 @@
         { "drop",           1, cmd_drop,           0 },
         { "save",           0, cmd_save,           0 },
+        { "add",            2, cmd_add,            0 },
+        { "remove",         1, cmd_remove,         0 },
 #if 0
-        { "add",            2, cmd_add,            0 },
         { "info",           1, cmd_info,           0 },
 #endif
         { "rename",         2, cmd_rename,         0 },
 #if 0
-        { "remove",         1, cmd_remove,         0 },
         { "block",          1, cmd_block,          0 },
         { "allow",          1, cmd_allow,          0 },
+#endif
         { "set",            0, cmd_set,            0 },
         { "yes",            0, cmd_yesno,          0 },
         { "no",             0, cmd_yesno,          0 },
+#if 0
         { "blist",          0, cmd_blist,          0 },
         { "nick",           1, cmd_nick,           0 },