wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitorious.org:statusnet/mainline

Browse Source
This commit is contained in:
Brion Vibber 2010-05-19 15:46:39 -07:00
commit ad651c3535
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/Facebook/facebookutil.php
View File

@ -104,9 +104,13 @@ function facebookBroadcastNotice($notice)
$status = "$prefix $notice->content"; $status = "$prefix $notice->content";
common_debug("FacebookPlugin - checking for publish_stream permission for user $user->id");
$can_publish = $facebook->api_client->users_hasAppPermission('publish_stream', $can_publish = $facebook->api_client->users_hasAppPermission('publish_stream',
$fbuid); $fbuid);
common_debug("FacebookPlugin - checking for status_update permission for user $user->id");
$can_update = $facebook->api_client->users_hasAppPermission('status_update', $can_update = $facebook->api_client->users_hasAppPermission('status_update',
$fbuid); $fbuid);
if (!empty($attachments) && $can_publish == 1) { if (!empty($attachments) && $can_publish == 1) {
@ -114,15 +118,15 @@ function facebookBroadcastNotice($notice)
$facebook->api_client->stream_publish($status, $fbattachment, $facebook->api_client->stream_publish($status, $fbattachment,
null, null, $fbuid); null, null, $fbuid);
common_log(LOG_INFO, common_log(LOG_INFO,
"Posted notice $notice->id w/attachment " . "FacebookPlugin - Posted notice $notice->id w/attachment " .
"to Facebook user's stream (fbuid = $fbuid)."); "to Facebook user's stream (fbuid = $fbuid).");
} elseif ($can_update == 1 || $can_publish == 1) { } elseif ($can_update == 1 || $can_publish == 1) {
$facebook->api_client->users_setStatus($status, $fbuid, false, true); $facebook->api_client->users_setStatus($status, $fbuid, false, true);
common_log(LOG_INFO, common_log(LOG_INFO,
"Posted notice $notice->id to Facebook " . "FacebookPlugin - Posted notice $notice->id to Facebook " .
"as a status update (fbuid = $fbuid)."); "as a status update (fbuid = $fbuid).");
} else { } else {
$msg = "Not sending notice $notice->id to Facebook " . $msg = "FacebookPlugin - Not sending notice $notice->id to Facebook " .
"because user $user->nickname hasn't given the " . "because user $user->nickname hasn't given the " .
'Facebook app \'status_update\' or \'publish_stream\' permission.'; 'Facebook app \'status_update\' or \'publish_stream\' permission.';
common_log(LOG_WARNING, $msg); common_log(LOG_WARNING, $msg);
@ -138,7 +142,7 @@ function facebookBroadcastNotice($notice)
$code = $e->getCode(); $code = $e->getCode();
$msg = "Facebook returned error code $code: " . $msg = "FacebookPlugin - Facebook returned error code $code: " .
$e->getMessage() . ' - ' . $e->getMessage() . ' - ' .
"Unable to update Facebook status (notice $notice->id) " . "Unable to update Facebook status (notice $notice->id) " .
"for $user->nickname (user id: $user->id)!"; "for $user->nickname (user id: $user->id)!";