use vars qw($VERSION %IRSSI);
-$VERSION = "1.7.2";
-my ($REV) = '$Rev: 351 $' =~ /(\d+)/;
+$VERSION = "1.7.3";
+my ($REV) = '$Rev: 354 $' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://tinyurl.com/twirssi',
- changed => '$Date: 2009-01-06 19:33:41 -0800 (Tue, 06 Jan 2009) $',
+ changed => '$Date: 2009-01-08 14:46:04 -0800 (Thu, 08 Jan 2009) $',
);
my $window;
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 ) {
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 ) {
return;
}
- unless ( exists $twits{$username} ) {
- ¬ice("Unknown username $username");
- return;
- }
+ return unless &valid_username($username);
eval {
unless ( $twits{$username}
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) {
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;
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 ) {
}
}
- if ( length $data > 140 ) {
- ¬ice(
- "Tweet too long (" . length($data) . " characters) - aborted" );
- return;
- }
+ return if &too_long($data);
eval {
unless ( $twits{$username}->update($data) )
$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)" : "" ) );
}
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) {
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;
return;
}
- unless ( exists $twits{$username} ) {
- ¬ice("Unknown username $username");
- return;
- }
+ return unless &valid_username($username);
my $nick;
$id =~ s/[^\w\d\-:]+//g;
}
}
- if ( length $data > 140 ) {
- ¬ice(
- "Tweet too long (" . length($data) . " characters) - aborted" );
- return;
- }
+ return if &too_long($data);
eval {
unless (
$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)" : "" ) );
}
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) {
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();
};
if ($@) {
- print $fh "type:error Error during friends list update. Aborted.\n";
+ print $fh "type:debug Error during friends list update. Aborted.\n";
return;
}
. 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();
}
if ($error) {
- print $fh "type:error Update encountered errors. Aborted\n";
+ print $fh "type:debug Update encountered errors. Aborted\n";
print $fh $last_poll;
} else {
print $fh $new_poll;
};
if ($@) {
- print $fh "type:error Error during friends_timeline call. Aborted.\n";
+ print $fh "type:debug Error during friends_timeline call. Aborted.\n";
return 1;
}
unless ( ref $tweets ) {
if ( $obj->can("get_error") ) {
- print $fh "type:error API Error during friends_timeline call: ",
+ print $fh "type:debug API Error during friends_timeline call: ",
JSON::Any->jsonToObj( $obj->get_error() ), " Aborted.\n";
} else {
print $fh
- "type:error API Error during friends_timeline call. Aborted.\n";
+ "type:debug API Error during friends_timeline call. Aborted.\n";
}
return 1;
}
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text =~ s/%/%%/g;
- $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+ $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
+ $text =~ s/[\n\r]/ /g;
my $reply = "tweet";
if ( Irssi::settings_get_bool("show_reply_context")
and $t->{in_reply_to_screen_name} ne $username
and not exists $friends{ $t->{in_reply_to_screen_name} } )
{
$nicks{ $t->{in_reply_to_screen_name} } = time;
- my $context = $obj->show_status( $t->{in_reply_to_status_id} );
+ my $context;
+ eval {
+ $context = $obj->show_status( $t->{in_reply_to_status_id} );
+ };
+
if ($context) {
my $ctext = decode_entities( $context->{text} );
- $ctext =~ s/%/%%/g;
- $ctext =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+ $ctext =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
+ $ctext =~ s/[\n\r]/ /g;
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
$reply = "reply";
+ } elsif ($@) {
+ print $fh "type:debug request to get context failed: $@";
} else {
- print "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;
}
}
};
if ($@) {
- print $fh "type:error Error during replies call. Aborted.\n";
+ print $fh "type:debug Error during replies call. Aborted.\n";
return 1;
}
if exists $friends{ $t->{user}{screen_name} };
my $text = decode_entities( $t->{text} );
- $text =~ s/%/%%/g;
- $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+ $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
+ $text =~ s/[\n\r]/ /g;
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
}
};
if ($@) {
- print $fh "type:error Error during direct_messages call. Aborted.\n";
+ print $fh "type:debug Error during direct_messages call. Aborted.\n";
return 1;
}
foreach my $t ( reverse @$tweets ) {
my $text = decode_entities( $t->{text} );
- $text =~ s/%/%%/g;
- $text =~ s/(^|\W)\@([-\w]+)/$1%B\@$2%n/g;
+ $text =~ s/(^|\W)\@([-\w]+)/$1\cC12\@$2\cC/g;
+ $text =~ s/[\n\r]/ /g;
printf $fh "id:%d account:%s nick:%s type:dm %s\n",
$t->{id}, $username, $t->{sender_screen_name}, $text;
}
}
if ( $meta{type} eq 'tweet' ) {
- push @lines, "[$account%B\@$meta{nick}%n$marker] $_\n",;
+ $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_tweet',
+ $account, $meta{nick}, $marker, $_);
} elsif ( $meta{type} eq 'reply' ) {
- push @lines, "[$account\\--> %B\@$meta{nick}%n$marker] $_\n",;
+ $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_reply',
+ $account, $meta{nick}, $marker, $_);
} elsif ( $meta{type} eq 'dm' ) {
- push @lines, "[$account%B\@$meta{nick}%n (%WDM%n)] $_\n",;
+ $window->printformat(MSGLEVEL_PUBLIC, 'twirssi_dm',
+ $account, $meta{nick}, $_);
} elsif ( $meta{type} eq 'error' ) {
- push @lines, "ERROR: $_\n";
+ $window->print("ERROR: $_", MSGLEVEL_PUBLIC);
} elsif ( $meta{type} eq 'debug' ) {
print "$_" if &debug,;
} else {
if ($new_last_poll) {
print "new last_poll = $new_last_poll" if &debug;
- foreach my $line (@lines) {
- chomp $line;
- $window->print( $line, MSGLEVEL_PUBLIC );
- foreach ( $line =~ /\@([-\w]+)/ ) {
- $nicks{$1} = time;
- }
- }
close FILE;
unlink $filename
$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 ) = @_;
}
}
+sub event_send_text {
+ my ( $line, $server, $win ) = @_;
+ my $awin = Irssi::active_win();
+
+ # if the window where we got our text was the twitter window, and the user
+ # wants to be lazy, tweet away!
+ if ( ($awin->get_active_name() eq $window->{name})
+ and Irssi::settings_get_bool("tweet_window_input") ) {
+ &cmd_tweet($line, $server, $win);
+ }
+}
+
+Irssi::signal_add( "send text", "event_send_text" );
+
+Irssi::theme_register([
+ 'twirssi_tweet', '[$0%B@$1%n$2] $3',
+ 'twirssi_reply', '[$0\--> %B@$1%n$2] $3',
+ 'twirssi_dm', '[$0%B@$1%n (%WDM%n)] $2',
+]);
+
Irssi::settings_add_str( "twirssi", "twitter_window", "twitter" );
Irssi::settings_add_str( "twirssi", "bitlbee_server", "bitlbee" );
Irssi::settings_add_str( "twirssi", "short_url_provider", "TinyURL" );
Irssi::settings_add_bool( "twirssi", "twirssi_first_run", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 1 );
Irssi::settings_add_bool( "twirssi", "twirssi_use_reply_aliases", 0 );
+Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
if ($window) {
projects / twirssi-net-twitter-lite.git / blobdiff