Twitter:

- unused module removed;
- copyright update;
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@12575 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 173 insertions, 203 deletions

diff --git a/protocols/Twitter/src/twitter.cpp b/protocols/Twitter/src/twitter.cpp
index 504ec20206..1a762ec08d 100644
--- a/protocols/Twitter/src/twitter.cpp
+++ b/protocols/Twitter/src/twitter.cpp
@@ -1,4 +1,5 @@
 /*

+Copyright © 2012-15 Miranda NG team

 Copyright © 2009 Jim Porter

 

 This program is free software: you can redistribute it and/or modify

@@ -21,53 +22,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "tinyjson.hpp"

 #include <boost/lexical_cast.hpp>

 

-//#include "boost/spirit/include/classic_core.hpp"

-//#include "boost/spirit/include/classic_loops.hpp"

-

 typedef json::grammar<char> js;

 

 // utility functions

 

 template <typename T>

-static T cast_and_decode(boost::any &a,bool allow_null)

+static T cast_and_decode(boost::any &a, bool allow_null)

 {

-	if(allow_null && a.type() == typeid(void))

+	if (allow_null && a.type() == typeid(void))

 		return T();

 	return boost::any_cast<T>(a);

 }

 

 template <>

-static std::string cast_and_decode<std::string>(boost::any &a,bool allow_null)

+static std::string cast_and_decode<std::string>(boost::any &a, bool allow_null)

 {

-	if(allow_null && a.type() == typeid(void))

+	if (allow_null && a.type() == typeid(void))

 		return std::string();

 	std::string s = boost::any_cast<std::string>(a);

 

 	// Twitter *only* encodes < and >, so decode them

 	size_t off;

-	while( (off = s.find("&lt;")) != std::string::npos)

-		s.replace(off,4,"<");

-	while( (off = s.find("&gt;")) != std::string::npos)

-		s.replace(off,4,">");

+	while ((off = s.find("&lt;")) != std::string::npos)

+		s.replace(off, 4, "<");

+	while ((off = s.find("&gt;")) != std::string::npos)

+		s.replace(off, 4, ">");

 

 	return s;

 }

 

 template <typename T>

-static T retrieve(const js::object &o,const std::string &key,bool allow_null = false)

+static T retrieve(const js::object &o, const std::string &key, bool allow_null = false)

 {

 	using boost::any_cast;

 

 	js::object::const_iterator i = o.find(key);

-	if(i == o.end())

-		throw std::exception( ("unable to retrieve key '"+key+"'").c_str());

-	try

-	{

-		return cast_and_decode<T>(*i->second,allow_null);

+	if (i == o.end())

+		throw std::exception(("unable to retrieve key '" + key + "'").c_str());

+	try {

+		return cast_and_decode<T>(*i->second, allow_null);

 	}

-	catch(const boost::bad_any_cast &)

-	{

-		throw std::exception( ("unable to cast key '"+key+"' to target type").c_str());

+	catch (const boost::bad_any_cast &) {

+		throw std::exception(("unable to cast key '" + key + "' to target type").c_str());

 	}

 }

 

@@ -76,27 +72,29 @@ static T retrieve(const js::object &o,const std::string &key,bool allow_null = f
 twitter::twitter() : base_url_("https://api.twitter.com/")

 {}

 

-bool twitter::set_credentials(const std::string &username, const std::wstring &consumerKey, const std::wstring &consumerSecret, 

+bool twitter::set_credentials(const std::string &username, const std::wstring &consumerKey, const std::wstring &consumerSecret,

 	const std::wstring &oauthAccessToken, const std::wstring &oauthAccessTokenSecret, const std::wstring &pin, bool test)

 {

-	username_				= username;

-	consumerKey_			= consumerKey;

-	consumerSecret_			= consumerSecret;

-	oauthAccessToken_		= oauthAccessToken;

+	username_ = username;

+	consumerKey_ = consumerKey;

+	consumerSecret_ = consumerSecret;

+	oauthAccessToken_ = oauthAccessToken;

 	oauthAccessTokenSecret_ = oauthAccessTokenSecret;

 	pin_ = pin;

 

-	if(test)

-		return slurp(base_url_+"1.1/account/verify_credentials.json",http::get).code == 200;

+	if (test)

+		return slurp(base_url_ + "1.1/account/verify_credentials.json", http::get).code == 200;

 	else

 		return true;

 }

 

-http::response twitter::request_token() {

-	return slurp("https://api.twitter.com/oauth/request_token",http::get);

+http::response twitter::request_token()

+{

+	return slurp("https://api.twitter.com/oauth/request_token", http::get);

 }

 

-http::response twitter::request_access_tokens() {

+http::response twitter::request_access_tokens()

+{

 	return slurp("https://api.twitter.com/oauth/access_token", http::get);

 }

 

@@ -123,38 +121,38 @@ const std::string & twitter::get_base_url() const
 	js::array masterIDs; // the list that contains all the users that the user follows

 

 	std::vector<twitter_user> friends;

-   

+

 	while (friendCursor != 0) {

-		http::response resp = slurp(base_url_ + "/1.1/followers/ids.json?cursor=" + friendCursor + "&screen_name=" + username_,http::get);

-		if(resp.code != 200)

-			throw bad_response();

-

-		const js::variant var = json::parse( resp.data.begin(),resp.data.end() ); // pull the data out of the http response

-		if(var->type() == typeid(js::object)) // make sure the parsed data is of type js::object (??)

-		{

-			const js::object &friendIDs = boost::any_cast<js::object>(*var); // cast the object into the type we can use

-			if(friendIDs.find("error") != friendIDs.end()) // don't really know why error should be at the end here?

-				throw std::exception("error while parsing friendIDs object from ids.json");

-

-			// ok need to find out how to convert all the IDs into an array. dunno if i can magically make it happen, or

-			// if i will have to parse it myself and add them one by one :(

-			IDs = retrieve<js::array>(friendIDs,"ids");

-			for(js::array::const_iterator i=IDs.begin(); i!=IDs.end(); ++i) {

-				//debugLogA("friends ID: " + i);

-				// add array to master array

-				js::object one = boost::any_cast<js::object>(**i);

-				masterIDs.push_back(one); // i don't understand this. how do we push into the array? should i just use C++ arrays (list?) and bail on boost?

-			}

+	http::response resp = slurp(base_url_ + "/1.1/followers/ids.json?cursor=" + friendCursor + "&screen_name=" + username_,http::get);

+	if(resp.code != 200)

+	throw bad_response();

 

-			// now we need to pick out the cursor stuff, and keep punching IDs into the array

-		}

-		else {

-			throw std::exception("in buildFriendList(), return type is not js::object");

-		}

+	const js::variant var = json::parse( resp.data.begin(),resp.data.end() ); // pull the data out of the http response

+	if(var->type() == typeid(js::object)) // make sure the parsed data is of type js::object (??)

+	{

+	const js::object &friendIDs = boost::any_cast<js::object>(*var); // cast the object into the type we can use

+	if(friendIDs.find("error") != friendIDs.end()) // don't really know why error should be at the end here?

+	throw std::exception("error while parsing friendIDs object from ids.json");

+

+	// ok need to find out how to convert all the IDs into an array. dunno if i can magically make it happen, or

+	// if i will have to parse it myself and add them one by one :(

+	IDs = retrieve<js::array>(friendIDs,"ids");

+	for(js::array::const_iterator i=IDs.begin(); i!=IDs.end(); ++i) {

+	//debugLogA("friends ID: " + i);

+	// add array to master array

+	js::object one = boost::any_cast<js::object>(**i);

+	masterIDs.push_back(one); // i don't understand this. how do we push into the array? should i just use C++ arrays (list?) and bail on boost?

+	}

+

+	// now we need to pick out the cursor stuff, and keep punching IDs into the array

+	}

+	else {

+	throw std::exception("in buildFriendList(), return type is not js::object");

+	}

 	}

 

 

-}*/

