Fix autologin with oauth (when no passwords are set)

[twirssi-net-twitter-lite.git] / twirssi.pl

diff --git a/twirssi.pl b/twirssi.pl
index c5384cfccaaccd50c4edbd47f9bffaed170fdff1..001b18240dadc2e37bb9844814f2920b55395a4d 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -600,21 +600,21 @@ sub cmd_oauth {
 
     my $store_file = Irssi::settings_get_str("twirssi_oauth_store");
     if ($store_file) {
-        my %store;
+        my @store;
         if ( open( OAUTH, $store_file ) ) {
             while (<OAUTH>) {
                 chomp;
-                my ( $k, $v ) = split ' ', 2;
-                $store{$k} = $v;
+                next if /$key/i;
+                push @store, $_;
             }
             close OAUTH;
 
         }
 
-        $store{$key} = "$access_token $access_token_secret";
+        push @store, "$key $access_token $access_token_secret";
 
         if ( open( OAUTH, ">$store_file.new" ) ) {
-            print OAUTH "$_ $store{$_}\n" foreach keys %store;
+            print OAUTH "$_\n" foreach @store;
             close OAUTH;
             rename "$store_file.new", $store_file
               or &notice("Failed to rename $store_file.new: $!");
@@ -2002,9 +2002,7 @@ if ($window) {
         }
     }
 
-    if (    my $autouser = Irssi::settings_get_str("twitter_usernames")
-        and my $autopass = Irssi::settings_get_str("twitter_passwords") )
-    {
+    if ( my $autouser = Irssi::settings_get_str("twitter_usernames") ) {
         &cmd_login();
         &get_updates;
     }