We have a FacebookQueueHandler now. The update_facebook.php cron

script is totally deprecated.

5 files changed, 100 insertions, 145 deletions

diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index beab51366..e2ad20d19 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -36,7 +36,7 @@ function getFacebookNotices($since)
 
     // XXX: What should the limit be?
     //static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) {
-    
+
     return Notice::getStreamDirect($qry, 0, 1000, 0, 0, null, $since);
 }
 
@@ -52,3 +52,97 @@ function updateProfileBox($facebook, $flink, $notice) {
     $fbaction->updateProfileBox($notice);
 }
 
+function isFacebookBound($notice, $flink) {
+
+    // If the user does not want to broadcast to Facebook, move along
+    if (!($flink->noticesync & FOREIGN_NOTICE_SEND == FOREIGN_NOTICE_SEND)) {
+        common_log(LOG_INFO, "Skipping notice $notice->id " .
+            'because user has FOREIGN_NOTICE_SEND bit off.');
+        return false;
+    }
+
+    $success = false;
+
+    // If it's not a reply, or if the user WANTS to send @-replies...
+    if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $notice->content) ||
+        ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY)) {
+
+        $success = true;
+
+        // The two condition below are deal breakers:
+
+        // Avoid a loop
+        if ($notice->source == 'Facebook') {
+            common_log(LOG_INFO, "Skipping notice $notice->id because its " .
+                'source is Facebook.');
+            $success = false;
+        }
+
+        $facebook = getFacebook();
+        $fbuid = $flink->foreign_id;
+
+        try {
+
+            // Check to see if the user has given the FB app status update perms
+            $result = $facebook->api_client->
+                users_hasAppPermission('status_update', $fbuid);
+
+            if ($result != 1) {
+                $user = $flink->getUser();
+                $msg = "Can't send notice $notice->id to Facebook " .
+                    "because user $user->nickname hasn't given the " .
+                    'Facebook app \'status_update\' permission.';
+                common_log(LOG_INFO, $msg);
+                $success = false;
+            }
+
+        } catch(FacebookRestClientException $e){
+            common_log(LOG_ERROR, $e->getMessage());
+            $success = false;
+        }
+
+    }
+
+    return $success;
+
+}
+
+
+function facebookBroadcastNotice($notice)
+{
+    $facebook = getFacebook();
+    $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE);
+    $fbuid = $flink->foreign_id;
+
+    if (isFacebookBound($notice, $flink)) {
+
+        $status = null;
+
+        // Get the status 'verb' (prefix) the user has set
+        try {
+            $prefix = $facebook->api_client->
+                data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $fbuid);
+
+            $status = "$prefix $notice->content";
+
+        } catch(FacebookRestClientException $e) {
+            common_log(LOG_ERROR, $e->getMessage());
+            return false;
+        }
+
+        // Okay, we're good to go!
+
+        try {
+            $facebook->api_client->users_setStatus($status, $fbuid, false, true);
+            updateProfileBox($facebook, $flink, $notice);
+        } catch(FacebookRestClientException $e) {
+            common_log(LOG_ERROR, $e->getMessage());
+            return false;
+
+             // Should we remove flink if this fails?
+        }
+
+    }
+
+    return true;
+}
diff --git a/lib/util.php b/lib/util.php
index 031fd0da0..3eeb9fde3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -837,7 +837,7 @@ function common_broadcast_notice($notice, $remote=false)
 
 function common_enqueue_notice($notice)
 {
-    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter') as $transport) {
+    foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook') as $transport) {
         $qi = new Queue_item();
         $qi->notice_id = $notice->id;
         $qi->transport = $transport;
@@ -891,6 +891,8 @@ function common_real_broadcast($notice, $remote=false)
         }
     }
     
+    // XXX: Do a real-time FB broadcast here? 
+        
     // XXX: broadcast notices to other IM
     return $success;
 }
diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 269036393..a3256966d 100755
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -24,7 +24,7 @@ DIR=`dirname $0`
 
 for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
          xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
-         twitterqueuehandler.php; do
+         twitterqueuehandler.php facebookqueuehandler.php; do
 
          echo -n "Starting $f...";
 	 php $DIR/$f
diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index b69d296d3..fd4406d41 100755
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,7 +24,7 @@ SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler \
-	 xmppconfirmhandler xmppdaemon twitterhandler ; do
+	 xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
 
 	FILES="$DIR/$f.*.pid"
 	for ff in "$FILES" ; do
diff --git a/scripts/update_facebook.php b/scripts/update_facebook.php
deleted file mode 100755
index 60e10417f..000000000
--- a/scripts/update_facebook.php
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
- */
-
-# Abort if called from a web server
-if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-    print "This script must be run from the command line\n";
-    exit();
-}
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('LACONICA', true);
-
-require_once INSTALLDIR . '/lib/common.php';
-require_once INSTALLDIR . '/lib/facebookutil.php';
-
-// For storing the last run date-time
-$last_updated_file = INSTALLDIR . '/scripts/facebook_last_updated';
-
-// Lock file name
-$lock_file = INSTALLDIR . '/scripts/update_facebook.lock';
-
-// Make sure only one copy of the script is running at a time
-$lock_file = @fopen($lock_file, "w+");
-if (!flock( $lock_file, LOCK_EX | LOCK_NB, &$wouldblock) || $wouldblock) {
-    die("Can't open lock file. Script already running?\n");
-}
-
-$facebook = getFacebook();
-$current_time = time();
-$since = getLastUpdated();
-updateLastUpdated($current_time);
-$notice = getFacebookNotices($since);
-$cnt = 0;
-
-while($notice->fetch()) {
-
-    $flink = Foreign_link::getByUserID($notice->profile_id, FACEBOOK_SERVICE);
-    $user = $flink->getUser();
-    $fbuid = $flink->foreign_id;
-    
-    if (!userCanUpdate($fbuid)) {
-        continue;
-    }
-
-    $prefix = $facebook->api_client->data_getUserPreference(FACEBOOK_NOTICE_PREFIX, $fbuid);
-    $content = "$prefix $notice->content";
-    
-    if (($flink->noticesync & FOREIGN_NOTICE_SEND) == FOREIGN_NOTICE_SEND) {
-
-        // If it's not a reply, or if the user WANTS to send replies...
-        if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) ||
-            (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
-             
-                // Avoid a Loop
-                if ($notice->source != 'Facebook') {
-                    
-                    try {
-                        $facebook->api_client->users_setStatus($content, 
-                            $fbuid, false, true);
-                        updateProfileBox($facebook, $flink, $notice);
-                        $cnt++;
-                    } catch(FacebookRestClientException $e) {
-                        print "Couldn't sent notice $notice->id!\n";
-                        print $e->getMessage();
-
-                        // Remove flink?
-                    }
-                }
-        }
-    }
-}
-
-if ($cnt > 0) {
-    print date('r', $current_time) . 
-    ": Found $cnt new notices for Facebook since last run at " . 
-     date('r', $since) . "\n";
-}
-
-fclose($lock_file);
-exit(0);
-
-
-function userCanUpdate($fbuid) {
-    
-    global $facebook;
-
-    $result = false;
-    
-    try {
-        $result = $facebook->api_client->users_hasAppPermission('status_update', $fbuid);
-    } catch(FacebookRestClientException $e){
-        print_r($e);
-    }
-
-    return $result;
-}
-
-function getLastUpdated(){
-    global $last_updated_file, $current_time;
-    $last = $current_time;
-
-    if (file_exists($last_updated_file) && 
-        ($file = fopen($last_updated_file, 'r'))) {
-            $last = fgets($file);
-    } else {
-        print "$last_updated_file doesn't exit. Trying to create it...\n";
-        $file = fopen($last_updated_file, 'w+') or 
-            die("Can't open $last_updated_file for writing!\n");
-        print 'Success. Using current time (' . date('r', $last) . 
-            ") to look for new notices.\n";
-    }
-    
-    fclose($file);
-    return $last;
-}
-
-function updateLastUpdated($time){
-    global $last_updated_file;
-    $file = fopen($last_updated_file, 'w') or
-        die("Can't open $last_updated_file for writing!");
-    fwrite($file, $time);
-    fclose($file);
-}
-