GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou
2009-02-14 21:28:45 -05:00
parent 9b31571449 02184df7c8
commit 32fc71b432
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/facebookutil.php
View File

@@ -25,21 +25,6 @@ define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
define("FACEBOOK_NOTICE_PREFIX", 1); define("FACEBOOK_NOTICE_PREFIX", 1);
define("FACEBOOK_PROMPTED_UPDATE_PREF", 2); define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
// Gets all the notices from users with a Facebook link since a given ID
function getFacebookNotices($since)
{
$qry = 'SELECT notice.* ' .
'FROM notice ' .
'JOIN foreign_link ' .
'WHERE notice.profile_id = foreign_link.user_id ' .
'AND foreign_link.service = 2';
// 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);
}
function getFacebook() function getFacebook()
{ {
$apikey = common_config('facebook', 'apikey'); $apikey = common_config('facebook', 'apikey');
@@ -97,7 +82,7 @@ function isFacebookBound($notice, $flink) {
} }
} catch(FacebookRestClientException $e){ } catch(FacebookRestClientException $e){
common_log(LOG_ERROR, $e->getMessage()); common_log(LOG_ERR, $e->getMessage());
$success = false; $success = false;
} }
@@ -126,7 +111,7 @@ function facebookBroadcastNotice($notice)
$status = "$prefix $notice->content"; $status = "$prefix $notice->content";
} catch(FacebookRestClientException $e) { } catch(FacebookRestClientException $e) {
common_log(LOG_ERROR, $e->getMessage()); common_log(LOG_ERR, $e->getMessage());
return false; return false;
} }
@@ -136,7 +121,7 @@ function facebookBroadcastNotice($notice)
$facebook->api_client->users_setStatus($status, $fbuid, false, true); $facebook->api_client->users_setStatus($status, $fbuid, false, true);
updateProfileBox($facebook, $flink, $notice); updateProfileBox($facebook, $flink, $notice);
} catch(FacebookRestClientException $e) { } catch(FacebookRestClientException $e) {
common_log(LOG_ERROR, $e->getMessage()); common_log(LOG_ERR, $e->getMessage());
return false; return false;
// Should we remove flink if this fails? // Should we remove flink if this fails?

2
lib/jabber.php
View File

@@ -114,7 +114,7 @@ function jabber_connect($resource=null)
try { try {
$conn->connect(true); // true = persistent connection $conn->connect(true); // true = persistent connection
} catch (XMPPHP_Exception $e) { } catch (XMPPHP_Exception $e) {
common_log(LOG_ERROR, $e->getMessage()); common_log(LOG_ERR, $e->getMessage());
return false; return false;
} }