1.7.2 - r350 - Restore the /reply commands

diff --git a/twirssi.pl b/twirssi.pl
index 0a170cb67725831648236ff5e9c22d1d5a364e85..7b023467eda60def72092f5b7df2abdd70bd4dc8 100644 (file)
--- a/twirssi.pl
+++ b/twirssi.pl
@@ -12,7 +12,7 @@ $Data::Dumper::Indent = 1;
 use vars qw($VERSION %IRSSI);
 
 $VERSION = "1.7.2";
-my ($REV) = '$Rev: 349 $' =~ /(\d+)/;
+my ($REV) = '$Rev: 350 $' =~ /(\d+)/;
 %IRSSI = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -21,7 +21,7 @@ my ($REV) = '$Rev: 349 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license => 'GNU GPL v2',
     url     => 'http://tinyurl.com/twirssi',
-    changed => '$Date: 2009-01-06 11:16:45 -0800 (Tue, 06 Jan 2009) $',
+    changed => '$Date: 2009-01-06 14:59:49 -0800 (Tue, 06 Jan 2009) $',
 );
 
 my $window;
@@ -876,8 +876,12 @@ sub notice {
 sub sig_complete {
     my ( $complist, $window, $word, $linestart, $want_space ) = @_;
 
-    # /twitter_reply gets a nick:num
-    if ( $linestart =~ /^\/twitter_reply(?:_as)?\s*$/ ) {
+    if (
+        $linestart =~ /^\/twitter_reply(?:_as)?\s*$/
+        or ( Irssi::settings_get_bool("twirssi_use_reply_aliases")
+            and $linestart =~ /^\/reply(?:_as)?\s*$/ )
+      )
+    {    # /twitter_reply gets a nick:num
         @$complist = grep /^\Q$word/i, sort keys %{ $id_map{__indexes} };
     }
 
@@ -901,12 +905,13 @@ Irssi::settings_add_str( "twirssi", "twitter_usernames", undef );
 Irssi::settings_add_str( "twirssi", "twitter_passwords", undef );
 Irssi::settings_add_str( "twirssi", "twirssi_replies_store",
     ".irssi/scripts/twirssi.json" );
-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", "twirssi_debug",         0 );
-Irssi::settings_add_bool( "twirssi", "twirssi_first_run",     1 );
-Irssi::settings_add_bool( "twirssi", "twirssi_track_replies", 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 );
+Irssi::settings_add_bool( "twirssi", "twirssi_debug",             0 );
+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 );
 $window = Irssi::window_find_name( Irssi::settings_get_str('twitter_window') );
 
 if ($window) {
@@ -920,6 +925,10 @@ if ($window) {
     Irssi::command_bind( "twitter_logout",   "cmd_logout" );
     Irssi::command_bind( "twitter_switch",   "cmd_switch" );
     Irssi::command_bind( "twirssi_upgrade",  "cmd_upgrade" );
+    if ( Irssi::settings_get_bool("twirssi_use_reply_aliases") ) {
+        Irssi::command_bind( "reply",    "cmd_reply" );
+        Irssi::command_bind( "reply_as", "cmd_reply_as" );
+    }
     Irssi::command_bind(
         "twirssi_dump",
         sub {