Changeset f4d1717

Timestamp:

Jun 22, 2011, 9:56:46 PM (13 years ago)

Author:

Edward Z. Yang <ezyang@mit.edu>

Children:

6c3d4ad

Parents:

2c8852a

git-author:

Edward Z. Yang <ezyang@mit.edu> (06/20/11 11:41:44)

git-committer:

Edward Z. Yang <ezyang@mit.edu> (06/22/11 21:56:46)

Message:

Implement automatic instance selection, with no de-dup.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

Location:

perl/modules/Facebook

Files:

• Makefile.PL (modified) (1 diff)
• README (modified) (1 diff)
• lib/BarnOwl/Message/Facebook.pm (modified) (1 diff)
• lib/BarnOwl/Module/Facebook.pm (modified) (1 diff)
• lib/BarnOwl/Module/Facebook/Handle.pm (modified) (10 diffs)

perl/modules/Facebook/Makefile.PL

@@ -5 +5 @@
 
 requires('Facebook::Graph');
+requires('Lingua::EN::Keywords'); # maybe this should just be optional
 
 barnowl_module('Facebook');

perl/modules/Facebook/README

@@ -32 +32 @@
     and blocks the entire BarnOwl interface.  We need to confront
     Perl's threading demon.
-  * We currently expose the underlying post ID for disambiguating
-    instances.  Use something more user-friendly.
   * No messaging support.
   * No auto-completion support.

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

@@ -14 +14 @@
 
 sub context { return shift->{"name"}; }
-sub subcontext { return shift->{"postid"}; }
+sub subcontext { return shift->{"topic"}; }
 sub service { return "http://www.facebook.com"; }
 sub long_sender { return shift->{"zsig"}; } # XXX hack, shouldn't be named zsig

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

@@ -130 +130 @@
 sub cmd_facebook_comment {
     my $cmd  = shift;
-    my $postid   = shift;
+    my $postid = shift;
+
+    my $topic = $facebook_handle->get_topic($postid);
 
     # XXX UI should give some (better) indication /which/ conversation
     # is being commented on
-    BarnOwl::start_edit_win("Write a comment... ($postid)",
+    BarnOwl::start_edit_win("Write a comment on '$topic'...",
                             sub { $facebook_handle->facebook_comment($postid, shift) });
 }

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

@@ -15 +15 @@
 
 use Facebook::Graph;
-use Data::Dumper;
+
+use Lingua::EN::Keywords;
+
 use JSON;
 use Date::Parse;
@@ -80 +82 @@
         'login_url' => 'http://goo.gl/yA42G',
 
-        'logged_in' => 0
+        'logged_in' => 0,
+
+        # would need another hash for topic de-dup
+        'topics' => {},
     };
 
@@ -144 +149 @@
     # Ideally, we should have some worker thread for polling facebook.
     # But BarnOwl is probably not thread-safe >_<
+
+    my $old_topics = $self->{topics};
+    $self->{topics} = {};
 
     my $updates = eval {
@@ -158 +166 @@
     $self->die_on_error($@);
 
-    #warn Dumper($updates);
-
     my $new_last_poll = $self->{last_poll};
     for my $post ( reverse @{$updates->{data}} ) {
@@ -173 +179 @@
         my $name    = $post->{to}{data}[0]{name} || $post->{from}{name};
         my $name_id = $post->{to}{data}[0]{id} || $post->{from}{id};
+        my $postid  = $post->{id};
 
         # Only handle post if it's new
         my $created_time = str2time($post->{created_time});
         if ($created_time >= $self->{last_poll}) {
+            my @keywords = keywords($post->{name} || $post->{message});
+            my $topic = $keywords[0] || 'personal';
+            $self->{topics}->{$postid} = $topic;
             # XXX indexing is fragile
             my $msg = BarnOwl::Message->new(
@@ -186 +196 @@
                 direction => 'in',
                 body      => $self->format_body($post),
-                postid    => $post->{id},
+                postid    => $postid,
+                topic     => $topic,
                 time      => asctime(localtime $created_time),
                 # XXX The intent is to get the 'Comment' link, which also
@@ -194 +205 @@
                );
             BarnOwl::queue_message($msg);
+        } else {
+            $self->{topics}->{$postid} = $old_topics->{$postid} || 'personal';
         }
 
@@ -214 +227 @@
                     direction => 'in',
                     body      => $comment->{message},
-                    postid    => $post->{id},
+                    postid    => $postid,
+                    topic     => $self->get_topic($postid),
                     time      => asctime(localtime $comment_time),
                    );
@@ -224 +238 @@
         }
     }
+    # old_topics gets GC'd
 
     $self->{last_poll} = $new_last_poll;
@@ -308 +323 @@
 }
 
+sub get_topic {
+    my $self = shift;
+
+    my $postid = shift;
+
+    return $self->{topics}->{$postid} || 'personal';
+}
+
 1;