Skip to content

Support for images with tweets, thought it would be useful #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zkac054 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support for images with tweets, thought it would be useful #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions application/controllers/tweet_test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,19 @@ function auth()

var_dump($timeline);
}

// This is assuming that this is called from the form on the view and that
// the user has already been validated
function upload_img(){
// Referenced from https://github.com/themattharris/tmhOAuth
$image = "@{$_FILES['image']['tmp_name']};type={$_FILES['image']['type']};filename={$_FILES['image']['name']}";
$data = array(
'media[]' => $image,
'status' => $this->input->post('status')
);

$result = $this->tweet->upload($data);

var_dump($result);
}
}
68 changes: 55 additions & 13 deletions application/libraries/tweet.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,30 +112,41 @@ public function get($url, $params)
return $response;
}

public function post($url, $params)
public function post($url, $params, $multipart = false)
{
// Todo
$post = '';

foreach ( $params['request'] as $k => $v )
{
$post .= "{$k}={$v}&";
if(!$multipart){
foreach ( $params['request'] as $k => $v )
{
$post .= "{$k}={$v}&";
}

$post = substr($post, 0, -1);
}
else{
$post = $params['request'];
}

$post = substr($post, 0, -1);

$this->_initConnection($url, $params);
curl_setopt($this->_ch, CURLOPT_POST, 1);
curl_setopt($this->_ch, CURLOPT_POSTFIELDS, $post);

// Debugging
$f = fopen('/Users/Lee/Desktop/request.txt', 'w');
curl_setopt($this->_ch, CURLOPT_VERBOSE, true);
curl_setopt($this->_ch, CURLOPT_STDERR, $f);
curl_setopt($this->_ch, CURLOPT_SSL_VERIFYPEER, true);

$response = $this->_addCurl($url, $params);

return $response;
return $response;
}

private function _addOauthHeaders(&$ch, $url, $oauthHeaders)
{
$_h = array('Expect:');
$_h = array('Expect:', "Connection: Keep-Alive", "Cache-Control: no-cache", "User-Agent: " . $_SERVER['HTTP_USER_AGENT']);
$urlParts = parse_url($url);
$oauth = 'Authorization: OAuth realm="' . $urlParts['path'] . '",';

Expand All @@ -144,6 +155,7 @@ private function _addOauthHeaders(&$ch, $url, $oauthHeaders)
$oauth .= "{$name}=\"{$value}\",";
}

// Additional headrs
$_h[] = substr($oauth, 0, -1);

curl_setopt($ch, CURLOPT_HTTPHEADER, $_h);
Expand Down Expand Up @@ -284,9 +296,11 @@ class tweetOauth extends tweetConnection {
private $_version = '1.0';
private $_apiUrl = 'http://api.twitter.com';
private $_searchUrl = 'http://search.twitter.com/';
private $_uploadUrl = 'https://upload.twitter.com/1/';
private $_callback = NULL;
private $_errors = array();
private $_enable_debug = FALSE;
private $_multipart = FALSE;

function __construct()
{
Expand All @@ -304,7 +318,7 @@ function __construct()
'access_key' => $this->_getAccessKey(),
'access_secret' => $this->_getAccessSecret()
);

$this->_checkLogin();
}

Expand Down Expand Up @@ -337,6 +351,13 @@ public function call($method, $path, $args = NULL)
return ( $response === NULL ) ? FALSE : $response->_result;
}

public function upload($args = NULL){
$this->_multipart = TRUE;
$response = $this->_httpRequest('POST', $this->_uploadUrl.'statuses/update_with_media.json', $args);

return ( $response === NULL ) ? FALSE : $response->_result;
}

public function search($args = NULL)
{
$response = $this->_httpRequest('GET', $this->_searchUrl.'search.json', $args);
Expand Down Expand Up @@ -503,7 +524,7 @@ protected function _httpRequest($method = null, $url = null, $params = null)
break;

case 'POST':
return $this->_connection->post($url, $params);
return $this->_connection->post($url, $params, $this->_multipart);
break;

case 'PUT':
Expand Down Expand Up @@ -551,6 +572,11 @@ private function _prepareParameters($method = NULL, $url = NULL, $params = NULL)

array_walk($oauth, array($this, '_encode_rfc3986'));

if($this->_multipart){
$request_params = $params;
$params = array();
}

if ( is_array($params) )
{
array_walk($params, array($this, '_encode_rfc3986'));
Expand All @@ -561,7 +587,13 @@ private function _prepareParameters($method = NULL, $url = NULL, $params = NULL)
ksort($encodedParams);

$oauth['oauth_signature'] = $this->_encode_rfc3986($this->_generateSignature($method, $url, $encodedParams));
return array('request' => $params, 'oauth' => $oauth);

if($this->_multipart){
return array('request' => $request_params, 'oauth' => $oauth);
}
else{
return array('request' => $params, 'oauth' => $oauth);
}
}

private function _generateNonce()
Expand All @@ -583,17 +615,27 @@ private function _generateSignature($method = null, $url = null, $params = null)

foreach ($params as $k => $v)
{
$k = $this->_encode_rfc3986($k);
$v = $this->_encode_rfc3986($v);
$concatenatedParams .= "{$k}={$v}&";
}

$concatenatedParams = $this->_encode_rfc3986(substr($concatenatedParams, 0, -1));

// normalize url
$normalizedUrl = $this->_encode_rfc3986($this->_normalizeUrl($url));
// Using the normalized url when uploading generates a 401 issue, yet for other api calls there's not a problem...
if($this->_multipart){
$normalizedUrl = $this->_encode_rfc3986($url);
}
else{
$normalizedUrl = $this->_encode_rfc3986($this->_normalizeUrl($url));
}

$method = $this->_encode_rfc3986($method); // don't need this but why not?

$signatureBaseString = "{$method}&{$normalizedUrl}&{$concatenatedParams}";


return $this->_signString($signatureBaseString);
}

Expand Down