<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -10,8 +10,8 @@ $Data::Dumper::Indent = 1;
 
 use vars qw($VERSION %IRSSI);
 
-$VERSION = &quot;2.2.0&quot;;
-my ($REV) = '$Rev: 559 $' =~ /(\d+)/;
+$VERSION = &quot;2.2.1beta&quot;;
+my ($REV) = '$Rev: 569 $' =~ /(\d+)/;
 %IRSSI = (
     authors     =&gt; 'Dan Boger',
     contact     =&gt; 'zigdon@gmail.com',
@@ -20,7 +20,7 @@ my ($REV) = '$Rev: 559 $' =~ /(\d+)/;
       . 'Can optionally set your bitlbee /away message to same',
     license =&gt; 'GNU GPL v2',
     url     =&gt; 'http://twirssi.com',
-    changed =&gt; '$Date: 2009-03-16 15:34:12 -0700 (Mon, 16 Mar 2009) $',
+    changed =&gt; '$Date: 2009-03-19 11:44:03 -0700 (Thu, 19 Mar 2009) $',
 );
 
 my $window;
@@ -747,15 +747,14 @@ sub do_updates {
             if ($context) {
                 my $ctext = decode_entities( $context-&gt;{text} );
                 $ctext = &amp;hilight($ctext);
+                if ( $context-&gt;{truncated} and ref($obj) ne 'Net::Identica' ) {
+                    $ctext .=
+                        &quot; -- http://twitter.com/$context-&gt;{user}{screen_name}&quot;
+                      . &quot;/status/$context-&gt;{id}&quot;;
+                }
                 printf $fh &quot;id:%d account:%s nick:%s type:tweet %s\n&quot;,
                   $context-&gt;{id}, $username,
                   $context-&gt;{user}{screen_name}, $ctext;
-                if ( $context-&gt;{truncated} and ref($obj) ne 'Net::Identica' ) {
-                    printf $fh &quot;id:%s account:%s nick:%s type:ellispis %s\n&quot;,
-                      $context-&gt;{id} . &quot;-url&quot;, $username,
-                      $context-&gt;{user}{screen_name},
-&quot;http://twitter.com/$context-&gt;{user}{screen_name}/status/$context-&gt;{id}&quot;;
-                }
                 $reply = &quot;reply&quot;;
             } elsif ($@) {
                 print $fh &quot;type:debug request to get context failed: $@&quot;;
@@ -768,14 +767,12 @@ sub do_updates {
         next
           if $t-&gt;{user}{screen_name} eq $username
               and not Irssi::settings_get_bool(&quot;show_own_tweets&quot;);
-        printf $fh &quot;id:%d account:%s nick:%s type:%s %s\n&quot;,
-          $t-&gt;{id}, $username, $t-&gt;{user}{screen_name}, $reply, $text;
         if ( $t-&gt;{truncated} and ref($obj) ne 'Net::Identica' ) {
-            printf $fh &quot;id:%s account:%s nick:%s type:ellispis %s\n&quot;,
-              $t-&gt;{id} . &quot;-url&quot;, $username,
-              $t-&gt;{user}{screen_name},
-              &quot;http://twitter.com/$t-&gt;{user}{screen_name}/status/$t-&gt;{id}&quot;;
+            $text .= &quot; -- http://twitter.com/$t-&gt;{user}{screen_name}&quot;
+              . &quot;/status/$t-&gt;{id}&quot;;
         }
+        printf $fh &quot;id:%d account:%s nick:%s type:%s %s\n&quot;,
+          $t-&gt;{id}, $username, $t-&gt;{user}{screen_name}, $reply, $text;
     }
 
     print scalar localtime, &quot; - Polling for replies&quot; if &amp;debug;
@@ -795,14 +792,12 @@ sub do_updates {
 
         my $text = decode_entities( $t-&gt;{text} );
         $text = &amp;hilight($text);
-        printf $fh &quot;id:%d account:%s nick:%s type:tweet %s\n&quot;,
-          $t-&gt;{id}, $username, $t-&gt;{user}{screen_name}, $text;
         if ( $t-&gt;{truncated} ) {
-            printf $fh &quot;id:%s account:%s nick:%s type:ellispis %s\n&quot;,
-              $t-&gt;{id} . &quot;-url&quot;, $username,
-              $t-&gt;{user}{screen_name},
-              &quot;http://twitter.com/$t-&gt;{user}{screen_name}/status/$t-&gt;{id}&quot;;
+            $text .= &quot; -- http://twitter.com/$t-&gt;{user}{screen_name}&quot;
+              . &quot;/status/$t-&gt;{id}&quot;;
         }
+        printf $fh &quot;id:%d account:%s nick:%s type:tweet %s\n&quot;,
+          $t-&gt;{id}, $username, $t-&gt;{user}{screen_name}, $text;
     }
 
     print scalar localtime, &quot; - Polling for DMs&quot; if &amp;debug;
@@ -953,9 +948,6 @@ sub monitor_child {
                     ( MSGLEVEL_PUBLIC | $hilight ),
                     $meta{type}, $account, $meta{nick}, $marker, $_
                   ];
-            } elsif ( $meta{type} eq 'ellispis' ) {
-                push @lines,
-                  [ MSGLEVEL_PUBLIC, &quot;tweet&quot;, $account, $meta{nick}, &quot;&quot;, $_ ];
             } elsif ( $meta{type} eq 'search' ) {
                 push @lines,
                   [</diff>
      <filename>twirssi.pl</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>6edd2e649ba18daadccc1727d775baa627a525c0</id>
    </parent>
  </parents>
  <author>
    <name>Dan Boger</name>
    <email>zigdon@irc.peeron.com</email>
  </author>
  <url>http://github.com/bssteph/twirssi/commit/108f9ee00b45b3e0d85c06684d158675828c6364</url>
  <id>108f9ee00b45b3e0d85c06684d158675828c6364</id>
  <committed-date>2009-03-19T11:44:16-07:00</committed-date>
  <authored-date>2009-03-19T11:44:16-07:00</authored-date>
  <message>r569 - When a tweet is too long, show the URL on the same line</message>
  <tree>1a94bce5846af4eb4b760ac73b4178f41688a321</tree>
  <committer>
    <name>Dan Boger</name>
    <email>zigdon@irc.peeron.com</email>
  </committer>
</commit>
