Changeset 46d215d

Timestamp:

2010-06-08T23:43:13Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6acc033

Parents:

d7db346

Message:

Allow moving contacts around between groups. Works with at least Jabber,
will check the others now.

Files:

• irc_channel.c (modified) (2 diffs)
• irc_commands.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)

irc_channel.c

@@ -359 +359 @@
 }
 
+static gboolean control_channel_invite( irc_channel_t *ic, irc_user_t *iu )
+{
+        struct irc_control_channel *icc = ic->data;
+        bee_user_t *bu = iu->bu;
+        
+        if( bu == NULL )
+                return FALSE;
+        
+        if( icc->type != IRC_CC_TYPE_GROUP )
+        {
+                irc_send_num( ic->irc, 482, "%s :Invitations are only possible to fill_by=group channels", ic->name );
+                return FALSE;
+        }
+        
+        bu->ic->acc->prpl->add_buddy( bu->ic, bu->handle,
+                                      icc->group ? icc->group->name : NULL );
+        
+        return TRUE;
+}
+
 static char *set_eval_by_account( set_t *set, char *value );
 static char *set_eval_fill_by( set_t *set, char *value );
@@ -456 +476 @@
         NULL,
         NULL,
-        NULL,
+        control_channel_invite,
         
         control_channel_init,

irc_commands.c

@@ -403 +403 @@
         }
         
-        if( !ic->f->invite || !ic->f->invite( ic, iu ) )
+        if( !ic->f->invite )
                 irc_send_num( irc, 482, "%s :Can't invite people here", cmd[2] );
+        else if( ic->f->invite( ic, iu ) )
+                irc_send_num( irc, 341, "%s %s", iu->nick, ic->name );
 }
 

protocols/jabber/iq.c

@@ -555 +555 @@
 static xt_status jabber_add_to_roster_callback( struct im_connection *ic, struct xt_node *node, struct xt_node *orig );
 
-int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name )
+int jabber_add_to_roster( struct im_connection *ic, const char *handle, const char *name, const char *group )
 {
         struct xt_node *node;
@@ -565 +565 @@
         if( name )
                 xt_add_attr( node, "name", name );
+        if( group )
+                xt_add_child( node, xt_new_node( "group", group, NULL ) );
         
         /* And pack it into a roster-add packet */

protocols/jabber/jabber.c

@@ -413 +413 @@
         }
         
-        if( jabber_add_to_roster( ic, who, NULL ) )
+        if( jabber_add_to_roster( ic, who, NULL, group ) )
                 presence_send_request( ic, who, "subscribe" );
 }

protocols/jabber/jabber.h

@@ -235 +235 @@
 int jabber_get_roster( struct im_connection *ic );
 int jabber_get_vcard( struct im_connection *ic, char *bare_jid );
-int jabber_add_to_roster( struct im_connection *ic, char *handle, char *name );
+int jabber_add_to_roster( struct im_connection *ic, const char *handle, const char *name, const char *group );
 int jabber_remove_from_roster( struct im_connection *ic, char *handle );
 xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid );

root_commands.c

@@ -622 +622 @@
         
         if( add_on_server )
-                a->ic->acc->prpl->add_buddy( a->ic, cmd[2], NULL );
+                a->prpl->add_buddy( a->ic, cmd[2], NULL );
         else
                 /* Only for add -tmp. For regular adds, this callback will