From: Dan Boger Date: Mon, 6 Apr 2009 02:22:53 +0000 (-0700) Subject: r597 - Add a /retweet and /retweet_as commands. X-Git-Url: https://git.sommitrealweird.co.uk/twirssi-net-twitter-lite.git/commitdiff_plain/2fa1c083e78f8424ace8f5841629fb42a039cefc?ds=sidebyside;hp=-c r597 - Add a /retweet and /retweet_as commands. --- 2fa1c083e78f8424ace8f5841629fb42a039cefc diff --git a/twirssi.pl b/twirssi.pl index c4b4e4b..b9a31f0 100644 --- a/twirssi.pl +++ b/twirssi.pl @@ -11,7 +11,7 @@ $Data::Dumper::Indent = 1; use vars qw($VERSION %IRSSI); $VERSION = "2.2.1beta"; -my ($REV) = '$Rev: 569 $' =~ /(\d+)/; +my ($REV) = '$Rev: 597 $' =~ /(\d+)/; %IRSSI = ( authors => 'Dan Boger', contact => 'zigdon@gmail.com', @@ -20,7 +20,7 @@ my ($REV) = '$Rev: 569 $' =~ /(\d+)/; . 'Can optionally set your bitlbee /away message to same', license => 'GNU GPL v2', url => 'http://twirssi.com', - changed => '$Date: 2009-03-19 11:44:03 -0700 (Thu, 19 Mar 2009) $', + changed => '$Date: 2009-04-05 19:22:22 -0700 (Sun, 05 Apr 2009) $', ); my $window; @@ -104,6 +104,105 @@ sub cmd_direct_as { } } +sub cmd_retweet { + my ( $data, $server, $win ) = @_; + + return unless &logged_in($twit); + + $data =~ s/^\s+|\s+$//; + unless ($data) { + ¬ice("Usage: /retweet [comment]"); + return; + } + + my ( $id, $data ) = split ' ', $data, 2; + + &cmd_retweet_as( "$user $id $data", $server, $win ); +} + +sub cmd_retweet_as { + my ( $data, $server, $win ) = @_; + + unless ( Irssi::settings_get_bool("twirssi_track_replies") ) { + ¬ice("twirssi_track_replies is required in order to reteet."); + return; + } + + return unless &logged_in($twit); + + $data =~ s/^\s+|\s+$//; + my ( $username, $id, $data ) = split ' ', $data, 3; + + unless ( $username ) { + ¬ice("Usage: /retweet_as [comment]"); + return; + } + + return unless $username = &valid_username($username); + + my $nick; + $id =~ s/[^\w\d\-:]+//g; + ( $nick, $id ) = split /:/, $id; + unless ( exists $id_map{ lc $nick } ) { + ¬ice("Can't find a tweet from $nick to retweet!"); + return; + } + + $id = $id_map{__indexes}{$nick} unless $id; + unless ( $id_map{ lc $nick }[$id] ) { + ¬ice("Can't find a tweet numbered $id from $nick to retweet!"); + return; + } + + unless ( $id_map{__tweets}{ lc $nick }[$id] ) { + ¬ice("The text of this tweet isn't saved, sorry!"); + return; + } + +# Irssi::settings_add_str( "twirssi", "twirssi_retweet_format", 'RT $n: $t ${-- $c$}' ); + my $text = Irssi::settings_get_str("twirssi_retweet_format"); + $text =~ s/\$n/$nick/g; + if ($data) { + $text =~ s/\${|\$}//g; + $text =~ s/\$c/$data/; + } else { + $text =~ s/\${.*?\$}//; + } + $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/; + + $data = &shorten($text); + + return if &too_long($data); + + my $success = 1; + eval { + unless ( + $twits{$username}->update( + { + status => $data, + in_reply_to_status_id => $id_map{ lc $nick }[$id] + } + ) + ) + { + ¬ice("Update failed"); + $success = 0; + } + }; + return unless $success; + + if ($@) { + ¬ice("Update caused an error: $@. Aborted"); + return; + } + + foreach ( $data =~ /@([-\w]+)/ ) { + $nicks{$1} = time; + } + + ¬ice("Retweet sent"); +} + sub cmd_tweet { my ( $data, $server, $win ) = @_; @@ -173,10 +272,9 @@ sub cmd_reply { return; } - $data =~ s/^\s+|\s+$//; my ( $id, $data ) = split ' ', $data, 2; unless ( $id and $data ) { - ¬ice("Usage: /reply_as "); + ¬ice("Usage: /reply "); return; } @@ -926,9 +1024,10 @@ sub monitor_child { and $meta{id} ) { $marker = ( $id_map{__indexes}{ $meta{nick} } + 1 ) % 100; - $id_map{ lc $meta{nick} }[$marker] = $meta{id}; - $id_map{__indexes}{ $meta{nick} } = $marker; - $marker = ":$marker"; + $id_map{ lc $meta{nick} }[$marker] = $meta{id}; + $id_map{__indexes}{ $meta{nick} } = $marker; + $id_map{__tweets}{ lc $meta{nick} }[$marker] = $_; + $marker = ":$marker"; } my $hilight_color = @@ -1160,7 +1259,7 @@ sub sig_complete { my ( $complist, $window, $word, $linestart, $want_space ) = @_; if ( - $linestart =~ /^\/twitter_reply(?:_as)?\s*$/ + $linestart =~ /^\/(?:retweet|twitter_reply)(?:_as)?\s*$/ or ( Irssi::settings_get_bool("twirssi_use_reply_aliases") and $linestart =~ /^\/reply(?:_as)?\s*$/ ) ) @@ -1310,6 +1409,8 @@ Irssi::settings_add_str( "twirssi", "twitter_passwords", undef ); Irssi::settings_add_str( "twirssi", "twirssi_default_service", "Twitter" ); Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" ); Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" ); +Irssi::settings_add_str( "twirssi", "twirssi_retweet_format", + 'RT $n: "$t" ${-- $c$}' ); Irssi::settings_add_str( "twirssi", "twirssi_location", ".irssi/scripts/twirssi.pl" ); Irssi::settings_add_str( "twirssi", "twirssi_replies_store", @@ -1346,6 +1447,8 @@ if ($window) { Irssi::command_bind( "dm_as", "cmd_direct_as" ); Irssi::command_bind( "tweet", "cmd_tweet" ); Irssi::command_bind( "tweet_as", "cmd_tweet_as" ); + Irssi::command_bind( "retweet", "cmd_retweet" ); + Irssi::command_bind( "retweet_as", "cmd_retweet_as" ); Irssi::command_bind( "twitter_reply", "cmd_reply" ); Irssi::command_bind( "twitter_reply_as", "cmd_reply_as" ); Irssi::command_bind( "twitter_login", "cmd_login" );