Changeset a97a336

Timestamp:

2010-12-07T23:14:30Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

83f1bd1d

Parents:

d76e12f

Message:

Add CTCP HELP code. Also cleaning up some noop handlers in the Twitter
module (chat_with and send_typing) that suggested support for features
that obviously don't exist.

Files:

• irc_im.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (4 diffs)

irc_im.c

@@ -513 +513 @@
                 }
         }
+        else if( g_strcasecmp( ctcp[0], "HELP" ) == 0 && iu->bu )
+        {
+                GString *supp = g_string_new( "Supported CTCPs:" );
+                GList *l;
+                
+                if( iu->bu->ic && iu->bu->ic->acc->prpl->transfer_request )
+                        g_string_append( supp, " DCC SEND," );
+                if( iu->bu->ic && iu->bu->ic->acc->prpl->send_typing )
+                        g_string_append( supp, " TYPING," );
+                if( iu->bu->ic->acc->prpl->buddy_action_list )
+                        for( l = iu->bu->ic->acc->prpl->buddy_action_list( iu->bu ); l; l = l->next )
+                        {
+                                struct buddy_action *ba = l->data;
+                                g_string_append_printf( supp, " %s (%s),",
+                                                        ba->name, ba->description );
+                        }
+                g_string_truncate( supp, supp->len - 1 );
+                irc_send_msg_f( iu, "NOTICE", iu->irc->user->nick, "\001HELP %s\001", supp->str );
+                g_string_free( supp, TRUE );
+        }
         else if( iu->bu && iu->bu->ic && iu->bu->ic->acc->prpl->buddy_action )
         {

protocols/jabber/jabber.c

@@ -570 +570 @@
         if( ret == NULL )
         {
-                struct buddy_action ba[2] = {
+                static const struct buddy_action ba[2] = {
                         { "VERSION", "Get client (version) information" },
                 };
                 
-                ret = g_list_prepend( ret, ba + 0 );
+                ret = g_list_prepend( ret, (void*) ba + 0 );
         }
         

protocols/twitter/twitter.c

@@ -377 +377 @@
 }
 
-static struct groupchat *twitter_chat_with( struct im_connection *ic, char *who )
-{
-        return NULL;
-}
-
 static void twitter_keepalive( struct im_connection *ic )
 {
@@ -400 +395 @@
 static void twitter_rem_deny( struct im_connection *ic, char *who )
 {
-}
-
-static int twitter_send_typing( struct im_connection *ic, char *who, int typing )
-{
-        return( 1 );
 }
 
@@ -552 +542 @@
         ret->chat_invite = twitter_chat_invite;
         ret->chat_leave = twitter_chat_leave;
-        ret->chat_with = twitter_chat_with;
         ret->keepalive = twitter_keepalive;
         ret->add_permit = twitter_add_permit;
@@ -558 +547 @@
         ret->add_deny = twitter_add_deny;
         ret->rem_deny = twitter_rem_deny;
-        ret->send_typing = twitter_send_typing;
         ret->buddy_data_add = twitter_buddy_data_add;
         ret->buddy_data_free = twitter_buddy_data_free;