Changeset 118d800

Timestamp:

Oct 29, 2009, 10:19:55 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:

c78d06f

Parents:

7ec65f5

Message:

Use a longer timeout for interactive commands.

Normally, we crank the timeout on HTTP requests way down, in order to
prevent Twitter from hanging barnowl's UI. For user-triggered
requests, however, it is probably slightly more acceptable to hang the
UI for a second or two than to fail just because Twitter is being
slightly slow.

File:

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

lib/BarnOwl/Module/Twitter/Handle.pm

@@ -93 +93 @@
 
     return $self;
+}
+
+=head2 twitter_command COMMAND ARGS...
+
+Call the specified method on $self->{twitter} with an extended
+timeout. This is intended for interactive commands, with the theory
+that if the user explicitly requested an action, it is slightly more
+acceptable to hang the UI for a second or two than to fail just
+because Twitter is being slightly slow. Polling commands should be
+called normally, with the default (short) timeout, to prevent
+background Twitter suckage from hosing the UI normally.
+
+=cut
+
+sub twitter_command {
+    my $self = shift;
+    my $cmd = shift;
+
+    eval { $self->{twitter}->{ua}->timeout(5); };
+    my $result = eval {
+        $self->{twitter}->$cmd(@_);
+    };
+    my $error = $@;
+    eval { $self->{twitter}->{ua}->timeout(1); };
+    if ($error) {
+        die($error);
+    }
+    return $result;
 }
 
@@ -218 +246 @@
             die("Twitter: Message over 140 characters long.\n");
         }
-        if(defined($reply_to)) {
-            $self->{twitter}->update({
-                status => $msg,
-                in_reply_to_status_id => $reply_to
-               });
-        } else {
-            $self->{twitter}->update($msg);
-        }
+        $self->twitter_command('update', {
+            status => $msg,
+            defined($reply_to) ? (in_reply_to_status_id => $reply_to) : ()
+           });
     }
 }
@@ -235 +259 @@
     my $msg = shift;
     if(defined $self->{twitter}) {
-        $self->{twitter}->new_direct_message({
+        $self->twitter_command('new_direct_message', {
             user => $who,
             text => $msg
@@ -272 +296 @@
     my $who = shift;
 
-    my $user = $self->{twitter}->create_friend($who);
+    my $user = $self->twitter_command('create_friend', $who);
     # returns a string on error
     if (defined $user && !ref $user) {
@@ -286 +310 @@
     my $who = shift;
 
-    my $user = $self->{twitter}->destroy_friend($who);
+    my $user = $self->twitter_command('destroy_friend', $who);
     # returns a string on error
     if (defined $user && !ref $user) {