Changeset 9bedca0

Timestamp:

Jul 4, 2008, 2:08:25 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

df6d9af

Parents:

1c24c69

Message:

ttants: $@, $!, @!
Make error checking actually work

File:

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

lib/BarnOwl/Module/Twitter.pm

@@ -20 +20 @@
 use BarnOwl::Hooks;
 
-sub fail {
-    my $msg = shift;
-    BarnOwl::admin_message('Twitter Error', $msg);
-    die("Twitter Error: $msg\n");
-}
-
+my $twitter;
 my $user     = BarnOwl::zephyr_getsender();
 my ($class)  = ($user =~ /(^[^@]+)/);
 my $instance = "status";
 my $opcode   = "twitter";
+
+sub fail {
+    my $msg = shift;
+    undef $twitter;
+    BarnOwl::admin_message('Twitter Error', $msg);
+    die("Twitter Error: $msg\n");
+}
 
 # Don't redefine variables if they already exist
@@ -70 +72 @@
     $cfg = from_json($cfg);
 };
-if(@!) {
-    fail("Unable to parse ~/.owl/twitter: @!");
+if($@) {
+    fail("Unable to parse ~/.owl/twitter: $@");
 }
 
-my $twitter  = Net::Twitter->new(username   => $cfg->{user} || $user,
-                                 password   => $cfg->{password},
-                                 clientname => 'BarnOwl');
+$twitter  = Net::Twitter->new(username   => $cfg->{user} || $user,
+                              password   => $cfg->{password},
+                              clientname => 'BarnOwl');
 
 if(!defined($twitter->verify_credentials())) {
@@ -102 +104 @@
 sub twitter {
     my $msg = shift;
-    $twitter->update($msg);
+    if(defined $twitter) {
+        $twitter->update($msg);
+    }
 }