From: Dan Boger Date: Thu, 8 Jan 2009 22:18:04 +0000 (-0800) Subject: 1.7.3 - r353 - Refactor a lot of the duplicated code into subs X-Git-Url: https://git.sommitrealweird.co.uk//gitweb/?p=twirssi-net-twitter-lite.git;a=commitdiff_plain;h=ba48424a621abb05eb7219d01cdac67e2f474b9d 1.7.3 - r353 - Refactor a lot of the duplicated code into subs --- diff --git a/twirssi.pl b/twirssi.pl index b7e1767..46d2e2c 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -19,7 +19,7 @@ BEGIN { use vars qw($VERSION %IRSSI); $VERSION = "1.7.3"; -my ($REV) = '$Rev: 352 $' =~ /(\d+)/; +my ($REV) = '$Rev: 353 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -28,7 +28,7 @@ my ($REV) = '$Rev: 352 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://tinyurl.com/twirssi', - changed => '$Date: 2009-01-08 13:46:50 -0800 (Thu, 08 Jan 2009) $', + changed => '$Date: 2009-01-08 14:17:30 -0800 (Thu, 08 Jan 2009) $', ); my $window; @@ -45,10 +45,7 @@ my %id_map; sub cmd_direct { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); my ( $target, $text ) = split ' ', $data, 2; unless ( $target and $text ) { @@ -62,10 +59,7 @@ sub cmd_direct { sub cmd_direct_as { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); my ( $username, $target, $text ) = split ' ', $data, 3; unless ( $username and $target and $text ) { @@ -73,10 +67,7 @@ sub cmd_direct_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); eval { unless ( $twits{$username} @@ -99,10 +90,7 @@ sub cmd_direct_as { sub cmd_tweet { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; unless ($data) { @@ -116,10 +104,7 @@ sub cmd_tweet { sub cmd_tweet_as { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; my ( $username, $data ) = split ' ', $data, 2; @@ -129,10 +114,7 @@ sub cmd_tweet_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); if ( Irssi::settings_get_str("short_url_provider") ) { foreach my $url ( $data =~ /(https?:\/\/\S+[\w\/])/g ) { @@ -143,11 +125,7 @@ sub cmd_tweet_as { } } - if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); - return; - } + return if &too_long($data); eval { unless ( $twits{$username}->update($data) ) @@ -166,21 +144,7 @@ sub cmd_tweet_as { $nicks{$1} = time; } - my $away = 0; - if ( Irssi::settings_get_bool("tweet_to_away") - and $data !~ /\@\w/ - and $data !~ /^[dD] / ) - { - my $server = - Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") ); - if ($server) { - $server->send_raw("away :$data"); - $away = 1; - } else { - ¬ice( "Can't find bitlbee server.", - "Update bitlbee_server or disable tweet_to_away" ); - } - } + my $away = &update_away($data); ¬ice( "Update sent" . ( $away ? " (and away msg set)" : "" ) ); } @@ -188,10 +152,7 @@ sub cmd_tweet_as { sub cmd_reply { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; unless ($data) { @@ -219,10 +180,7 @@ sub cmd_reply_as { return; } - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; my ( $username, $id, $data ) = split ' ', $data, 3; @@ -232,10 +190,7 @@ sub cmd_reply_as { return; } - unless ( exists $twits{$username} ) { - ¬ice("Unknown username $username"); - return; - } + return unless &valid_username($username); my $nick; $id =~ s/[^\w\d\-:]+//g; @@ -264,11 +219,7 @@ sub cmd_reply_as { } } - if ( length $data > 140 ) { - ¬ice( - "Tweet too long (" . length($data) . " characters) - aborted" ); - return; - } + return if &too_long($data); eval { unless ( @@ -294,21 +245,7 @@ sub cmd_reply_as { $nicks{$1} = time; } - my $away = 0; - if ( Irssi::settings_get_bool("tweet_to_away") - and $data !~ /\@\w/ - and $data !~ /^[dD] / ) - { - my $server = - Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") ); - if ($server) { - $server->send_raw("away :$data"); - $away = 1; - } else { - ¬ice( "Can't find bitlbee server.", - "Update bitlbee_server or disalbe tweet_to_away" ); - } - } + my $away = &update_away($data); ¬ice( "Update sent" . ( $away ? " (and away msg set)" : "" ) ); } @@ -319,10 +256,7 @@ sub gen_cmd { return sub { my ( $data, $server, $win ) = @_; - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + return unless &logged_in($twit); $data =~ s/^\s+|\s+$//; unless ($data) { @@ -364,12 +298,12 @@ sub cmd_logout { my ( $data, $server, $win ) = @_; $data =~ s/^\s+|\s+$//g; - if ( $data and exists $twits{$data} ) { + return unless &valid_username($data); + + if ($data) { ¬ice("Logging out $data..."); $twits{$data}->end_session(); delete $twits{$data}; - } elsif ($data) { - ¬ice("Unknown username '$data'"); } else { ¬ice("Logging out $user..."); $twit->end_session(); @@ -605,10 +539,8 @@ sub get_updates { . Irssi::settings_get_str('twitter_window') . "'. Create it or change the value of twitter_window" ); } - unless ($twit) { - ¬ice("Not logged in! Use /twitter_login username pass!"); - return; - } + + return unless &logged_in($twit); my ( $fh, $filename ) = File::Temp::tempfile(); my $pid = fork(); @@ -694,7 +626,7 @@ sub do_updates { $nicks{ $t->{in_reply_to_screen_name} } = time; my $context; eval { - $context = $obj->show_status( $t->{in_reply_to_status_id} ); + $context = $obj->show_status( $t->{in_reply_to_status_id} ); }; if ($context) { @@ -708,7 +640,8 @@ sub do_updates { } elsif ($@) { print $fh "type:debug request to get context failed: $@"; } else { - print $fh "type:debug Failed to get context from $t->{in_reply_to_screen_name}" + print $fh +"type:debug Failed to get context from $t->{in_reply_to_screen_name}" if &debug; } } @@ -886,6 +819,61 @@ sub notice { $window->print( "%R***%n @_", MSGLEVEL_PUBLIC ); } +sub update_away { + my $data = shift; + + if ( Irssi::settings_get_bool("tweet_to_away") + and $data !~ /\@\w/ + and $data !~ /^[dD] / ) + { + my $server = + Irssi::server_find_tag( Irssi::settings_get_str("bitlbee_server") ); + if ($server) { + $server->send_raw("away :$data"); + return 1; + } else { + ¬ice( "Can't find bitlbee server.", + "Update bitlbee_server or disable tweet_to_away" ); + return 0; + } + } + + return 0; +} + +sub too_long { + my $data = shift; + + if ( length $data > 140 ) { + ¬ice( + "Tweet too long (" . length($data) . " characters) - aborted" ); + return 1; + } + + return 0; +} + +sub valid_username { + my $username = shift; + + unless ( exists $twits{$username} ) { + ¬ice("Unknown username $username"); + return 0; + } + + return 1; +} + +sub logged_in { + my $obj = shift; + unless ($obj) { + ¬ice("Not logged in! Use /twitter_login username pass!"); + return 0; + } + + return 1; +} + sub sig_complete { my ( $complist, $window, $word, $linestart, $want_space ) = @_;