Changeset d88c92a

Timestamp:

2010-12-06T00:03:49Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d76e12f

Parents:

a429907

Message:

First bits of CTCP support to contacts. (Try /CTCP VERSION on a Jabber
contact.)

Files:

• irc_im.c (modified) (3 diffs)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (2 diffs)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/nogaim.h (modified) (3 diffs)

irc_im.c

@@ -276 +276 @@
         else
                 return FALSE;
+        
+        return TRUE;
+}
+
+static gboolean bee_irc_user_action_response( bee_t *bee, bee_user_t *bu, const char *action, char * const args[], void *data )
+{
+        irc_t *irc = (irc_t *) bee->ui_data;
+        GString *msg = g_string_new( "\001" );
+        
+        g_string_append( msg, action );
+        while( *args )
+        {
+                if( strchr( *args, ' ' ) )
+                        g_string_append_printf( msg, " \"%s\"", *args );
+                else
+                        g_string_append_printf( msg, " %s", *args );
+                args ++;
+        }
+        g_string_append_c( msg, '\001' );
+        
+        irc_send_msg( (irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL );
         
         return TRUE;
@@ -492 +513 @@
                 }
         }
+        else if( iu->bu && iu->bu->ic && iu->bu->ic->acc->prpl->buddy_action )
+        {
+                iu->bu->ic->acc->prpl->buddy_action( iu->bu, ctcp[0], ctcp + 1, NULL );
+        }
         
         return FALSE;
@@ -1041 +1066 @@
         bee_irc_user_msg,
         bee_irc_user_typing,
+        bee_irc_user_action_response,
         
         bee_irc_chat_new,

protocols/bee.h

@@ -111 +111 @@
         /* Flags currently defined (OPT_TYPING/THINKING) in nogaim.h. */
         gboolean (*user_typing)( bee_t *bee, bee_user_t *bu, guint32 flags );
+        /* CTCP-like stuff (buddy action) response */
+        gboolean (*user_action_response)( bee_t *bee, bee_user_t *bu, const char *action, char * const args[], void *data );
         
         /* Called at creation time. Don't show to the user until s/he is

protocols/bee_user.c

@@ -281 +281 @@
         }
 }
+
+void imcb_buddy_action_response( bee_user_t *bu, const char *action, char * const args[], void *data )
+{
+        if( bu->bee->ui->user_action_response )
+                bu->bee->ui->user_action_response( bu->bee, bu, action, args, data );
+}

protocols/jabber/iq.c

@@ -794 +794 @@
         return XT_HANDLED;
 }
+
+static xt_status jabber_iq_version_response( struct im_connection *ic,
+        struct xt_node *node, struct xt_node *orig );
+
+void jabber_iq_version_send( struct im_connection *ic, struct jabber_buddy *bud, void *data )
+{
+        struct xt_node *node, *query;
+        
+        node = xt_new_node( "query", NULL, NULL );
+        xt_add_attr( node, "xmlns", XMLNS_VERSION );
+        query = jabber_make_packet( "iq", "get", bud->full_jid, node );
+        jabber_cache_add( ic, query, jabber_iq_version_response );
+
+        jabber_write_packet( ic, query );
+}
+
+static xt_status jabber_iq_version_response( struct im_connection *ic,
+        struct xt_node *node, struct xt_node *orig )
+{
+        struct xt_node *query;
+        GString *rets;
+        char *s;
+        char *ret[2] = {};
+        bee_user_t *bu;
+        struct jabber_buddy *bud = NULL;
+        
+        if( ( s = xt_find_attr( node, "from" ) ) &&
+            ( bud = jabber_buddy_by_jid( ic, s, 0 ) ) &&
+            ( query = xt_find_node( node->children, "query" ) ) &&
+            ( bu = bee_user_by_handle( ic->bee, ic, bud->bare_jid ) ) )
+        {
+                rets = g_string_new( "Resource " );
+                g_string_append( rets, bud->resource );
+        }
+        else
+                return XT_HANDLED;
+        
+        for( query = query->children; query; query = query->next )
+                if( query->text_len > 0 )
+                        g_string_append_printf( rets, " %s: %s,", query->name, query->text );
+        
+        g_string_truncate( rets, rets->len - 1 );
+        ret[0] = rets->str;
+        imcb_buddy_action_response( bu, "VERSION", ret, NULL );
+        g_string_free( rets, TRUE );
+        
+        return XT_HANDLED;
+}

protocols/jabber/jabber.c

@@ -564 +564 @@
 }
 
+GList *jabber_buddy_action_list( bee_user_t *bu )
+{
+        static GList *ret = NULL;
+        
+        if( ret == NULL )
+        {
+                struct buddy_action ba[2] = {
+                        { "VERSION", "Get client (version) information" },
+                };
+                
+                ret = g_list_prepend( ret, ba + 0 );
+        }
+        
+        return ret;
+}
+
+void *jabber_buddy_action( struct bee_user *bu, const char *action, char * const args[], void *data )
+{
+        if( g_strcasecmp( action, "VERSION" ) == 0 )
+        {
+                struct jabber_buddy *bud;
+                
+                if( ( bud = jabber_buddy_by_ext_jid( bu->ic, bu->handle, 0 ) ) == NULL )
+                        bud = jabber_buddy_by_jid( bu->ic, bu->handle, GET_BUDDY_FIRST );
+                for( ; bud; bud = bud->next )
+                        jabber_iq_version_send( bu->ic, bud, data );
+        }
+        
+        return NULL;
+}
+
 void jabber_initmodule()
 {
@@ -591 +622 @@
         ret->handle_cmp = g_strcasecmp;
         ret->transfer_request = jabber_si_transfer_request;
+        ret->buddy_action_list = jabber_buddy_action_list;
+        ret->buddy_action = jabber_buddy_action;
 
         register_protocol( ret );

protocols/jabber/jabber.h

@@ -241 +241 @@
 xt_status jabber_iq_query_features( struct im_connection *ic, char *bare_jid );
 xt_status jabber_iq_query_server( struct im_connection *ic, char *jid, char *xmlns );
+void jabber_iq_version_send( struct im_connection *ic, struct jabber_buddy *bud, void *data );
 
 /* si.c */

protocols/nogaim.h

@@ -136 +136 @@
 };
 
+struct buddy_action {
+        char *name;
+        char *description;
+};
+
 struct prpl {
         int options;
@@ -257 +262 @@
         void (* buddy_data_free) (struct bee_user *bu);
         
+        GList *(* buddy_action_list) (struct bee_user *bu);
+        void *(* buddy_action) (struct bee_user *bu, const char *action, char * const args[], void *data);
+        
         /* Some placeholders so eventually older plugins may cooperate with newer BitlBees. */
         void *resv1;
@@ -316 +324 @@
 G_MODULE_EXPORT void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char *realname );
 G_MODULE_EXPORT void imcb_buddy_nick_hint( struct im_connection *ic, const char *handle, const char *nick );
+G_MODULE_EXPORT void imcb_buddy_action_response( bee_user_t *bu, const char *action, char * const args[], void *data );
 
 G_MODULE_EXPORT void imcb_buddy_typing( struct im_connection *ic, const char *handle, uint32_t flags );