Changeset 40def31a for perl

Timestamp:

May 20, 2020, 7:21:29 PM (4 years ago)

Author:

GitHub <noreply@github.com>

Parents:

9a0d25d (diff), 834dc31 (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.

git-author:

Alex Dehnert <adehnert@mit.edu> (05/20/20 19:21:29)

git-committer:

GitHub <noreply@github.com> (05/20/20 19:21:29)

Message:

Merge 834dc312682e1820f1f2fa826ea9040caea8813f into 9a0d25d1513e92f2b0c99d89ab5fc5ae2c061151

Location:

perl

Files:

• modules/Twitter/lib/BarnOwl/Message/Twitter.pm (modified) (1 diff)
• modules/Twitter/lib/BarnOwl/Module/Twitter.pm (modified) (3 diffs)
• modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• lib/BarnOwl/Complete/AIM.pm (deleted)
• lib/BarnOwl/Complete/Filter.pm (modified) (1 diff)
• lib/BarnOwl/Logging.pm (modified) (1 diff)
• lib/BarnOwl/Message.pm (modified) (2 diffs)
• lib/BarnOwl/Message/AIM.pm (deleted)

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

@@ -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);
 }
 

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

@@ -290 +290 @@
             $orig = $tweet unless defined($orig);
 
+            my $url = $self->{cfg}->{service} . '/' . $orig->{user}{screen_name} . '/status/' . $tweet->{id};
             my $msg = BarnOwl::Message->new(
                 type      => 'Twitter',
@@ -299 +300 @@
                 body      => decode_entities($orig->{text}),
                 status_id => $tweet->{id},
+                url       => $url,
                 service   => $self->{cfg}->{service},
                 account   => $self->{cfg}->{account_nickname},

perl/Makefile.am

@@ -2 +2 @@
 nobase_dist_pkgdata_DATA = \
         lib/BarnOwl.pm \
-        lib/BarnOwl/Complete/AIM.pm \
         lib/BarnOwl/Complete/Client.pm \
         lib/BarnOwl/Complete/Filter.pm \
@@ -17 +16 @@
         lib/BarnOwl/MainLoopCompatHook.pm \
         lib/BarnOwl/Message.pm \
-        lib/BarnOwl/Message/AIM.pm \
         lib/BarnOwl/Message/Admin.pm \
         lib/BarnOwl/Message/Generic.pm \

perl/lib/BarnOwl/Complete/Filter.pm

@@ -36 +36 @@
     body      => undef,
     hostname  => undef,
-    type      => sub { qw(zephyr aim admin); },
+    type      => sub { qw(zephyr admin); },
     direction => sub { qw(in out none); },
     login     => sub { qw(login logout none); },

perl/lib/BarnOwl/Logging.pm

@@ -75 +75 @@
             summary     => 'enable logging of login notifications',
             description => "When this is enabled, BarnOwl will log login and logout notifications\n"
-                         . "for AIM, zephyr, or other protocols.  If disabled BarnOwl will not log\n"
+                         . "for zephyr or other protocols.  If disabled BarnOwl will not log\n"
                          . "login or logout notifications."
         });

perl/lib/BarnOwl/Message.pm

@@ -7 +7 @@
 
 use BarnOwl::Message::Admin;
-use BarnOwl::Message::AIM;
 use BarnOwl::Message::Generic;
 use BarnOwl::Message::Loopback;
@@ -43 +42 @@
 sub is_generic  { return (shift->{"type"} eq "generic"); }
 sub is_zephyr   { return (shift->{"type"} eq "zephyr"); }
-sub is_aim      { return (shift->{"type"} eq "AIM"); }
+sub is_aim      { return ''; }
 sub is_jabber   { return (shift->{"type"} eq "jabber"); }
 sub is_icq      { return (shift->{"type"} eq "icq"); }