summaryrefslogtreecommitdiff
path: root/lib/twitter.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-08-28 06:00:30 +0000
committerZach Copley <zach@controlyourself.ca>2009-08-28 06:00:30 +0000
commit36b6ef8d05bf6e4290894f9677cc9618a9bfd486 (patch)
tree8ef38d8b78ea692bab5baee25a33d6fa24469567 /lib/twitter.php
parent51adf00bd80253322b473ab199e5b97dd4951d5c (diff)
Abstract the Twitter basic auth stuff into its own client class
Diffstat (limited to 'lib/twitter.php')
-rw-r--r--lib/twitter.php77
1 files changed, 26 insertions, 51 deletions
diff --git a/lib/twitter.php b/lib/twitter.php
index d63384fc9..b734d22d8 100644
--- a/lib/twitter.php
+++ b/lib/twitter.php
@@ -218,7 +218,7 @@ function broadcast_oauth($notice, $flink) {
// Notice crossed the great divide
- $msg = sprintf('Twitter bridge posted notice %s to Twitter.',
+ $msg = sprintf('Twitter bridge posted notice %s to Twitter using OAuth.',
$notice->id);
common_log(LOG_INFO, $msg);
@@ -228,70 +228,44 @@ function broadcast_oauth($notice, $flink) {
function broadcast_basicauth($notice, $flink)
{
$user = $flink->getUser();
- $fuser = $flink->getForeignUser();
- $twitter_user = $fuser->nickname;
- $twitter_password = $flink->credentials;
- $uri = 'http://www.twitter.com/statuses/update.json';
+
$statustxt = format_status($notice);
- $options = array(CURLOPT_USERPWD => "$twitter_user:$twitter_password",
- CURLOPT_POST => true,
- CURLOPT_POSTFIELDS =>
- array(
- 'status' => $statustxt,
- 'source' => common_config('integration', 'source')
- ),
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_FAILONERROR => true,
- CURLOPT_HEADER => false,
- CURLOPT_FOLLOWLOCATION => true,
- CURLOPT_USERAGENT => "StatusNet",
- CURLOPT_CONNECTTIMEOUT => 120,
- CURLOPT_TIMEOUT => 120,
-
- # Twitter is strict about accepting invalid "Expect" headers
- CURLOPT_HTTPHEADER => array('Expect:'));
-
- $ch = curl_init($uri);
- curl_setopt_array($ch, $options);
- $data = curl_exec($ch);
- $errmsg = curl_error($ch);
-
- if ($errmsg == 'The requested URL returned error: 401') {
-
- $errmsg = sprintf('User %1$s (user id: %2$s) has an invalid ' .
- 'Twitter basic auth username/password.',
- $user->nickname, $user->id);
- common_log(LOG_WARNING, $errmsg);
+ $client = new TwitterBasicAuthClient($flink);
+ $status = null;
- // Bad credentials. We need to delete the foreign_link
- // to Twitter and inform the user.
+ try {
+ $status = $client->statusesUpdate($statustxt);
+ } catch (BasicAuthCurlException $e) {
- remove_twitter_link($flink);
- return true;
+ if ($e->getMessage() == 'The requested URL returned error: 401') {
- } elseif (!empty($errmsg)) {
+ $errmsg = sprintf('User %1$s (user id: %2$s) has an invalid ' .
+ 'Twitter screen_name/password combo.',
+ $user->nickname, $user->id);
+ common_log(LOG_WARNING, $errmsg);
- $code = curl_errno($ch);
+ remove_twitter_link($flink);
+ return true;
- $msg = "cURL error: $code, '$errmsg' - trying to send notice $notice->id " .
- "to Twitter using basic auth.";
+ } else {
- common_log(LOG_WARNING, $msg);
+ $errmsg = sprintf('cURL error trying to send notice to Twitter ' .
+ 'for user %1$s (user id: %2$s) - ' .
+ 'code: %3$s message: $4$s.',
+ $user->nickname, $user->id,
+ $e->getCode(), $e->getMessage());
+ common_log(LOG_WARNING, $errmsg);
- return false;
+ return false;
+ }
}
- curl_close($ch);
-
- $status = json_decode($data);
-
if (empty($status)) {
$errmsg = sprintf('No data returned by Twitter API when ' .
- 'trying to send update for %1$s (user id %2$s) ' .
- 'using basic auth.',
- $user->nickname, $user->id);
+ 'trying to send update for %1$s (user id %2$s).',
+ $user->nickname, $user->id);
common_log(LOG_WARNING, $errmsg);
return false;
@@ -302,6 +276,7 @@ function broadcast_basicauth($notice, $flink)
common_log(LOG_INFO, $msg);
return true;
+
}
function format_status($notice)