Updating with latest configs from work

4 files changed, 151 insertions, 23 deletions

diff --git a/.irssi/config.clean b/.irssi/config.clean
index 146c678..1054b17 100644
--- a/.irssi/config.clean
+++ b/.irssi/config.clean
@@ -16,6 +16,16 @@ servers = (
     port = "5223";
     use_ssl = "yes";
     autoconnect = "yes";
+    jid = "mcrute@chat.ops.ag.com";
+    password = "[REDACTED]";
+  },
+  {
+    address = "talk.google.com";
+    chatnet = "Gmail";
+    port = "5223";
+    use_ssl = "yes";
+    autoconnect = "yes";
+    jid = "mcrute@gmail.com";
     password = "[REDACTED]";
   }
 );
@@ -23,10 +33,16 @@ servers = (
 chatnets = {
   FreeNode = {
     type = "IRC";
-    autosendcmd = "/^msg nickserv identify [REDACTED];wait 2000";
+    nick = "cruteme";
+    autosendcmd = "/msg nickserv identify [REDACTED];wait 2000";
   };
-  AIM = { type = "IRC"; };
-  AGJabber = { type = "XMPP"; nick = "mcrute@chat.ops.ag.com"; };
+  AIM = {
+    type = "IRC";
+    nick = "cruteme";
+    autosendcmd = "/msg root identify [REDACTED];wait 2000";
+  };
+  AGJabber = { type = "XMPP"; nick = "mcrute"; };
+  Gmail = { type = "XMPP"; nick = "mcrute"; };
 };
 
 channels = (
@@ -118,6 +134,7 @@ aliases = {
   "MANUAL-WINDOWS" = "set use_status_window off;set autocreate_windows off;set autocreate_query_level none;set autoclose_windows off;set reuse_unused_windows on;save";
   EXEMPTLIST = "mode $C +e";
   ATAG = "WINDOW SERVER";
+  tu = "twitter_update";
 };
 
 statusbar = {
@@ -233,10 +250,14 @@ statusbar = {
     awl_0 = {
       items = {
         barstart = { priority = "100"; };
-        user = { };
         awl_0 = { };
-        act = { priority = "10"; };
-        lag = { };
+        barend = { priority = "100"; alignment = "right"; };
+      };
+    };
+    awl_1 = {
+      items = {
+        barstart = { priority = "100"; };
+        awl_1 = { };
         barend = { priority = "100"; alignment = "right"; };
       };
     };
@@ -256,9 +277,111 @@ settings = {
   "irc/core" = { channels_rejoin_unavailable = "yes"; };
   "perl/core/scripts" = {
     awl_display_key = "$Q%K|%n$H$C$S";
-    awl_block = "0";
-    twirssi_first_run = "no";
     awl_prefer_name = "yes";
+    twirssi_first_run = "no";
+    twitter_poll_interval = "60";
   };
 };
 logs = { };
+windows = {
+  1 = { immortal = "yes"; name = "(status)"; level = "ALL"; };
+  2 = {
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "IRC";
+        name = "&bitlbee";
+        tag = "AIM";
+      }
+    );
+  };
+  3 = {
+    name = "tech";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "no-bs@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  4 = {
+    name = "opshelp";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "opshelp@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  5 = {
+    name = "testing";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "testing@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  6 = {
+    name = "opensource";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "opensource@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  7 = {
+    name = "ag";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "ag@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  8 = {
+    name = "content";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "content@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  9 = {
+    name = "endeca";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "endeca@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+  10 = {
+    name = "photoworks";
+    items = (
+      {
+        type = "CHANNEL";
+        chat_type = "XMPP";
+        name = "focus@conference.chat.ops.ag.com";
+        tag = "AGJabber";
+      }
+    );
+  };
+};
+mainwindows = { 4 = { first_line = "1"; lines = "43"; }; };
diff --git a/.irssi/scripts/autorun/adv_windowlist.pl b/.irssi/scripts/autorun/adv_windowlist.pl
new file mode 120000
index 0000000..d210a5c
--- /dev/null
+++ b/.irssi/scripts/autorun/adv_windowlist.pl
@@ -0,0 +1 @@
+../adv_windowlist.pl
\ No newline at end of file
diff --git a/.irssi/scripts/autorun/twirssi.pl b/.irssi/scripts/autorun/twirssi.pl
deleted file mode 120000
index 5722034..0000000
--- a/.irssi/scripts/autorun/twirssi.pl
+++ /dev/null
@@ -1 +0,0 @@
-../twirssi.pl
\ No newline at end of file
diff --git a/.irssi/scripts/twirssi.pl b/.irssi/scripts/twirssi.pl
index 12bfad7..813aeb1 100644
--- a/.irssi/scripts/twirssi.pl
+++ b/.irssi/scripts/twirssi.pl
@@ -11,7 +11,7 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = "2.3.0";
+$VERSION = "2.3.3";
 %IRSSI   = (
     authors     => 'Dan Boger',
     contact     => 'zigdon@gmail.com',
@@ -175,25 +175,29 @@ sub cmd_retweet_as {
     }
     $text =~ s/\$t/$id_map{__tweets}{ lc $nick }[$id]/;
 
+    my $modified = $data;
     $data = &shorten($text);
 
     return if &too_long($data);
 
     my $success = 1;
     eval {
-        unless (
-            $twits{$username}->update(
+        if ($modified) {
+            $success = $twits{$username}->update(
                 {
                     status => $data,
 
                     # in_reply_to_status_id => $id_map{ lc $nick }[$id]
                 }
             )
-          )
-        {
-            &notice("Update failed");
-            $success = 0;
+        } else {
+            $success = $twits{$username}->retweet(
+                {
+                    id => $id_map{ lc $nick }[$id]
+                }
+            )
         }
+        &notice("Update failed") unless $success;
     };
     return unless $success;
 
@@ -490,7 +494,7 @@ sub cmd_login {
     }
     $defservice = $service = ucfirst lc $service;
 
-    eval "use Net::$service";
+    eval "use Net::$service 3.05";
     if ($@) {
         &notice(
             "Failed to load Net::$service when trying to log in as $user: $@");
@@ -513,6 +517,7 @@ sub cmd_login {
         and $twit->can('ua') )
     {
         $twit->ua->timeout($timeout);
+        &notice("Twitter timeout set to $timeout");
     }
 
     unless ( $twit->verify_credentials() ) {
@@ -935,14 +940,14 @@ sub do_updates {
     eval {
         if ( $id_map{__last_id}{$username}{timeline} )
         {
-            $tweets = $obj->friends_timeline( { count => 100 } );
+            $tweets = $obj->home_timeline( { count => 100 } );
         } else {
-            $tweets = $obj->friends_timeline();
+            $tweets = $obj->home_timeline();
         }
     };
 
     if ($@) {
-        print $fh "type:debug Error during friends_timeline call: Aborted.\n";
+        print $fh "type:debug Error during home_timeline call: Aborted.\n";
         print $fh "type:debug : $_\n" foreach split /\n/, Dumper($@);
         return undef;
     }
@@ -953,12 +958,12 @@ sub do_updates {
             eval { $error = JSON::Any->jsonToObj( $obj->get_error() ) };
             unless ($@) { $error = $obj->get_error() }
             print $fh
-              "type:debug API Error during friends_timeline call: Aborted\n";
+              "type:debug API Error during home_timeline call: Aborted\n";
             print $fh "type:debug : $_\n" foreach split /\n/, Dumper($error);
 
         } else {
             print $fh
-              "type:debug API Error during friends_timeline call. Aborted.\n";
+              "type:debug API Error during home_timeline call. Aborted.\n";
         }
         return undef;
     }
@@ -1602,7 +1607,7 @@ sub hilight {
     if ( Irssi::settings_get_str("twirssi_nick_color") ) {
         my $c = Irssi::settings_get_str("twirssi_nick_color");
         $c = $irssi_to_mirc_colors{$c};
-        $text =~ s/(^|\W)\@([-\w]+)/$1\cC$c\@$2\cO/g if $c;
+        $text =~ s/(^|\W)\@(\w+)/$1\cC$c\@$2\cO/g if $c;
     }
     if ( Irssi::settings_get_str("twirssi_topic_color") ) {
         my $c = Irssi::settings_get_str("twirssi_topic_color");