Changeset 5ef98c7

Timestamp:

Sep 20, 2011, 11:15:32 PM (13 years ago)

Author:

Edward Z. Yang <ezyang@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

68c0afd

Parents:

b7fa912

git-author:

Edward Z. Yang <ezyang@mit.edu> (07/14/11 08:58:24)

git-committer:

Edward Z. Yang <ezyang@mit.edu> (09/20/11 23:15:32)

Message:

Fix broken posts, better permission detection, implement deletion.

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

Location:

perl/modules/Facebook/lib

Files:

• BarnOwl/Module/Facebook/Handle.pm (modified) (5 diffs)
• Facebook/Graph.pm (modified) (3 diffs)
• Facebook/Graph/Publish.pm (modified) (2 diffs)

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

@@ -377 +377 @@
     my $msg = shift;
 
-    my $cont = sub { $self->sleep(0); };
+    my $cont = sub {
+        eval { shift->as_hashref };
+        return unless $self->check_result;
+        $self->sleep(0);
+    };
 
     if (defined $user) {
@@ -385 +389 @@
         $self->{facebook}->add_post->set_message($msg)->publish($cont);
     }
+    # XXX MESSAGE PLZ
 }
 
@@ -393 +398 @@
     my $msg = shift;
 
-    $self->{facebook}->add_comment($post_id)->set_message($msg)->publish(sub { $self->sleep(0); });
+    $self->{facebook}->add_comment($post_id)->set_message($msg)->publish(sub {
+        eval { shift->as_hashref };
+        return unless $self->check_result;
+        $self->sleep(0);
+    });
+    # XXX MESSAGE PLZ
 }
 
@@ -438 +448 @@
     $self->{facebook}->access_token($self->{cfg}->{token});
     # Do a quick check to see if things are working
-    $self->{facebook}->query()->find('me')->select_fields('name')->request(sub {
+    #$self->{facebook}->query()->find('me')->select_fields('name')->request(sub {
+    $self->{facebook}->add_post->set_message("Logged in to BarnOwl at " . localtime time)->set_privacy('CUSTOM', {friends => 'SELF'})->publish(sub {
         my $result = eval { shift->as_hashref };
         if ($@) {
@@ -445 +456 @@
                 . "\nand run command ':facebook-auth URL' with the URL you are redirected to.");
         } else {
-            my $name = $result->{'name'};
-            BarnOwl::admin_message('Facebook', "Successfully logged in to Facebook as $name!");
-            $self->{logged_in} = 1;
-            $self->sleep(0); # start polling
-            $success->();
+            $self->{facebook}->delete($result->{id}, sub {
+                BarnOwl::admin_message('Facebook', "Successfully logged in to Facebook.");
+                $self->{logged_in} = 1;
+                $self->sleep(0); # start polling
+                $success->();
+            });
         }
     });

perl/modules/Facebook/lib/Facebook/Graph.pm

@@ -7 +7 @@
 use MIME::Base64::URLSafe;
 use JSON;
+with 'Facebook::Graph::Role::Uri';
 use Facebook::Graph::AccessToken;
 use Facebook::Graph::Authorize;
@@ -21 +22 @@
 use Facebook::Graph::Publish::RSVPAttending;
 use Facebook::Graph::Publish::RSVPDeclined;
+use URI::Encode qw(uri_decode);
+use AnyEvent::HTTP;
 use Ouch;
 
@@ -113 +116 @@
 }
 
+sub delete {
+    my ($self, $id, $cb) = @_;
+    my %query;
+    if ($self->has_access_token) {
+        $query{access_token} = uri_decode($self->access_token);
+    }
+    my $uri = $self->uri;
+    $uri->path($id);
+    $uri->query_form(%query);
+    http_request(DELETE => $uri->as_string, sub {
+        my ($response, $headers) = @_;
+        my %params = (
+            response => $response,
+            headers => $headers,
+            uri => $uri
+        );
+        if ($self->has_secret) {
+            $params{secret} = $self->secret;
+        }
+        $cb->(Facebook::Graph::Response->new(%params));
+    });
+    () # return nothing
+}
+
 sub picture {
     my ($self, $object_name) = @_;

perl/modules/Facebook/lib/Facebook/Graph/Publish.pm

@@ -10 +10 @@
 use LWP::UserAgent; # XXX blegh
 use HTTP::Request::Common;
-use URI::Encode qw(uri_decode);
+use URI::Encode qw(uri_decode uri_encode);
 
 has secret => (
@@ -47 +47 @@
     my $uri = $self->uri;
     $uri->path($self->object_name.$self->object_path);
-    # XXX blegh
-    my $request = LWP::UserAgent->new->request(POST $uri->as_string, $self->get_post_params);
+    my $request = POST($uri->as_string,$self->get_post_params);
+    # XXX Do this more elegantly
     http_post $uri->as_string, $request->content, sub {
-        warn "whooo";
         my ($response, $headers) = @_;
         my %params = (