Changeset 300849a

Timestamp:

Oct 15, 2014, 2:50:03 AM (8 years ago)

Author:

Edward Z. Yang <ezyang@mit.edu>

Parents:

5f3f1e4 (diff), 10e2295 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 10e22953bdafd75b19a929d91dbd11afad9af15c into 5f3f1e484f3c4b262b481efbd32602853bb41a27

Files:

• README (modified) (1 diff)
• perl/modules/Twitter/lib/BarnOwl/Message/Twitter.pm (modified) (2 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter.pm (modified) (3 diffs)
• .travis.yml (modified) (2 diffs)

README

@@ -55 +55 @@
 The Twitter module requires:
 
-HTML::Entities
+HTML::Entities (provided by HTML::Parser)
 Net::Twitter::Lite
 

perl/modules/Twitter/lib/BarnOwl/Message/Twitter.pm

@@ -22 +22 @@
     $self->service =~ m#^\s*(.*?://.*?)/.*$#;
     my $service = $1 || $self->service;
-    my $long = $service . '/' . $self->sender;
+    my $long = $service . '/' . $self->sender . '/status/' . $self->{status_id};
     if ($self->retweeted_by) {
         $long = "(retweeted by " . $self->retweeted_by . ") $long";
@@ -33 +33 @@
     if($self->is_private) {
         return $self->replysendercmd;
-    } elsif(exists($self->{status_id})) {
-        return BarnOwl::quote('twitter-atreply', $self->sender, $self->{status_id}, $self->account);
+    }
+    # Roughly, this is how Twitter's @-reply calculation works
+    # (based on a few experiments)
+    #
+    #   1. The person who wrote the tweet you are replying to is added.
+    #      This is the only time when your own name can show up in an
+    #      at-reply string.
+    #   2. Next, Twitter goes through the Tweet front to back, adding
+    #      mentioned usernames that have not already been added to the
+    #      string.
+    #
+    # In degenerate cases, the at-reply string might be longer than
+    # the max Tweet size; Twitter doesn't care.
+
+    # XXX A horrifying violation of encapsulation
+    # NB: names array includes @-signs.
+    my $account = BarnOwl::Module::Twitter::find_account_default($self->{account});
+    my @inside_names = grep($_ ne ("@" . $account->{cfg}->{user}),
+                            $self->{body} =~ /(?:^|\s)(@\w+)/g );
+    my @dup_names = ( ( "@" . $self->sender ), @inside_names );
+
+    # XXX Really should use List::MoreUtils qw(uniq).  This code snippet
+    # lifted from `perldoc -q duplicate`.
+    my %seen = ();
+    my @names = grep { ! $seen{ $_ }++ } @dup_names;
+    my $prefill = join(' ', @names) . ' '; # NB need trailing space
+
+    if(exists($self->{status_id})) {
+        return BarnOwl::quote('twitter-prefill', $prefill, $self->{status_id}, $self->account);
     } else {
-        return BarnOwl::quote('twitter-atreply', $self->sender, $self->account);
+        # Give a dummy status ID
+        return BarnOwl::quote('twitter-prefill', $prefill, '', $self->account);
     }
 }

perl/modules/Twitter/lib/BarnOwl/Module/Twitter.pm

@@ -243 +243 @@
 BarnOwl::new_command(twitter => \&cmd_twitter, {
     summary     => 'Update Twitter from BarnOwl',
-    usage       => 'twitter [ACCOUNT] [MESSAGE]',
+    usage       => 'twitter [ACCOUNT [MESSAGE]]',
     description => 'Update Twitter on ACCOUNT. If MESSAGE is provided, use it as your status.'
     . "\nIf no ACCOUNT is provided, update all services which have publishing enabled."
@@ -259 +259 @@
     {
     summary     => 'Send a Twitter @ message',
-    usage       => 'twitter-atreply USER [ACCOUNT]',
+    usage       => 'twitter-atreply USER [ID [ACCOUNT]]',
     description => 'Send a Twitter @reply Message to USER on ACCOUNT (defaults to default_sender,' 
+    . "\nor first service if no default is provided)"
+    }
+);
+
+BarnOwl::new_command( 'twitter-prefill' => sub { cmd_twitter_prefill(@_); },
+    {
+    summary     => 'Send a Twitter message with prefilled text',
+    usage       => 'twitter-prefill PREFILL [ID [ACCOUNT]]',
+    description => 'Send a Twitter message with initial text PREFILL on ACCOUNT (defaults to default_sender,' 
     . "\nor first service if no default is provided)"
     }
@@ -356 +365 @@
                             sub { $account->twitter_atreply($user, $id, shift) });
     BarnOwl::Editwin::insert_text("\@$user ");
+}
+
+sub cmd_twitter_prefill {
+    my $cmd  = shift;
+    # prefill is responsible for spacing
+    my $prefill = shift || die("Usage: $cmd PREFILL [In-Reply-To ID]\n");
+    my $id   = shift;
+    my $account = find_account_default(shift);
+
+    my $msg = "What's happening?";
+    if ($id) {
+        # So, this isn't quite semantically correct, but it's close
+        # enough, and under the planned use-case, it will look identical.
+        $msg = "Reply to " . $prefill;
+    }
+    if ($account->nickname) {
+        # XXX formatting slightly suboptimal on What's happening message;
+        # and the behavior does not match up with 'twitter' anyhoo,
+        # which doesn't dispatch through account_find_default
+        $msg .= " on " . $account->nickname;
+    }
+    BarnOwl::start_edit_win($msg,
+                            sub { $account->twitter_atreply(undef, $id, shift) });
+    BarnOwl::Editwin::insert_text($prefill);
 }
 

.travis.yml

@@ +1 @@
+
 language: perl
 compiler:
@@ -9 +10 @@
   - "5.16"
   - "5.18"
-  - "5.19"
+  - "5.20"
 install:
   - sudo apt-get update -q