projects
/
twirssi-net-twitter-lite.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r519 - Add a first shot at supporting truncated statuses -> urls
[twirssi-net-twitter-lite.git]
/
twirssi.pl
diff --git
a/twirssi.pl
b/twirssi.pl
index 2af86fc49f1e0071b5f8e67918f17f63382f1652..8d5b813bd2a1689a44d7610ea4c103c679cb0d0a 100644
(file)
--- a/
twirssi.pl
+++ b/
twirssi.pl
@@
-11,8
+11,8
@@
$Data::Dumper::Indent = 1;
use vars qw($VERSION %IRSSI);
use vars qw($VERSION %IRSSI);
-$VERSION = "2.1.
1
";
-my ($REV) = '$Rev:
490
$' =~ /(\d+)/;
+$VERSION = "2.1.
2beta
";
+my ($REV) = '$Rev:
519
$' =~ /(\d+)/;
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
%IRSSI = (
authors => 'Dan Boger',
contact => 'zigdon@gmail.com',
@@
-21,7
+21,7
@@
my ($REV) = '$Rev: 490 $' =~ /(\d+)/;
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
. 'Can optionally set your bitlbee /away message to same',
license => 'GNU GPL v2',
url => 'http://twirssi.com',
- changed => '$Date: 2009-0
2-25 10:21:27 -0800 (Wed, 25 Feb
2009) $',
+ changed => '$Date: 2009-0
3-07 13:30:43 -0800 (Sat, 07 Mar
2009) $',
);
my $window;
);
my $window;
@@
-505,7
+505,7
@@
sub cmd_upgrade {
}
my $md5;
}
my $md5;
- unless (
$data
) {
+ unless (
$data or Irssi::settings_get_bool("twirssi_upgrade_beta")
) {
eval { use Digest::MD5; };
if ($@) {
eval { use Digest::MD5; };
if ($@) {
@@
-539,11
+539,14
@@
sub cmd_upgrade {
}
}
}
}
- my $URL = "http://twirssi.com/twirssi.pl";
+ my $URL =
+ Irssi::settings_get_bool("twirssi_upgrade_beta")
+ ? "http://github.com/zigdon/twirssi/raw/master/twirssi.pl"
+ : "http://twirssi.com/twirssi.pl";
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
¬ice("Downloading twirssi from $URL");
LWP::Simple::getstore( $URL, "$loc.upgrade" );
- unless (
$data
) {
+ unless (
$data or Irssi::settings_get_bool("twirssi_upgrade_beta")
) {
unless ( open( NEW, "$loc.upgrade" ) ) {
¬ice(
"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location."
unless ( open( NEW, "$loc.upgrade" ) ) {
¬ice(
"Failed to read $loc.upgrade. Check that /set twirssi_location is set to the correct location."
@@
-734,6
+737,12
@@
sub do_updates {
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$context->{id}, $username,
$context->{user}{screen_name}, $ctext;
+ if ($context->{truncated}) {
+ printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+ $context->{id}."-url", $username,
+ $context->{user}{screen_name},
+ "http://twitter.com/$context->{user}{screen_name}/status/$context->{id}";
+ }
$reply = "reply";
} elsif ($@) {
print $fh "type:debug request to get context failed: $@";
$reply = "reply";
} elsif ($@) {
print $fh "type:debug request to get context failed: $@";
@@
-748,6
+757,12
@@
sub do_updates {
and not Irssi::settings_get_bool("show_own_tweets");
printf $fh "id:%d account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
and not Irssi::settings_get_bool("show_own_tweets");
printf $fh "id:%d account:%s nick:%s type:%s %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $reply, $text;
+ if ($t->{truncated}) {
+ printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+ $t->{id}."-url", $username,
+ $t->{user}{screen_name},
+ "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
+ }
}
print scalar localtime, " - Polling for replies" if &debug;
}
print scalar localtime, " - Polling for replies" if &debug;
@@
-769,6
+784,12
@@
sub do_updates {
$text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
$text = &hilight($text);
printf $fh "id:%d account:%s nick:%s type:tweet %s\n",
$t->{id}, $username, $t->{user}{screen_name}, $text;
+ if ($t->{truncated}) {
+ printf $fh "id:%d account:%s nick:%s type:ellispis %s\n",
+ $t->{id}."-url", $username,
+ $t->{user}{screen_name},
+ "http://twitter.com/$t->{user}{screen_name}/status/$t->{id}";
+ }
}
print scalar localtime, " - Polling for DMs" if &debug;
}
print scalar localtime, " - Polling for DMs" if &debug;
@@
-865,6
+886,10
@@
sub monitor_child {
}
if ( not $meta{type} or $meta{type} ne 'searchid' ) {
}
if ( not $meta{type} or $meta{type} ne 'searchid' ) {
+ if ( exists $meta{id} and exists $new_cache{ $meta{id} } ) {
+ next;
+ }
+
$new_cache{ $meta{id} } = time;
if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
$new_cache{ $meta{id} } = time;
if ( exists $meta{id} and exists $tweet_cache{ $meta{id} } ) {
@@
-995,7
+1020,7
@@
sub monitor_child {
print JSON JSON::Any->objToJson( \%id_map );
close JSON;
} else {
print JSON JSON::Any->objToJson( \%id_map );
close JSON;
} else {
- &
notice
("Failed to write replies to $file: $!");
+ &
ccrap
("Failed to write replies to $file: $!");
}
}
$failwhale = 0;
}
}
$failwhale = 0;
@@
-1034,11
+1059,11
@@
sub monitor_child {
q{ '--/_.'----'`}
)
{
q{ '--/_.'----'`}
)
{
- &
notice
($whale);
+ &
ccrap
($whale);
}
$failwhale = 1;
}
}
$failwhale = 1;
}
- &
notice
("Haven't been able to get updated tweets since $since");
+ &
ccrap
("Haven't been able to get updated tweets since $since");
}
}
}
}
@@
-1050,6
+1075,10
@@
sub notice {
$window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
}
$window->print( "%R***%n @_", MSGLEVEL_PUBLIC );
}
+sub ccrap {
+ $window->print( "%R***%n @_", MSGLEVEL_CLIENTCRAP );
+}
+
sub update_away {
my $data = shift;
sub update_away {
my $data = shift;
@@
-1063,7
+1092,7
@@
sub update_away {
$server->send_raw("away :$data");
return 1;
} else {
$server->send_raw("away :$data");
return 1;
} else {
- &
notice
( "Can't find bitlbee server.",
+ &
ccrap
( "Can't find bitlbee server.",
"Update bitlbee_server or disable tweet_to_away" );
return 0;
}
"Update bitlbee_server or disable tweet_to_away" );
return 0;
}
@@
-1192,6
+1221,7
@@
Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
".irssi/scripts/twirssi.json" );
Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
".irssi/scripts/twirssi.json" );
Irssi::settings_add_str( "twirssi", "twirssi_nick_color", "%B" );
Irssi::settings_add_str( "twirssi", "twirssi_topic_color", "%r" );
+Irssi::settings_add_bool( "twirssi", "twirssi_upgrade_beta", 0 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 );
Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 );
Irssi::settings_add_bool( "twirssi", "tweet_to_away", 0 );
Irssi::settings_add_bool( "twirssi", "show_reply_context", 0 );
Irssi::settings_add_bool( "twirssi", "show_own_tweets", 1 );
@@
-1207,6
+1237,10
@@
Irssi::settings_add_bool( "twirssi", "tweet_window_input", 0 );
$last_poll = time - &get_poll_time;
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
if ( !$window ) {
$last_poll = time - &get_poll_time;
$window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
if ( !$window ) {
+ Irssi::active_win()
+ ->print( "Couldn't find a window named '"
+ . Irssi::settings_get_str('twitter_window')
+ . "', trying to create it." );
$window =
Irssi::Windowitem::window_create(
Irssi::settings_get_str('twitter_window'), 1 );
$window =
Irssi::Windowitem::window_create(
Irssi::settings_get_str('twitter_window'), 1 );