diff --git a/actions/backupaccount.php b/actions/backupaccount.php index e32b8d03de..8f642f3b77 100644 --- a/actions/backupaccount.php +++ b/actions/backupaccount.php @@ -118,11 +118,13 @@ class BackupaccountAction extends Action { $cur = common_current_user(); - $stream = new UserActivityStream($cur); + $stream = new UserActivityStream($cur, true, UserActivityStream::OUTPUT_RAW); header('Content-Disposition: attachment; filename='.$cur->nickname.'.atom'); header('Content-Type: application/atom+xml; charset=utf-8'); + // @fixme atom feed logic is in getString... + // but we just want it to output to the outputter. $this->raw($stream->getString()); } diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php index 53d0107aa9..d1e3e28fb8 100644 --- a/lib/useractivitystream.php +++ b/lib/useractivitystream.php @@ -29,15 +29,48 @@ class UserActivityStream extends AtomUserNoticeFeed { public $activities = array(); - function __construct($user, $indent = true) + const OUTPUT_STRING = 1; + const OUTPUT_RAW = 2; + public $outputMode = self::OUTPUT_STRING; + + /** + * + * @param User $user + * @param boolean $indent + * @param boolean $outputMode: UserActivityStream::OUTPUT_STRING to return a string, + * or UserActivityStream::OUTPUT_RAW to go to raw output. + * Raw output mode will attempt to stream, keeping less + * data in memory but will leave $this->activities incomplete. + */ + function __construct($user, $indent = true, $outputMode = UserActivityStream::OUTPUT_STRING) { parent::__construct($user, null, $indent); + $this->outputMode = $outputMode; + if ($this->outputMode == self::OUTPUT_STRING) { + // String buffering? Grab all the notices now. + $notices = $this->getNotices(); + } elseif ($this->outputMode == self::OUTPUT_RAW) { + // Raw output... need to restructure from the stringer init. + $this->xw = new XMLWriter(); + $this->xw->openURI('php://output'); + if(is_null($indent)) { + $indent = common_config('site', 'indent'); + } + $this->xw->setIndent($indent); + + // We'll fetch notices later. + $notices = array(); + } else { + throw new Exception('Invalid outputMode provided to ' . __METHOD__); + } + + // Assume that everything but notices is feasible + // to pull at once and work with in memory... $subscriptions = $this->getSubscriptions(); $subscribers = $this->getSubscribers(); $groups = $this->getGroups(); $faves = $this->getFaves(); - $notices = $this->getNotices(); $objs = array_merge($subscriptions, $subscribers, $groups, $faves, $notices); @@ -45,16 +78,44 @@ class UserActivityStream extends AtomUserNoticeFeed usort($objs, 'UserActivityStream::compareObject'); + // We'll keep these around for later, and interleave them into + // the output stream with the user's notices. foreach ($objs as $obj) { $this->activities[] = $obj->asActivity(); } } + /** + * Interleave the pre-sorted subs/groups/faves with the user's + * notices, all in reverse chron order. + */ function renderEntries() { + $end = time() + 1; foreach ($this->activities as $act) { + $start = $act->time; + + if ($this->outputMode == self::OUTPUT_RAW && $start != $end) { + // In raw mode, we haven't pre-fetched notices. + // Grab the chunks of notices between other activities. + $notices = $this->getNoticesBetween($start, $end); + foreach ($notices as $noticeAct) { + $noticeAct->asActivity()->outputTo($this, false, false); + } + } + // Only show the author sub-element if it's different from default user $act->outputTo($this, false, ($act->actor->id != $this->user->uri)); + + $end = $start; + } + + if ($this->outputMode == self::OUTPUT_RAW) { + // Grab anything after the last pre-sorted activity. + $notices = $this->getNoticesBetween(0, $end); + foreach ($notices as $noticeAct) { + $noticeAct->asActivity()->outputTo($this, false, false); + } } } @@ -121,7 +182,13 @@ class UserActivityStream extends AtomUserNoticeFeed return $faves; } - function getNotices() + /** + * + * @param int $start unix timestamp for earliest + * @param int $end unix timestamp for latest + * @return array of Notice objects + */ + function getNoticesBetween($start=0, $end=0) { $notices = array(); @@ -129,6 +196,17 @@ class UserActivityStream extends AtomUserNoticeFeed $notice->profile_id = $this->user->id; + if ($start) { + $tsstart = common_sql_date($start); + $notice->whereAdd("created >= '$tsstart'"); + } + if ($end) { + $tsend = common_sql_date($end); + $notice->whereAdd("created < '$tsend'"); + } + + $notice->orderBy('created DESC'); + if ($notice->find()) { while ($notice->fetch()) { $notices[] = clone($notice); @@ -138,6 +216,11 @@ class UserActivityStream extends AtomUserNoticeFeed return $notices; } + function getNotices() + { + return $this->getNoticesBetween(); + } + function getGroups() { $groups = array(); diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php index 7e17c2d7ec..37b931e23e 100644 --- a/plugins/FacebookBridge/FacebookBridgePlugin.php +++ b/plugins/FacebookBridge/FacebookBridgePlugin.php @@ -179,28 +179,22 @@ class FacebookBridgePlugin extends Plugin // Always add the admin panel route $m->connect('admin/facebook', array('action' => 'facebookadminpanel')); - // Only add these routes if an application has been setup on - // Facebook for the plugin to use. - if ($this->hasApplication()) { - - $m->connect( - 'main/facebooklogin', - array('action' => 'facebooklogin') - ); - $m->connect( - 'main/facebookfinishlogin', - array('action' => 'facebookfinishlogin') - ); - $m->connect( - 'settings/facebook', - array('action' => 'facebooksettings') - ); - $m->connect( - 'facebook/deauthorize', - array('action' => 'facebookdeauthorize') - ); - - } + $m->connect( + 'main/facebooklogin', + array('action' => 'facebooklogin') + ); + $m->connect( + 'main/facebookfinishlogin', + array('action' => 'facebookfinishlogin') + ); + $m->connect( + 'settings/facebook', + array('action' => 'facebooksettings') + ); + $m->connect( + 'facebook/deauthorize', + array('action' => 'facebookdeauthorize') + ); return true; } diff --git a/plugins/FacebookBridge/lib/facebookclient.php b/plugins/FacebookBridge/lib/facebookclient.php index 030a75caed..516f252d98 100644 --- a/plugins/FacebookBridge/lib/facebookclient.php +++ b/plugins/FacebookBridge/lib/facebookclient.php @@ -51,7 +51,14 @@ class Facebookclient function __construct($notice) { $this->facebook = self::getFacebook(); - $this->notice = $notice; + + if (empty($this->facebook)) { + throw new FacebookApiException( + "Could not create Facebook client! Bad application ID or secret?" + ); + } + + $this->notice = $notice; $this->flink = Foreign_link::getByUserID( $notice->profile_id, @@ -89,6 +96,22 @@ class Facebookclient $secret = common_config('facebook', 'global_secret'); } + if (empty($appId)) { + common_log( + LOG_WARNING, + "Couldn't find Facebook application ID!", + __FILE__ + ); + } + + if (empty($secret)) { + common_log( + LOG_WARNING, + "Couldn't find Facebook application ID!", + __FILE__ + ); + } + return new Facebook( array( 'appId' => $appId, @@ -174,6 +197,9 @@ class Facebookclient return $this->sendGraph(); } } + + // dequeue + return true; } /* diff --git a/scripts/backupuser.php b/scripts/backupuser.php index 49fc1cefdc..ee2951fc8f 100644 --- a/scripts/backupuser.php +++ b/scripts/backupuser.php @@ -36,7 +36,7 @@ require_once INSTALLDIR.'/scripts/commandline.inc'; try { $user = getUser(); - $actstr = new UserActivityStream($user); + $actstr = new UserActivityStream($user, true, UserActivityStream::OUTPUT_RAW); print $actstr->getString(); } catch (Exception $e) { print $e->getMessage()."\n";