Changeset 7430aa4 for lib

Timestamp:

Jul 21, 2009, 9:46:50 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

d748296

Parents:

159aaad

Message:

Fix error handling for incorrect credentials.

File:

• lib/BarnOwl/Module/Twitter/Handle.pm (modified) (3 diffs)

lib/BarnOwl/Module/Twitter/Handle.pm

@@ -19 +19 @@
 use BarnOwl;
 use BarnOwl::Message::Twitter;
+
 sub fail {
     my $self = shift;
     my $msg = shift;
     undef $self->{twitter};
-    BarnOwl::admin_message('Twitter Error', $msg);
-    die("Twitter Error: $msg\n");
+    my $nickname = $self->{cfg}->{account_nickname} || "";
+    die("[Twitter $nickname] Error: $msg\n");
 }
 
@@ -37 +38 @@
     my $cfg = shift;
 
-    my %obj = (
+    my $self = {
         'user' => undef,
         'cfg'  => $cfg,
@@ -45 +46 @@
         'last_id' => undef,
         'last_direct' => undef,
-    );
+    };
+
+    bless($self, $class);
 
     my %twitter_args = @_;
 
-    $obj{twitter}  = Net::Twitter->new(%twitter_args);
-
-    if(!defined($obj{twitter}->verify_credentials())) {
-        fail("Invalid twitter credentials");
-    }
-
-    unless(defined($obj{last_id})) {
+    $self->{twitter}  = Net::Twitter->new(%twitter_args);
+
+    if(!defined($self->{twitter}->verify_credentials())) {
+        $self->fail("Invalid credentials");
+    }
+
+    unless(defined($self->{last_id})) {
         eval {
-            $obj{last_id} = $obj{twitter}->friends_timeline({count => 1})->[0]{id};
+            $self->{last_id} = $self->{twitter}->friends_timeline({count => 1})->[0]{id};
         };
-        $obj{last_id} = 0 unless defined($obj{last_id});
-    }
-
-    unless(defined($obj{last_direct})) {
+        $self->{last_id} = 0 unless defined($self->{last_id});
+    }
+
+    unless(defined($self->{last_direct})) {
         eval {
-            $obj{last_direct} = $obj{twitter}->direct_messages()->[0]{id};
+            $self->{last_direct} = $self->{twitter}->direct_messages()->[0]{id};
         };
-        $obj{last_direct} = 0 unless defined($obj{last_direct});
+        $self->{last_direct} = 0 unless defined($self->{last_direct});
     }
 
     eval {
-        $obj{twitter}->{ua}->timeout(1);
-    };
-
-    return bless {%obj}, $class;
-
+        $self->{twitter}->{ua}->timeout(1);
+    };
+
+    return $self;
 }