Changeset ce199b7

Timestamp:

2011-12-21T11:21:04Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0dd6570

Parents:

e14b47b8

Message:

Make it easier to add OAuth-authenticated accounts without having to type
a bogus password.

Files:

• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/twitter/twitter.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• set.c (modified) (2 diffs)
• set.h (modified) (2 diffs)

protocols/jabber/jabber.c

@@ -61 +61 @@
         s = set_add( &acc->set, "activity_timeout", "600", set_eval_int, acc );
         
-        s = set_add( &acc->set, "oauth", "false", set_eval_bool, acc );
+        s = set_add( &acc->set, "oauth", "false", set_eval_oauth, acc );
 
         g_snprintf( str, sizeof( str ), "%d", jabber_port_list[0] );
@@ -76 +76 @@
         s = set_add( &acc->set, "resource_select", "activity", NULL, acc );
         
+        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
+        
         s = set_add( &acc->set, "server", NULL, set_eval_account, acc );
         s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
@@ -84 +87 @@
         s = set_add( &acc->set, "tls", "try", set_eval_tls, acc );
         s->flags |= ACC_SET_OFFLINE_ONLY;
-        
-        s = set_add( &acc->set, "sasl", "true", set_eval_bool, acc );
-        s->flags |= ACC_SET_OFFLINE_ONLY | SET_HIDDEN_DEFAULT;
 
         s = set_add( &acc->set, "user_agent", "BitlBee", NULL, acc );

protocols/twitter/twitter.c

@@ -240 +240 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
+        s = set_add(&acc->set, "oauth", def_oauth, set_eval_oauth, acc);
+
         s = set_add(&acc->set, "show_ids", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
         s = set_add(&acc->set, "show_old_mentions", "true", set_eval_bool, acc);
-
-        s = set_add(&acc->set, "oauth", def_oauth, set_eval_bool, acc);
 }
 

root_commands.c

@@ -443 +443 @@
                 }
                 
-                irc_rootmsg( irc, "Account successfully added with tag %s%s",
-                             a->tag, cmd[4] ? "" :
-                             ", now use /OPER to enter the password" );
+                irc_rootmsg( irc, "Account successfully added with tag %s", a->tag );
+                
+                if( cmd[4] == NULL )
+                {
+                        set_t *oauth = set_find( &a->set, "oauth" );
+                        if( oauth && bool2int( set_value( oauth ) ) )
+                        {
+                                *a->pass = '\0';
+                                irc_rootmsg( irc, "No need to enter a password for this "
+                                             "account since it's using OAuth" );
+                        }
+                        else
+                        {
+                                irc_rootmsg( irc, "You can now use the /OPER command to "
+                                             "enter the password" );
+                                if( oauth )
+                                        irc_rootmsg( irc, "Alternatively, enable oauth if "
+                                                     "the account supports it: account %s "
+                                                     "set oauth on", a->tag );
+                        }
+                }
                 
                 return;

set.c

@@ -85 +85 @@
                 return NULL;
         
-        return s->value ? s->value : s->def;
+        return set_value( s );
 }
 
@@ -250 +250 @@
 }
 
-/*
-char *set_eval_ops( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        
-        if( g_strcasecmp( value, "user" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "+o-o", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "root" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "-o+o", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "both" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "+oo", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "none" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "-oo", irc->nick, irc->mynick );
-        else
-                return SET_INVALID;
-        
-        return value;
-}
-*/
+char *set_eval_oauth( set_t *set, char *value )
+{
+        account_t *acc = set->data;
+        
+        if( bool2int( value ) && strcmp( acc->pass, PASSWORD_PENDING ) == 0 )
+                *acc->pass = '\0';
+        
+        return set_eval_bool( set, value );
+}

set.h

@@ -77 +77 @@
 } set_t;
 
+#define set_value( set ) ((set)->value) ? ((set)->value) : ((set)->def)
+
 /* Should be pretty clear. */
 set_t *set_add( set_t **head, const char *key, const char *def, set_eval eval, void *data );
@@ -111 +113 @@
 /* Some not very generic evaluators that really shouldn't be here... */
 char *set_eval_to_char( set_t *set, char *value );
-char *set_eval_ops( set_t *set, char *value );
+char *set_eval_oauth( set_t *set, char *value );
 
 #endif /* __SET_H__ */