Changeset 4022b68 for root_commands.c

Timestamp:

2010-08-21T22:42:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

fd424c8

Parents:

327af51 (diff), c00dd71 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline.

File:

• root_commands.c (modified) (7 diffs)

root_commands.c

@@ -100 +100 @@
 
 static void cmd_account( irc_t *irc, char **cmd );
+static void bitlbee_whatsnew( irc_t *irc );
 
 static void cmd_identify( irc_t *irc, char **cmd )
@@ -155 +156 @@
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set( irc, "+R", 1 );
+                
+                bitlbee_whatsnew( irc );
                 
                 /* The following code is a bit hairy now. With takeover
@@ -267 +270 @@
         if( ( val = set_getstr( head, key ) ) )
                 irc_usermsg( irc, "%s = `%s'", key, val );
+        else if( !set_find( head, key ) )
+        {
+                irc_usermsg( irc, "Setting `%s' does not exist.", key );
+                if( *head == irc->b->set )
+                        irc_usermsg( irc, "It might be an account or channel setting. "
+                                     "See \x02help account set\x02 and \x02help channel set\x02." );
+        }
         else
                 irc_usermsg( irc, "%s is empty", key );
@@ -304 +314 @@
                         st = set_setstr( head, set_name, value );
                 
-                if( set_getstr( head, set_name ) == NULL )
+                if( set_getstr( head, set_name ) == NULL &&
+                    set_find( head, set_name ) )
                 {
                         /* This happens when changing the passwd, for example.
@@ -328 +339 @@
                 while( s )
                 {
-                        cmd_showset( irc, &s, s->key );
+                        if( !( s->flags & SET_HIDDEN ) )
+                                cmd_showset( irc, &s, s->key );
                         s = s->next;
                 }
@@ -1008 +1020 @@
         irc_usermsg( irc, format, "Nick", "Handle/Account", "Status" );
         
-        if( strcmp( set_getstr( &irc->root->last_channel->set, "type" ), "control" ) != 0 )
+        if( irc->root->last_channel &&
+            strcmp( set_getstr( &irc->root->last_channel->set, "type" ), "control" ) != 0 )
                 irc->root->last_channel = NULL;
         
@@ -1271 +1284 @@
 }
 
+/* Maybe this should be a stand-alone command as well? */
+static void bitlbee_whatsnew( irc_t *irc )
+{
+        int last = set_getint( &irc->b->set, "last_version" );
+        GString *msg = g_string_new( "" );
+        char s[16];
+        
+        if( last >= BITLBEE_VERSION_CODE )
+                return;
+        
+        if( last < 0x010206 ) /* 1.2.6 */
+        {
+                g_string_append( msg,
+                        "Twitter support. See \x02help account add twitter\x02.\n" );
+        }
+        if( last < 0x010300 ) /* 1.3dev */
+        {
+                g_string_append( msg,
+                        "Support for multiple configurable control channels, "
+                        "each with a subset of your contact list. See "
+                        "\x02help channels\x02 for more information.\n"
+                        "File transfer support for some protocols (more if "
+                        "you use libpurple). Just /DCC SEND stuff. Incoming "
+                        "files also become DCC transfers.\n"
+                        "Many more things, briefly described in "
+                        "\x02help news1.3\x02.\n" );
+        }
+        
+        if( msg->len > 0 )
+                irc_usermsg( irc, "%s: This seems to be your first time using this "
+                                  "this version of BitlBee. Here's a list of new "
+                                  "features you may like to know about:\n\n%s\n",
+                                  irc->user->nick, msg->str );
+        
+        g_string_free( msg, TRUE );
+        g_snprintf( s, sizeof( s ), "%d", BITLBEE_VERSION_CODE );
+        set_setstr( &irc->b->set, "last_version", s );
+}
+
 /* IMPORTANT: Keep this list sorted! The short command logic needs that. */
 const command_t commands[] = {