Changeset efcd223 for lib/BarnOwl/Module/Twitter.pm

Timestamp:

Jul 22, 2009, 8:39:21 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:

a8a0b0a

Parents:

1c45137

Message:

Some code cleanup.

Refactor finding a named account into a find_account function, and set
defaults for config options initially, which lets us remove 'exists'
calls everywhere.

File:

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

lib/BarnOwl/Module/Twitter.pm

@@ -18 +18 @@
 use Net::Twitter;
 use JSON;
+use List::Util qw(first);
 
 use BarnOwl;
@@ -123 +124 @@
     }
     push @twitter_handles, $twitter_handle;
-    $default_handle = $twitter_handle if (!defined $twitter_handle && exists $cfg->{default_sender} && $cfg->{default_sender});
+}
+
+$default_handle = first {$_->{cfg}->{default_sender}} @twitter_handles;
+if (!$default_handle && @twitter_handles) {
+    $default_handle = $twitter_handles[0];
 }
 
@@ -141 +146 @@
        && $m->auth eq 'YES') {
         for my $handle (@twitter_handles) {
-            $handle->twitter($m->body) if (!exists $handle->{cfg}->{publish_tweets} || $handle->{cfg}->{publish_tweets});
+            $handle->twitter($m->body) if $handle->{cfg}->{publish_tweets};
         }
     }
@@ -152 +157 @@
     $next_service_to_poll = ($next_service_to_poll + 1) % scalar(@twitter_handles);
     
-    $handle->poll_twitter() if (!exists $handle->{cfg}->{poll_for_tweets} || $handle->{cfg}->{poll_for_tweets});
-    $handle->poll_direct() if (!exists $handle->{cfg}->{poll_for_dms} || $handle->{cfg}->{poll_for_dms});
+    $handle->poll_twitter() if $handle->{cfg}->{poll_for_tweets};
+    $handle->poll_direct() if $handle->{cfg}->{poll_for_dms};
+}
+
+sub find_account {
+    my $name = shift;
+    my $handle = first {$_->{cfg}->{account_nickname} eq $name} @twitter_handles;
+    if ($handle) {
+        return $handle;
+    } else {
+        die("No such Twitter account: $name\n");
+    }
 }
 
@@ -161 +176 @@
     my $sent = 0;
     if (defined $account) {
-        for my $handle (@twitter_handles) {
-            if (defined $handle->{cfg}->{account_nickname} && $account eq $handle->{cfg}->{account_nickname}) {
-                $handle->twitter(@_);
-                $sent = 1;
-                last;
-            }
-        }
-        BarnOwl::message("No Twitter account named " . $account) unless $sent == 1
+        my $handle = find_account($account);
+        $handle->twitter(@_);
     } 
     else {
         # broadcast
         for my $handle (@twitter_handles) {
-            $handle->twitter(@_) if (!exists $handle->{cfg}->{publish_tweets} || $handle->{cfg}->{publish_tweets});
+            $handle->twitter(@_) if $handle->{cfg}->{publish_tweets};
         }
     }
@@ -183 +192 @@
     my $sent = 0;
     if (defined $account) {
-        for my $handle (@twitter_handles) {
-            if (defined $handle->{cfg}->{account_nickname} && $account eq $handle->{cfg}->{account_nickname}) {
-                $handle->twitter_direct(@_);
-                $sent = 1;
-                last;
-            }
-        }
-        BarnOwl::message("No Twitter account named " . $account) unless $sent == 1
-    }
-    elsif (defined $default_handle) {
+        my $handle = find_account($account);
+        $handle->twitter_direct(@_);
+    } elsif (defined $default_handle) {
         $default_handle->twitter_direct(@_);
     }
@@ -205 +207 @@
     my $sent = 0;
     if (defined $account) {
-        for my $handle (@twitter_handles) {
-            if (defined $handle->{cfg}->{account_nickname} && $account eq $handle->{cfg}->{account_nickname}) {
-                $handle->twitter_atreply(@_);
-                $sent = 1;
-                last;
-            }
-        }
-        BarnOwl::message("No Twitter account named " . $account) unless $sent == 1
+        my $handle = find_account($account);
+        $handle->twitter_atreply(@_);
     }
     elsif (defined $default_handle) {