Skip to content

Commit

Permalink
linvi#310 fixed bug that resulted in list update to throw an error
Browse files Browse the repository at this point in the history
  • Loading branch information
linvi committed Sep 9, 2016
1 parent 578af16 commit 996259c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Tweetinvi.Controllers/Properties/Resources.cs
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ internal static class Resources
/// <summary>
/// Looks up a localized string similar to https://api.twitter.com/1.1/lists/update.json?{0}.
/// </summary>
public static string List_Update = "https://api.twitter.com/1.1/lists/update.json?{0}";
public static string List_Update = "https://api.twitter.com/1.1/lists/update.json";

/// <summary>
/// Looks up a localized string similar to https://api.twitter.com/1.1/lists/subscriptions.json?{0}&amp;count={1}.
Expand Down
27 changes: 10 additions & 17 deletions Tweetinvi.Controllers/TwitterLists/TwitterListQueryGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public interface ITwitterListQueryGenerator
string GetUpdateListQuery(ITwitterListUpdateQueryParameters parameters);
string GetDestroyListQuery(ITwitterListIdentifier identifier);
string GetTweetsFromListQuery(IGetTweetsFromListQueryParameters queryParameters);

string GetMembersFromListQuery(ITwitterListIdentifier listIdentifier, int maximumNumberOfMembers);
string GetAddMemberToListQuery(ITwitterListIdentifier listIdentifier, IUserIdentifier userIdentifier);
string GetAddMultipleMembersToListQuery(ITwitterListIdentifier listIdentifier, IEnumerable<IUserIdentifier> userIdentifiers);
Expand Down Expand Up @@ -87,25 +87,18 @@ public string GetUpdateListQuery(ITwitterListUpdateQueryParameters parameters)
_listsQueryValidator.ThrowIfListIdentifierIsNotValid(parameters.TwitterListIdentifier);
_listsQueryValidator.ThrowIfListUpdateParametersIsNotValid(parameters.Parameters);

var queryBuilder = new StringBuilder(Resources.List_Update);

var listIdentifierParameter = _twitterListQueryParameterGenerator.GenerateIdentifierParameter(parameters.TwitterListIdentifier);
var updateQueryParameters = GenerateUpdateAdditionalParameters(parameters.Parameters);
queryBuilder.AddFormattedParameterToQuery(listIdentifierParameter);

var queryParameters = string.Format("{0}{1}", listIdentifierParameter, updateQueryParameters);
return string.Format(Resources.List_Update, queryParameters);
queryBuilder.AddParameterToQuery("mode", parameters.Parameters.PrivacyMode.ToString().ToLowerInvariant());
queryBuilder.AddParameterToQuery("description", parameters.Parameters.Description);
queryBuilder.AddParameterToQuery("name", parameters.Parameters.Name);

return queryBuilder.ToString();
}

private string GenerateUpdateAdditionalParameters(ITwitterListUpdateParameters parameters)
{
var privacyModeParameter = string.Format(Resources.List_PrivacyModeParameter, parameters.PrivacyMode.ToString().ToLower());

var queryParameterBuilder = new StringBuilder(privacyModeParameter);

queryParameterBuilder.AddParameterToQuery("description", parameters.Description);
queryParameterBuilder.AddParameterToQuery("name", parameters.Name);

return queryParameterBuilder.ToString();
}

public string GetDestroyListQuery(ITwitterListIdentifier identifier)
{
_listsQueryValidator.ThrowIfListIdentifierIsNotValid(identifier);
Expand Down Expand Up @@ -233,7 +226,7 @@ public string GetListSubscribersQuery(ITwitterListIdentifier listIdentifier, int
public string GetSubscribeUserToListQuery(ITwitterListIdentifier listIdentifier)
{
_listsQueryValidator.ThrowIfListIdentifierIsNotValid(listIdentifier);

var listIdentifierParameter = _twitterListQueryParameterGenerator.GenerateIdentifierParameter(listIdentifier);
return string.Format(Resources.List_Subscribe, listIdentifierParameter);
}
Expand Down
1 change: 0 additions & 1 deletion Tweetinvi.WebLogic/TwitterRequestHandler.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using System;
using System.Linq;
using System.Net.Http;
using System.Collections.Generic;
using System.IO;
using Tweetinvi.Core;
using Tweetinvi.Core.Credentials;
Expand Down

0 comments on commit 996259c

Please sign in to comment.