Use cleanValues more consistently (#204)

Author: muesli

Diff for: account.go

@@ -16,7 +16,6 @@ func (a TwitterApi) VerifyCredentials() (ok bool, err error) {
 
 // Get the user object for the authenticated user. Requests /account/verify_credentials
 func (a TwitterApi) GetSelf(v url.Values) (u User, err error) {
-	v = cleanValues(v)
 	response_ch := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account/verify_credentials.json", v, &u, _GET, response_ch}
 	return u, (<-response_ch).err

Diff for: friends_followers.go

@@ -77,12 +77,9 @@ func (a TwitterApi) GetFollowersIds(v url.Values) (c Cursor, err error) {
 // Like GetFollowersIds, but returns a channel instead of a cursor and pre-fetches the remaining results
 // This channel is closed once all values have been fetched
 func (a TwitterApi) GetFollowersIdsAll(v url.Values) (result chan FollowersIdsPage) {
-
 	result = make(chan FollowersIdsPage)
 
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	go func(a TwitterApi, v url.Values, result chan FollowersIdsPage) {
 		// Cursor defaults to the first page ("-1")
 		next_cursor := "-1"
@@ -144,12 +141,9 @@ func (a TwitterApi) GetFriendsList(v url.Values) (c UserCursor, err error) {
 // Like GetFriendsList, but returns a channel instead of a cursor and pre-fetches the remaining results
 // This channel is closed once all values have been fetched
 func (a TwitterApi) GetFriendsListAll(v url.Values) (result chan FriendsPage) {
-
 	result = make(chan FriendsPage)
 
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	go func(a TwitterApi, v url.Values, result chan FriendsPage) {
 		// Cursor defaults to the first page ("-1")
 		next_cursor := "-1"
@@ -175,12 +169,9 @@ func (a TwitterApi) GetFriendsListAll(v url.Values) (result chan FriendsPage) {
 // Like GetFollowersList, but returns a channel instead of a cursor and pre-fetches the remaining results
 // This channel is closed once all values have been fetched
 func (a TwitterApi) GetFollowersListAll(v url.Values) (result chan FollowersPage) {
-
 	result = make(chan FollowersPage)
 
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	go func(a TwitterApi, v url.Values, result chan FollowersPage) {
 		// Cursor defaults to the first page ("-1")
 		next_cursor := "-1"
@@ -214,12 +205,9 @@ func (a TwitterApi) GetFollowersUser(id int64, v url.Values) (c Cursor, err erro
 // Like GetFriendsIds, but returns a channel instead of a cursor and pre-fetches the remaining results
 // This channel is closed once all values have been fetched
 func (a TwitterApi) GetFriendsIdsAll(v url.Values) (result chan FriendsIdsPage) {
-
 	result = make(chan FriendsIdsPage)
 
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	go func(a TwitterApi, v url.Values, result chan FriendsIdsPage) {
 		// Cursor defaults to the first page ("-1")
 		next_cursor := "-1"

Diff for: lists.go

@@ -7,9 +7,7 @@ import (
 
 // CreateList implements /lists/create.json
 func (a TwitterApi) CreateList(name, description string, v url.Values) (list List, err error) {
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	v.Set("name", name)
 	v.Set("description", description)
 
@@ -20,9 +18,7 @@ func (a TwitterApi) CreateList(name, description string, v url.Values) (list Lis
 
 // AddUserToList implements /lists/members/create.json
 func (a TwitterApi) AddUserToList(screenName string, listID int64, v url.Values) (users []User, err error) {
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	v.Set("list_id", strconv.FormatInt(listID, 10))
 	v.Set("screen_name", screenName)
 
@@ -36,9 +32,7 @@ func (a TwitterApi) AddUserToList(screenName string, listID int64, v url.Values)
 // GetListsOwnedBy implements /lists/ownerships.json
 // screen_name, count, and cursor are all optional values
 func (a TwitterApi) GetListsOwnedBy(userID int64, v url.Values) (lists []List, err error) {
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	v.Set("user_id", strconv.FormatInt(userID, 10))
 
 	var listResponse ListResponse
@@ -49,9 +43,7 @@ func (a TwitterApi) GetListsOwnedBy(userID int64, v url.Values) (lists []List, e
 }
 
 func (a TwitterApi) GetListTweets(listID int64, includeRTs bool, v url.Values) (tweets []Tweet, err error) {
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	v.Set("list_id", strconv.FormatInt(listID, 10))
 	v.Set("include_rts", strconv.FormatBool(includeRTs))
 

Diff for: oembed.go

@@ -34,9 +34,7 @@ func (a TwitterApi) GetOEmbed(v url.Values) (o OEmbed, err error) {
 
 // Calls GetOEmbed with the corresponding id. Convenience wrapper for GetOEmbed()
 func (a TwitterApi) GetOEmbedId(id int64, v url.Values) (o OEmbed, err error) {
-	if v == nil {
-		v = url.Values{}
-	}
+	v = cleanValues(v)
 	v.Set("id", strconv.FormatInt(id, 10))
 	resp, err := http.Get(a.baseUrlV1() + "/statuses/oembed.json?" + v.Encode())
 	if err != nil {

Diff for: timeline.go

@@ -9,10 +9,7 @@ import (
 // https://dev.twitter.com/docs/api/1.1/get/statuses/home_timeline
 // By default, include_entities is set to "true"
 func (a TwitterApi) GetHomeTimeline(v url.Values) (timeline []Tweet, err error) {
-	if v == nil {
-		v = url.Values{}
-	}
-
+	v = cleanValues(v)
 	if val := v.Get("include_entities"); val == "" {
 		v.Set("include_entities", "true")
 	}

Diff for: trends.go

@@ -49,7 +49,6 @@ func (a TwitterApi) GetTrendsByPlace(id int64, v url.Values) (trendResp TrendRes
 // https://dev.twitter.com/rest/reference/get/trends/available
 func (a TwitterApi) GetTrendsAvailableLocations(v url.Values) (locations []TrendLocation, err error) {
 	response_ch := make(chan response)
-	v = cleanValues(v)
 	a.queryQueue <- query{a.baseUrl + "/trends/available.json", v, &locations, _GET, response_ch}
 	return locations, (<-response_ch).err
 }

Diff for: webhook.go

@@ -9,7 +9,6 @@ import (
 //only one webhook URL can be registered to an application.
 //https://dev.twitter.com/webhooks/reference/get/account_activity/webhooks
 func (a TwitterApi) GetActivityWebhooks(v url.Values) (u []WebHookResp, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks.json", v, &u, _GET, responseCh}
 	return u, (<-responseCh).err
@@ -30,7 +29,6 @@ type WebHookResp struct {
 //Only one webhook URL can be registered to an application.
 //https://api.twitter.com/1.1/account_activity/webhooks.json
 func (a TwitterApi) SetActivityWebhooks(v url.Values) (u []WebHookResp, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks.json", v, &u, _POST, responseCh}
 	return u, (<-responseCh).err
@@ -39,7 +37,6 @@ func (a TwitterApi) SetActivityWebhooks(v url.Values) (u []WebHookResp, err erro
 //DeleteActivityWebhooks Removes the webhook from the provided application’s configuration.
 //https://dev.twitter.com/webhooks/reference/del/account_activity/webhooks
 func (a TwitterApi) DeleteActivityWebhooks(v url.Values, webhookID string) (u interface{}, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks/" + webhookID + ".json", v, &u, _DELETE, responseCh}
 	return u, (<-responseCh).err
@@ -48,7 +45,6 @@ func (a TwitterApi) DeleteActivityWebhooks(v url.Values, webhookID string) (u in
 //PutActivityWebhooks update webhook which reenables the webhook by setting its status to valid.
 //https://dev.twitter.com/webhooks/reference/put/account_activity/webhooks
 func (a TwitterApi) PutActivityWebhooks(v url.Values, webhookID string) (u interface{}, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks/" + webhookID + ".json", v, &u, _PUT, responseCh}
 	return u, (<-responseCh).err
@@ -58,7 +54,6 @@ func (a TwitterApi) PutActivityWebhooks(v url.Values, webhookID string) (u inter
 //When subscribed, all DM events for the provided user will be sent to the app’s webhook via POST request.
 //https://dev.twitter.com/webhooks/reference/post/account_activity/webhooks/subscriptions
 func (a TwitterApi) SetWHSubscription(v url.Values, webhookID string) (u interface{}, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks/" + webhookID + "/subscriptions.json", v, &u, _POST, responseCh}
 	return u, (<-responseCh).err
@@ -68,7 +63,6 @@ func (a TwitterApi) SetWHSubscription(v url.Values, webhookID string) (u interfa
 //subscribed to the provided user’s Direct Messages.
 //https://dev.twitter.com/webhooks/reference/get/account_activity/webhooks/subscriptions
 func (a TwitterApi) GetWHSubscription(v url.Values, webhookID string) (u interface{}, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks/" + webhookID + "/subscriptions.json", v, &u, _GET, responseCh}
 	return u, (<-responseCh).err
@@ -78,7 +72,6 @@ func (a TwitterApi) GetWHSubscription(v url.Values, webhookID string) (u interfa
 //all DM events for the requesting user will no longer be sent to the webhook URL..
 //https://dev.twitter.com/webhooks/reference/del/account_activity/webhooks
 func (a TwitterApi) DeleteWHSubscription(v url.Values, webhookID string) (u interface{}, err error) {
-	v = cleanValues(v)
 	responseCh := make(chan response)
 	a.queryQueue <- query{a.baseUrl + "/account_activity/webhooks/" + webhookID + "/subscriptions.json", v, &u, _DELETE, responseCh}
 	return u, (<-responseCh).err