Changeset 8462b38

Timestamp:

Aug 15, 2009, 2:32:16 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:

385dd69

Parents:

4bd9327

Message:

Replace do_with_default_account with find_account_default

Remove the twitter_FOO helpers in Twitter.pm, since the extra layer of
indirection doesn't seem to gain us anything and is somewhat confusing,
and make the cmd_FOO subs lookup the accout with find_account_default.

Note that at startup, we always set the $default_handle, so there's no
need to fall back to $twitter_handles[0].

Location:

lib/BarnOwl/Module

Files:

• Twitter.pm (modified) (6 diffs)
• Twitter/Handle.pm (modified) (1 diff)

lib/BarnOwl/Module/Twitter.pm

@@ -171 +171 @@
 }
 
+sub find_account_default {
+    my $name = shift;
+    if(defined($name)) {
+        return find_account($name);
+    } else {
+        return $default_handle;
+    }
+}
+
 sub twitter {
     my $account = shift;
@@ -187 +196 @@
 }
 
-# do_for_default_account( SUB( HANDLE, ARGS...), ACCOUNT, ARGS... )
-sub do_for_default_account {
-    my $lambda = shift;
-    die ("do_for_default_account has nothing to do") unless defined $lambda && ref($lambda) eq 'CODE';
-    my $account = shift;
-
-    if (defined $account) {
-        my $handle = find_account($account);
-        $lambda->($handle, @_);
-    } elsif (defined $default_handle) {
-        $lambda->($default_handle, @_);
-    }
-    else {
-        $lambda->($twitter_handles[0], @_);
-    }
-}
-
-sub twitter_direct {
-    my $account = shift;
-    do_for_default_account( sub { my $handle = shift; $handle->twitter_direct(@_); }, $account, @_);
-}
-
-sub twitter_atreply {
-    my $account = shift;
-    do_for_default_account( sub { my $handle = shift; $handle->twitter_atreply(@_); }, $account, @_);
-}
-
-sub twitter_follow {
-    my $account = shift;
-    do_for_default_account( sub { my $handle = shift; $handle->twitter_follow(@_); }, $account, @_);
-}
-
-sub twitter_unfollow {
-    my $account = shift;
-    do_for_default_account( sub { my $handle = shift; $handle->twitter_unfollow(@_); }, $account, @_);
-}
-
 BarnOwl::new_command(twitter => \&cmd_twitter, {
     summary     => 'Update Twitter from BarnOwl',
@@ -283 +255 @@
     my $user = shift;
     die("Usage: $cmd USER\n") unless $user;
-    my $account = shift;
-    BarnOwl::start_edit_win("$cmd $user" . (defined $account ? " $account" : ""), sub{twitter_direct($account, $user, shift)});
+    my $account = find_account_default(shift);
+    BarnOwl::start_edit_win("$cmd $user " . ($account->nickname||""),
+                            sub { $account->twitter_direct($user, shift) });
 }
 
@@ -291 +264 @@
     my $user = shift || die("Usage: $cmd USER [In-Reply-To ID]\n");
     my $id   = shift;
-    my $account = shift;
-    BarnOwl::start_edit_win("Reply to \@" . $user . (defined $account ? " on $account" : ""), sub { twitter_atreply($account, $user, $id, shift) });
+    my $account = find_account_default(shift);
+
+    BarnOwl::start_edit_win("Reply to \@" . $user . ($account->nickname ? (" on " . $account->nickname) : ""),
+                            sub { $account->twitter_atreply($user, $id, shift) });
 }
 
@@ -300 +275 @@
     die("Usage: $cmd USER\n") unless $user;
     my $account = shift;
-    twitter_follow($account, $user);
+    find_account_default($account)->twitter_follow($user);
 }
 
@@ -308 +283 @@
     die("Usage: $cmd USER\n") unless $user;
     my $account = shift;
-    twitter_unfollow($account, $user);
+    find_account_default($account)->twitter_unfollow($user);
 }
 

lib/BarnOwl/Module/Twitter/Handle.pm

@@ -280 +280 @@
 }
 
+sub nickname {
+    my $self = shift;
+    return $self->{cfg}->{account_nickname};
+}
+
 1;