Changeset e1ed6f4

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:

fb06a17

Parents:

a4ae221

git-author:

Edward Z. Yang <ezyang@mit.edu> (06/23/11 22:44:48)

git-committer:

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

Message:

Refine module setup process.

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

Location:

perl/modules/Facebook

Files:

• README (modified) (2 diffs)
• lib/BarnOwl/Module/Facebook.pm (modified) (1 diff)
• lib/BarnOwl/Module/Facebook/Handle.pm (modified) (2 diffs)

perl/modules/Facebook/README

@@ -6 +6 @@
 
 SYNOPSIS
-  (1) Create an empty file ~/.owl/facebook (you can use the command
-  `touch ~/.owl/facebook`), in order to enable the module.
+  (1) Run ":reload-module Facebook" inside BarnOwl, if the module has
+  not been loaded already.
 
-  (2) Run ":reload-module Facebook" inside BarnOwl.
-
-  (3) Follow the instructions in the admin message.  BarnOwl will
-  ask you to log in via an OAuth URL, and run ':facebook-auth'
-  with the resulting URL.  It will then ask you to record the
-  resulting access token in your ~/.owl/facebook file, so you do
-  not have to login on subsequent BarnOwl sesions.
+  (2) Run ':facebook-auth'.  Follow the instructions in the admin
+  message.  BarnOwl will ask you to log in via an OAuth URL, and run
+  ':facebook-auth $URL' where $URL is the URL you were redirected to.
+  It will then ask you to record the resulting access token in an
+  ~/.owl/facebook file, so you do not have to login on subsequent
+  BarnOwl sesions.
 
   This token is valid until you change your
@@ -21 +20 @@
     http://www.facebook.com/settings/?tab=applications&app_id=235537266461636
 
-  (4) Start receiving wall updates in Barnowl!
+  (3) Start receiving wall updates in Barnowl!
   You can post updates with the ":facebook" command.
 

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

@@ -73 +73 @@
 BarnOwl::new_command('facebook-auth' => \&cmd_facebook_auth, {
     summary     => 'Authenticate as a Facebook user.',
-    usage       => 'facebook-auth URL',
+    usage       => 'facebook-auth [URL]',
     description => 'Authenticate as a Facebook user.  URL should be the page'
-                ."\nFacebook redirects you to after OAuth login."
+                ."\nFacebook redirects you to after OAuth login.  If no URL"
+                ."\nis specified, output instructions for logging in."
 });
 

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

@@ -112 +112 @@
 
     $self->{facebook} = Facebook::Graph->new( app_id => $app_id );
-    $self->facebook_do_auth;
+    if ( defined $self->{cfg}->{token} ) {
+        $self->facebook_do_auth;
+    }
 
     return $self;
@@ -400 +402 @@
     my $url = shift;
 
+    if (!defined $url) {
+        $self->facebook_do_auth;
+        return;
+    }
+
     # http://www.facebook.com/connect/login_success.html#access_token=TOKEN&expires_in=0
     $url =~ /access_token=([^&]+)/; # XXX Ew regex