+	}*/

 

 

 std::vector<twitter_user> twitter::get_friends()

@@ -163,36 +161,33 @@ std::vector<twitter_user> twitter::get_friends()
 	//js::array friendArray = buildFriendList();

 

 	std::vector<twitter_user> friends;

-	http::response resp = slurp(base_url_+"1.1/statuses/friends.json",http::get);

+	http::response resp = slurp(base_url_ + "1.1/statuses/friends.json", http::get);

 

-	if(resp.code != 200)

+	if (resp.code != 200)

 		throw bad_response();

 

-	const js::variant var = json::parse( resp.data.begin(),resp.data.end());

-	if(var->type() != typeid(js::array))

+	const js::variant var = json::parse(resp.data.begin(), resp.data.end());

+	if (var->type() != typeid(js::array))

 		throw std::exception("unable to parse response");

 

 	const js::array &list = boost::any_cast<js::array>(*var);

-	for(js::array::const_iterator i=list.begin(); i!=list.end(); ++i)

-	{

-		if((*i)->type() == typeid(js::object))

-		{

+	for (js::array::const_iterator i = list.begin(); i != list.end(); ++i) {

+		if ((*i)->type() == typeid(js::object)) {

 			const js::object &one = boost::any_cast<js::object>(**i);

 

 			twitter_user user;

-			user.username          = retrieve<std::string>(one,"screen_name");

-			user.real_name         = retrieve<std::string>(one,"name",true);

-			user.profile_image_url = retrieve<std::string>(one,"profile_image_url",true);

+			user.username = retrieve<std::string>(one, "screen_name");

+			user.real_name = retrieve<std::string>(one, "name", true);

+			user.profile_image_url = retrieve<std::string>(one, "profile_image_url", true);

 

-			if(one.find("status") != one.end())

-			{

-				js::object &status  = retrieve<js::object>(one,"status");

-				user.status.text    = retrieve<std::string>(status,"text");

+			if (one.find("status") != one.end()) {

+				js::object &status = retrieve<js::object>(one, "status");

+				user.status.text = retrieve<std::string>(status, "text");

 

-				user.status.id      = retrieve<long long>(status,"id");

+				user.status.id = retrieve<long long>(status, "id");

 

-				std::string timestr = retrieve<std::string>(status,"created_at");

-				user.status.time    = parse_time(timestr);

+				std::string timestr = retrieve<std::string>(status, "created_at");

+				user.status.time = parse_time(timestr);

 			}

 

 			friends.push_back(user);

@@ -202,27 +197,26 @@ std::vector<twitter_user> twitter::get_friends()
 	return friends;

 }

 

-bool twitter::get_info(const std::string &name,twitter_user *info)

+bool twitter::get_info(const std::string &name, twitter_user *info)

 {

-	if(!info)

+	if (!info)

 		return false;

 

-	std::string url = base_url_+"1.1/users/show/"+http::url_encode(name)+".json";

+	std::string url = base_url_ + "1.1/users/show/" + http::url_encode(name) + ".json";

 

-	http::response resp = slurp(url,http::get);

-	if(resp.code != 200)

+	http::response resp = slurp(url, http::get);

+	if (resp.code != 200)

 		throw bad_response();

 

-	const js::variant var = json::parse( resp.data.begin(),resp.data.end());

-	if(var->type() == typeid(js::object))

-	{

+	const js::variant var = json::parse(resp.data.begin(), resp.data.end());

+	if (var->type() == typeid(js::object)) {

 		const js::object &user_info = boost::any_cast<js::object>(*var);

-		if(user_info.find("error") != user_info.end())

+		if (user_info.find("error") != user_info.end())

 			return false;

 

-		info->username          = retrieve<std::string>(user_info,"screen_name");

-		info->real_name         = retrieve<std::string>(user_info,"name",true);

-		info->profile_image_url = retrieve<std::string>(user_info,"profile_image_url",true);

+		info->username = retrieve<std::string>(user_info, "screen_name");

+		info->real_name = retrieve<std::string>(user_info, "name", true);

+		info->profile_image_url = retrieve<std::string>(user_info, "profile_image_url", true);

 

 		return true;

 	}

@@ -230,27 +224,26 @@ bool twitter::get_info(const std::string &name,twitter_user *info)
 		return false;

 }

 

-bool twitter::get_info_by_email(const std::string &email,twitter_user *info)

+bool twitter::get_info_by_email(const std::string &email, twitter_user *info)

 {

-	if(!info)

+	if (!info)

 		return false;

 

-	std::string url = base_url_+"1.1/users/show.json?email="+http::url_encode(email);

+	std::string url = base_url_ + "1.1/users/show.json?email=" + http::url_encode(email);

 

-	http::response resp = slurp(url,http::get);

-	if(resp.code != 200)

+	http::response resp = slurp(url, http::get);

+	if (resp.code != 200)

 		throw bad_response();

 

-	js::variant var = json::parse( resp.data.begin(),resp.data.end());

-	if(var->type() == typeid(js::object))

-	{

+	js::variant var = json::parse(resp.data.begin(), resp.data.end());

+	if (var->type() == typeid(js::object)) {

 		const js::object &user_info = boost::any_cast<js::object>(*var);

-		if(user_info.find("error") != user_info.end())

+		if (user_info.find("error") != user_info.end())

 			return false;

 

-		info->username          = retrieve<std::string>(user_info,"screen_name");

-		info->real_name         = retrieve<std::string>(user_info,"name",true);

-		info->profile_image_url = retrieve<std::string>(user_info,"profile_image_url",true);

+		info->username = retrieve<std::string>(user_info, "screen_name");

+		info->real_name = retrieve<std::string>(user_info, "name", true);

+		info->profile_image_url = retrieve<std::string>(user_info, "profile_image_url", true);

 

 		return true;

 	}

@@ -260,27 +253,26 @@ bool twitter::get_info_by_email(const std::string &email,twitter_user *info)
 

 twitter_user twitter::add_friend(const std::string &name)

 {

-	std::string url = base_url_+"1.1/friendships/create/"+http::url_encode(name)+".json";

+	std::string url = base_url_ + "1.1/friendships/create/" + http::url_encode(name) + ".json";

 

 	twitter_user ret;

-	http::response resp = slurp(url,http::post);

-	if(resp.code != 200)

+	http::response resp = slurp(url, http::post);

+	if (resp.code != 200)

 		throw bad_response();

 

-	js::variant var = json::parse( resp.data.begin(),resp.data.end());

-	if(var->type() != typeid(js::object))

+	js::variant var = json::parse(resp.data.begin(), resp.data.end());

+	if (var->type() != typeid(js::object))

 		throw std::exception("unable to parse response");

 

 	const js::object &user_info = boost::any_cast<js::object>(*var);

-	ret.username          = retrieve<std::string>(user_info,"screen_name");

-	ret.real_name         = retrieve<std::string>(user_info,"name",true);

-	ret.profile_image_url = retrieve<std::string>(user_info,"profile_image_url",true);

+	ret.username = retrieve<std::string>(user_info, "screen_name");

+	ret.real_name = retrieve<std::string>(user_info, "name", true);

+	ret.profile_image_url = retrieve<std::string>(user_info, "profile_image_url", true);

 

-	if(user_info.find("status") != user_info.end())

-	{

+	if (user_info.find("status") != user_info.end()) {

 		// TODO: fill in more fields

-		const js::object &status = retrieve<js::object>(user_info,"status");

-		ret.status.text          = retrieve<std::string>(status,"text");

+		const js::object &status = retrieve<js::object>(user_info, "status");

+		ret.status.text = retrieve<std::string>(status, "text");

 	}

 

 	return ret;

@@ -288,106 +280,94 @@ twitter_user twitter::add_friend(const std::string &name)
 

 void twitter::remove_friend(const std::string &name)

 {

-	std::string url = base_url_+"1.1/friendships/destroy/"+http::url_encode(name)+".json";

+	std::string url = base_url_ + "1.1/friendships/destroy/" + http::url_encode(name) + ".json";

 

-	slurp(url,http::post);

+	slurp(url, http::post);

 }

 

 void twitter::set_status(const std::string &text)

 {

-	if(text.size())

-	{

-/*		slurp(base_url_+"statuses/update.json",http::post,

-			"status="+http::url_encode(text)+

-			"&source=mirandang");*/

-

-		//MessageBox(NULL, UTF8ToWide(text).c_str(), NULL, MB_OK);

+	if (text.size()) {

 		std::wstring wTweet = UTF8ToWide(text);

 		OAuthParameters postParams;

 		postParams[L"status"] = UrlEncode(wTweet);

 

-		slurp(base_url_+"1.1/statuses/update.json",http::post, postParams);

+		slurp(base_url_ + "1.1/statuses/update.json", http::post, postParams);

 	}

 }

 

-void twitter::send_direct(const std::string &name,const std::string &text)

+void twitter::send_direct(const std::string &name, const std::string &text)

 {

 	std::wstring temp = UTF8ToWide(text);

 	OAuthParameters postParams;

 	postParams[L"text"] = UrlEncode(temp);

 	postParams[L"screen_name"] = UTF8ToWide(name);

-	slurp(base_url_+"1.1/direct_messages/new.json", http::post,  postParams);

+	slurp(base_url_ + "1.1/direct_messages/new.json", http::post, postParams);

 }

 

-std::vector<twitter_user> twitter::get_statuses(int count,twitter_id id)

+std::vector<twitter_user> twitter::get_statuses(int count, twitter_id id)

 {

 	using boost::lexical_cast;

 	std::vector<twitter_user> statuses;

 

-	std::string url = base_url_+"1.1/statuses/home_timeline.json?count="+

+	std::string url = base_url_ + "1.1/statuses/home_timeline.json?count=" +

 		lexical_cast<std::string>(count);

-	if(id != 0)

-		url += "&since_id="+boost::lexical_cast<std::string>(id);

+	if (id != 0)

+		url += "&since_id=" + boost::lexical_cast<std::string>(id);

 

-	http::response resp = slurp(url,http::get);

-	if(resp.code != 200)

+	http::response resp = slurp(url, http::get);

+	if (resp.code != 200)

 		throw bad_response();

 

-	js::variant var = json::parse( resp.data.begin(),resp.data.end());

-	if(var->type() != typeid(js::array))

+	js::variant var = json::parse(resp.data.begin(), resp.data.end());

+	if (var->type() != typeid(js::array))

 		throw std::exception("unable to parse response");

 

 	const js::array &list = boost::any_cast<js::array>(*var);

-	for(js::array::const_iterator i=list.begin(); i!=list.end(); ++i)

-	{

-		if((*i)->type() == typeid(js::object))

-		{

-			const js::object &one  = boost::any_cast<js::object>(**i);

-			const js::object &user = retrieve<js::object>(one,"user");

+	for (js::array::const_iterator i = list.begin(); i != list.end(); ++i) {

+		if ((*i)->type() == typeid(js::object)) {

+			const js::object &one = boost::any_cast<js::object>(**i);

+			const js::object &user = retrieve<js::object>(one, "user");

 

 			twitter_user u;

-			u.username = retrieve<std::string>(user,"screen_name");

-			u.profile_image_url = retrieve<std::string>(user,"profile_image_url");

+			u.username = retrieve<std::string>(user, "screen_name");

+			u.profile_image_url = retrieve<std::string>(user, "profile_image_url");

 

 			// the tweet will be truncated unless we take action.  i hate you twitter API

-			if(one.find("retweeted_status") != one.end())

-			{ 

+			if (one.find("retweeted_status") != one.end()) {

 				//MessageBox(NULL, L"retweeted: TRUE", L"long tweets", MB_OK);

 				// here we grab the "retweeted_status" um.. section?  it's in here that all the info we need is

 				// at this point the user will get no tweets and an error popup if the tweet happens to be exactly 140 chars, start with

 				// "RT @", end in " ...", and notactually be a real retweet.  it's possible but unlikely, wish i knew how to get

 				// the retweet_count variable to work :(

-				const js::object &Retweet = retrieve<js::object>(one,"retweeted_status");

-				const js::object &RTUser = retrieve<js::object>(Retweet,"user");

+				const js::object &Retweet = retrieve<js::object>(one, "retweeted_status");

+				const js::object &RTUser = retrieve<js::object>(Retweet, "user");

 

-				std::string retweeteesName = retrieve<std::string>(RTUser,"screen_name"); // the user that is being retweeted

-				std::string retweetText = retrieve<std::string>(Retweet,"text"); // their tweet in all it's untruncated glory

+				std::string retweeteesName = retrieve<std::string>(RTUser, "screen_name"); // the user that is being retweeted

+				std::string retweetText = retrieve<std::string>(Retweet, "text"); // their tweet in all it's untruncated glory

 

 				// fix "&amp;" in the tweets :(

-				for(size_t pos = 0;(pos = retweetText.find("&amp;", pos)) != std::string::npos;pos++)

-				{

+				for (size_t pos = 0; (pos = retweetText.find("&amp;", pos)) != std::string::npos; pos++) {

 					retweetText.replace(pos, 5, "&");

 				}

 

 				u.status.text = "RT @" + retweeteesName + " " + retweetText; // mash it together in some format people will understand

 			}

-            else

-			{

+			else {

 				// if it's not truncated, then the twitter API returns the native RT correctly anyway,        

-				std::string rawText = retrieve<std::string>(one,"text");

+				std::string rawText = retrieve<std::string>(one, "text");

 				// ok here i'm trying some way to fix all the "&amp;" things that are showing up

 				// i dunno why it's happening, so i'll just find and replace each occurance :/

-				for(size_t pos = 0;(pos = rawText.find("&amp;", pos)) != std::string::npos;pos++)

-				{

+				for (size_t pos = 0; (pos = rawText.find("&amp;", pos)) != std::string::npos; pos++) {

 					rawText.replace(pos, 5, "&");

 				}

 

 				u.status.text = rawText;

 			}

 

-			u.status.id         = retrieve<long long>(one,"id");

-			std::string timestr = retrieve<std::string>(one,"created_at");

-			u.status.time       = parse_time(timestr);

+			u.status.id = retrieve<long long>(one, "id");

+			std::string timestr = retrieve<std::string>(one, "created_at");

+			u.status.time = parse_time(timestr);

 

 			statuses.push_back(u);

 		}

@@ -401,38 +381,35 @@ std::vector<twitter_user> twitter::get_direct(twitter_id id)
 {

 	std::vector<twitter_user> messages;

 

-	std::string url = base_url_+"1.1/direct_messages.json";

-	if(id != 0)

-		url += "?since_id="+boost::lexical_cast<std::string>(id);

+	std::string url = base_url_ + "1.1/direct_messages.json";

+	if (id != 0)

+		url += "?since_id=" + boost::lexical_cast<std::string>(id);

 

-	http::response resp = slurp(url,http::get);

-	if(resp.code != 200)

+	http::response resp = slurp(url, http::get);

+	if (resp.code != 200)

 		throw bad_response();

 

-	js::variant var = json::parse( resp.data.begin(),resp.data.end());

-	if(var->type() != typeid(js::array))

+	js::variant var = json::parse(resp.data.begin(), resp.data.end());

+	if (var->type() != typeid(js::array))

 		throw std::exception("unable to parse response");

 

 	const js::array &list = boost::any_cast<js::array>(*var);

-	for(js::array::const_iterator i=list.begin(); i!=list.end(); ++i)

-	{

-		if((*i)->type() == typeid(js::object))

-		{

+	for (js::array::const_iterator i = list.begin(); i != list.end(); ++i) {

+		if ((*i)->type() == typeid(js::object)) {

 			const js::object &one = boost::any_cast<js::object>(**i);

 

 			twitter_user u;

-			u.username = retrieve<std::string>(one,"sender_screen_name");

+			u.username = retrieve<std::string>(one, "sender_screen_name");

 

-			u.status.text       = retrieve<std::string>(one,"text");

-			u.status.id         = retrieve<long long>(one,"id");

-			std::string timestr = retrieve<std::string>(one,"created_at");

-			u.status.time       = parse_time(timestr);

+			u.status.text = retrieve<std::string>(one, "text");

+			u.status.id = retrieve<long long>(one, "id");

+			std::string timestr = retrieve<std::string>(one, "created_at");

+			u.status.time = parse_time(timestr);

 

 			messages.push_back(u);

 		}

 	}

 

-

 	return messages;

 }

 

@@ -441,27 +418,24 @@ string twitter::urlencode(const string &c)
 

 	string escaped;

 	size_t max = c.length();

-	for(int i=0; i<max; i++)

-	{

-		if ( (48 <= c[i] && c[i] <= 57) ||//0-9

+	for (int i = 0; i < max; i++) {

+		if ((48 <= c[i] && c[i] <= 57) ||//0-9

 			(65 <= c[i] && c[i] <= 90) ||//ABC...XYZ

 			(97 <= c[i] && c[i] <= 122) || //abc...xyz

-			(c[i]=='~' || c[i]=='-' || c[i]=='_' || c[i]=='.')

-			)

-		{

-			escaped.append( &c[i], 1);

+			(c[i] == '~' || c[i] == '-' || c[i] == '_' || c[i] == '.')

+			) {

+			escaped.append(&c[i], 1);

 		}

-		else

-		{

+		else {

 			escaped.append("%");

-			escaped.append( char2hex(c[i]));//converts char 255 to string "FF"

+			escaped.append(char2hex(c[i]));//converts char 255 to string "FF"

 		}

 	}

 	return escaped;

 }

 

 

-wstring twitter::UrlEncode( const wstring& url ) 

+wstring twitter::UrlEncode(const wstring& url)

 {

 	// multiple encodings r sux

 	return UTF8ToWide(urlencode(WideToUTF8(url)));

@@ -481,18 +455,18 @@ wstring twitter::UrlEncode( const wstring& url )
 //

 //  unreserved = ALPHA, DIGIT, '-', '.', '_', '~'

 

-string twitter::char2hex( char dec )

+string twitter::char2hex(char dec)

 {

-	char dig1 = (dec&0xF0)>>4;

-	char dig2 = (dec&0x0F);

-	if ( 0<= dig1 && dig1<= 9) dig1+=48;    //0,48 in ascii

-	if (10<= dig1 && dig1<=15) dig1+=65-10; //A,65 in ascii

-	if ( 0<= dig2 && dig2<= 9) dig2+=48;

-	if (10<= dig2 && dig2<=15) dig2+=65-10;

+	char dig1 = (dec & 0xF0) >> 4;

+	char dig2 = (dec & 0x0F);

+	if (0 <= dig1 && dig1 <= 9) dig1 += 48;    //0,48 in ascii

+	if (10 <= dig1 && dig1 <= 15) dig1 += 65 - 10; //A,65 in ascii

+	if (0 <= dig2 && dig2 <= 9) dig2 += 48;

+	if (10 <= dig2 && dig2 <= 15) dig2 += 65 - 10;

 

 	string r;

-	r.append( &dig1, 1);

-	r.append( &dig2, 1);

+	r.append(&dig1, 1);

+	r.append(&dig2, 1);

 	return r;

 }

 

@@ -506,13 +480,12 @@ time_t timegm(struct tm *t)
 	return mktime(t);

 }

 

-static char *month_names[] = { "Jan","Feb","Mar","Apr","May","Jun",

-                               "Jul","Aug","Sep","Oct","Nov","Dec" };

+static char *month_names[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };

 

 int parse_month(const char *m)

 {

-	for(int i=0; i<12; i++)

-		if(strcmp(month_names[i],m) == 0)

+	for (int i = 0; i < 12; i++)

+		if (strcmp(month_names[i], m) == 0)

 			return i;

 

 	return -1;

@@ -521,18 +494,15 @@ int parse_month(const char *m)
 time_t parse_time(const std::string &s)

 {

 	struct tm t;

-	char day[4],month[4];

+	char day[4], month[4];

 	char plus;

 	int zone;

-	if(sscanf(s.c_str(),"%3s %3s %d %d:%d:%d %c%d %d",

-		day,month,&t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec,

-		&plus,&zone,&t.tm_year) == 9)

-	{

+	if (sscanf(s.c_str(), "%3s %3s %d %d:%d:%d %c%d %d", day, month, &t.tm_mday, &t.tm_hour, &t.tm_min, &t.tm_sec, &plus, &zone, &t.tm_year) == 9) {

 		t.tm_year -= 1900;

 		t.tm_mon = parse_month(month);

-		if(t.tm_mon == -1)

+		if (t.tm_mon == -1)

 			return 0;

 		return timegm(&t);

 	}

 	return 0;

-}
\ No newline at end of file
+}