Skip to content

implemented NextTweetsAsync for GetTweetsFromUserId #46

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
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

implemented NextTweetsAsync for GetTweetsFromUserId #46

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cd70753
implemented NextTweetsAsync for GetTweetsFromUserId
bmclane Dec 14, 2022
60489ca
refactored ParseArrayData to fix internal author parsing on tweets
bmclane Dec 14, 2022
3935c75
updated NextTweetsAsync
bmclane Dec 14, 2022
5a402e1
refactored to use response list for user and tweets
bmclane Dec 15, 2022
03b536f
fix commit
bmclane Dec 15, 2022
95a8dca
remove next token from GetTweets
bmclane Dec 15, 2022
4bf7aaf
removed duplicate code inside IList requests
bmclane Dec 16, 2022
db80b1c
renamed RList to RArray, RList should be used for Twitters Lists API
bmclane Dec 16, 2022
ce3515b
implemented previous token
bmclane Dec 16, 2022
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
141 changes: 95 additions & 46 deletions src/Client/TwitterClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ private static void InternalIncludesParse<T>(Answer<T[]> answer)
}
}

private T[] ParseArrayData<T>(string json)
private Answer<T[]> ParseArrayData<T>(string json)
{
var answer = JsonSerializer.Deserialize<Answer<T[]>>(json, _jsonOptions);
if (answer.Detail != null || answer.Errors != null)
Expand All @@ -138,10 +138,11 @@ private T[] ParseArrayData<T>(string json)
}
if (answer.Data == null)
{
return Array.Empty<T>();
answer.Data = Array.Empty<T>();
return answer;
}
InternalIncludesParse(answer);
return answer.Data;
return answer;
}

private Answer<T> ParseData<T>(string json)
Expand Down Expand Up @@ -193,7 +194,9 @@ private void BuildRateLimit(HttpResponseHeaders headers, Endpoint endpoint)
public async Task<Tweet> GetTweetAsync(string id, TweetSearchOptions options = null)
{
options ??= new();
var res = await _httpClient.GetAsync(_baseUrl + "tweets/" + HttpUtility.UrlEncode(id) + "?" + options.Build(true));
var query = _baseUrl + "tweets/" + HttpUtility.UrlEncode(id) + "?" + options.Build(true);

var res = await _httpClient.GetAsync(query);
BuildRateLimit(res.Headers, Endpoint.GetTweetById);
return ParseData<Tweet>(await res.Content.ReadAsStringAsync()).Data;
}
Expand All @@ -205,34 +208,51 @@ public async Task<Tweet> GetTweetAsync(string id, TweetSearchOptions options = n
public async Task<Tweet[]> GetTweetsAsync(string[] ids, TweetSearchOptions options = null)
{
options ??= new();

var res = await _httpClient.GetAsync(_baseUrl + "tweets?ids=" + string.Join(",", ids.Select(x => HttpUtility.UrlEncode(x))) + "&" + options.Build(true));
BuildRateLimit(res.Headers, Endpoint.GetTweetsByIds);
return ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
return ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync()).Data;

}

/// <summary>
/// Get the latest tweets of an user
/// </summary>
/// <param name="userId">Username of the user you want the tweets of</param>
public async Task<Tweet[]> GetTweetsFromUserIdAsync(string userId, TweetSearchOptions options = null)
public async Task<RList<Tweet>> GetTweetsFromUserIdAsync(string userId, TweetSearchOptions options = null)
{
options ??= new();
var res = await _httpClient.GetAsync(_baseUrl + "users/" + HttpUtility.HtmlEncode(userId) + "/tweets?" + options.Build(true));
options ??= new();
var query = _baseUrl + "users/" + HttpUtility.HtmlEncode(userId) + "/tweets?" + options.Build(true);

var res = await _httpClient.GetAsync(query);
BuildRateLimit(res.Headers, Endpoint.UserTweetTimeline);
return ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
var data = ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
return new()
{
Data = data.Data,
NextAsync = data.Meta == null ? null : (data.Meta.NextToken == null ? null : async () => await NextAsync<Tweet>(query, data.Meta.NextToken, Endpoint.UserTweetTimeline))
};
}


/// <summary>
/// Get the latest tweets for an expression
/// </summary>
/// <param name="expression">An expression to build the query <seealso cref="https://developer.twitter.com/en/docs/twitter-api/tweets/search/integrate/build-a-query"/></param>
/// <param name="options">properties send with the tweet</param>
public async Task<Tweet[]> GetRecentTweets(Expression expression, TweetSearchOptions options = null)
public async Task<RList<Tweet>> GetRecentTweets(Expression expression, TweetSearchOptions options = null)
{
options ??= new();
var res = await _httpClient.GetAsync(_baseUrl + "tweets/search/recent?query=" + HttpUtility.UrlEncode(expression.ToString()) + "&" + options.Build(true));
var query = _baseUrl + "tweets/search/recent?query=" + HttpUtility.UrlEncode(expression.ToString()) + "&" + options.Build(true);

var res = await _httpClient.GetAsync(query);
BuildRateLimit(res.Headers, Endpoint.RecentSearch);
return ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
var data = ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
return new()
{
Data = data.Data,
NextAsync = data.Meta == null ? null : (data.Meta.NextToken == null ? null : async () => await NextAsync<Tweet>(query, data.Meta.NextToken, Endpoint.RecentSearch))
};
}

/// <summary>
Expand All @@ -241,12 +261,19 @@ public async Task<Tweet[]> GetRecentTweets(Expression expression, TweetSearchOpt
/// </summary>
/// <param name="expression">An expression to build the query <seealso cref="https://developer.twitter.com/en/docs/twitter-api/tweets/search/integrate/build-a-query"/></param>
/// <param name="options">properties send with the tweet</param>
public async Task<Tweet[]> GetAllTweets(Expression expression, TweetSearchOptions options = null)
public async Task<RList<Tweet>> GetAllTweets(Expression expression, TweetSearchOptions options = null)
{
options ??= new();
var res = await _httpClient.GetAsync(_baseUrl + "tweets/search/all?query=" + HttpUtility.UrlEncode(expression.ToString()) + "&" + options.Build(true));
var query = _baseUrl + "tweets/search/all?query=" + HttpUtility.UrlEncode(expression.ToString()) + "&" + options.Build(true);

var res = await _httpClient.GetAsync(query);
BuildRateLimit(res.Headers, Endpoint.FullArchiveSearch);
return ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
var data = ParseArrayData<Tweet>(await res.Content.ReadAsStringAsync());
return new()
{
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<Tweet>(query, data.Meta.NextToken, Endpoint.FullArchiveSearch)
};
}

#endregion TweetSearch
Expand All @@ -257,7 +284,7 @@ public async Task<StreamInfo[]> GetInfoTweetStreamAsync()
{
var res = await _httpClient.GetAsync(_baseUrl + "tweets/search/stream/rules");
BuildRateLimit(res.Headers, Endpoint.ListingFilters);
return ParseArrayData<StreamInfo>(await res.Content.ReadAsStringAsync());
return ParseArrayData<StreamInfo>(await res.Content.ReadAsStringAsync()).Data;
}

private StreamReader _reader;
Expand Down Expand Up @@ -346,7 +373,7 @@ public async Task<StreamInfo[]> AddTweetStreamAsync(params StreamRequest[] reque
var content = new StringContent(JsonSerializer.Serialize(new StreamRequestAdd { Add = request }, _jsonOptions), Encoding.UTF8, "application/json");
var res = await _httpClient.PostAsync(_baseUrl + "tweets/search/stream/rules", content);
BuildRateLimit(res.Headers, Endpoint.AddingDeletingFilters);
return ParseArrayData<StreamInfo>(await res.Content.ReadAsStringAsync());
return ParseArrayData<StreamInfo>(await res.Content.ReadAsStringAsync()).Data;
}

/// <summary>
Expand Down Expand Up @@ -386,7 +413,7 @@ public async Task<User[]> GetUsersAsync(string[] usernames, UserSearchOptions op
options ??= new();
var res = await _httpClient.GetAsync(_baseUrl + $"users/by?usernames={string.Join(",", usernames.Select(x => HttpUtility.UrlEncode(x)))}&{options.Build(false)}");
BuildRateLimit(res.Headers, Endpoint.GetUsersByNames);
return ParseArrayData<User>(await res.Content.ReadAsStringAsync());
return ParseArrayData<User>(await res.Content.ReadAsStringAsync()).Data;
}

/// <summary>
Expand All @@ -410,35 +437,20 @@ public async Task<User[]> GetUsersByIdsAsync(string[] ids, UserSearchOptions opt
options ??= new();
var res = await _httpClient.GetAsync(_baseUrl + $"users?ids={string.Join(",", ids.Select(x => HttpUtility.UrlEncode(x)))}&{options.Build(false)}");
BuildRateLimit(res.Headers, Endpoint.GetUsersByIds);
return ParseArrayData<User>(await res.Content.ReadAsStringAsync());
return ParseArrayData<User>(await res.Content.ReadAsStringAsync()).Data;
}

#endregion UserSearch

#region GetUsers

/// <summary>
/// General method for getting the next page of users
/// </summary>
/// <returns></returns>
private async Task<RUsers> NextUsersAsync(string baseQuery, string token, Endpoint endpoint)
{
var res = await _httpClient.GetAsync(baseQuery + (!baseQuery.EndsWith("?") ? "&" : "") + "pagination_token=" + token);
var data = ParseData<User[]>(await res.Content.ReadAsStringAsync());
BuildRateLimit(res.Headers, endpoint);
return new()
{
Users = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextUsersAsync(baseQuery, data.Meta.NextToken, endpoint)
};
}

/// <summary>
/// Get the follower of an user
/// </summary>
/// <param name="id">ID of the user</param>
/// <param name="limit">Max number of result, max is 1000</param>
public async Task<RUsers> GetFollowersAsync(string id, UserSearchOptions options = null)
public async Task<RList<User>> GetFollowersAsync(string id, UserSearchOptions options = null)
{
options ??= new();
var query = _baseUrl + $"users/{HttpUtility.UrlEncode(id)}/followers?{options.Build(false)}";
Expand All @@ -447,8 +459,8 @@ public async Task<RUsers> GetFollowersAsync(string id, UserSearchOptions options
BuildRateLimit(res.Headers, Endpoint.GetFollowersById);
return new()
{
Users = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextUsersAsync(query, data.Meta.NextToken, Endpoint.GetFollowersById)
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<User>(query, data.Meta.NextToken, Endpoint.GetFollowersById)
};
}

Expand All @@ -457,7 +469,7 @@ public async Task<RUsers> GetFollowersAsync(string id, UserSearchOptions options
/// </summary>
/// <param name="id">ID of the user</param>
/// <param name="limit">Max number of result, max is 1000</param>
public async Task<RUsers> GetFollowingAsync(string id, UserSearchOptions options = null)
public async Task<RList<User>> GetFollowingAsync(string id, UserSearchOptions options = null)
{
options ??= new();
var query = _baseUrl + $"users/{HttpUtility.UrlEncode(id)}/following?{options.Build(false)}";
Expand All @@ -466,8 +478,8 @@ public async Task<RUsers> GetFollowingAsync(string id, UserSearchOptions options
BuildRateLimit(res.Headers, Endpoint.GetFollowingsById);
return new()
{
Users = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextUsersAsync(query, data.Meta.NextToken, Endpoint.GetFollowingsById)
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<User>(query, data.Meta.NextToken, Endpoint.GetFollowingsById)
};
}

Expand All @@ -476,7 +488,7 @@ public async Task<RUsers> GetFollowingAsync(string id, UserSearchOptions options
/// </summary>
/// <param name="id">ID of the tweet</param>
/// <param name="options">This parameter enables you to select which specific user fields will deliver with each returned users objects. You can also set a Limit per page. Max is 100</param>
public async Task<RUsers> GetLikesAsync(string id, UserSearchOptions options = null)
public async Task<RList<User>> GetLikesAsync(string id, UserSearchOptions options = null)
{
options ??= new();
var query = _baseUrl + $"tweets/{HttpUtility.UrlEncode(id)}/liking_users?{options.Build(false)}";
Expand All @@ -485,8 +497,8 @@ public async Task<RUsers> GetLikesAsync(string id, UserSearchOptions options = n
BuildRateLimit(res.Headers, Endpoint.UsersLiked);
return new()
{
Users = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextUsersAsync(query, data.Meta.NextToken, Endpoint.UsersLiked)
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<User>(query, data.Meta.NextToken, Endpoint.UsersLiked)
};
}

Expand All @@ -495,7 +507,7 @@ public async Task<RUsers> GetLikesAsync(string id, UserSearchOptions options = n
/// </summary>
/// <param name="id">ID of the tweet</param>
/// <param name="options">This parameter enables you to select which specific user fields will deliver with each returned users objects. You can also set a Limit per page. Max is 100</param>
public async Task<RUsers> GetRetweetsAsync(string id, UserSearchOptions options = null)
public async Task<RList<User>> GetRetweetsAsync(string id, UserSearchOptions options = null)
{
options ??= new();
var query = _baseUrl + $"tweets/{HttpUtility.UrlEncode(id)}/retweeted_by?{options.Build(false)}";
Expand All @@ -504,13 +516,50 @@ public async Task<RUsers> GetRetweetsAsync(string id, UserSearchOptions options
BuildRateLimit(res.Headers, Endpoint.RetweetsLookup);
return new()
{
Users = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextUsersAsync(query, data.Meta.NextToken, Endpoint.RetweetsLookup)
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<User>(query, data.Meta.NextToken, Endpoint.RetweetsLookup)
};
}

#endregion Users


#region General


/// <summary>
/// General method for getting the next page with meta token
/// </summary>
/// <returns></returns>
private async Task<RList<T>> RequestList<T>(string baseQuery, string token, Endpoint endpoint)
{
var res = await _httpClient.GetAsync(baseQuery + (!baseQuery.EndsWith("?") ? "&" : "") + "pagination_token=" + token);
var data = ParseArrayData<T>(await res.Content.ReadAsStringAsync());
BuildRateLimit(res.Headers, endpoint);
return new()
{
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<T>(baseQuery, data.Meta.NextToken, endpoint)
};
}

/// <summary>
/// General method for getting the next page with meta token
/// </summary>
/// <returns></returns>
private async Task<RList<T>> NextAsync<T>(string baseQuery, string token, Endpoint endpoint)
{
var res = await _httpClient.GetAsync(baseQuery + (!baseQuery.EndsWith("?") ? "&" : "") + "pagination_token=" + token);
var data = ParseArrayData<T>(await res.Content.ReadAsStringAsync());
BuildRateLimit(res.Headers, endpoint);
return new()
{
Data = data.Data,
NextAsync = data.Meta.NextToken == null ? null : async () => await NextAsync<T>(baseQuery, data.Meta.NextToken, endpoint)
};
}

#endregion
private const string _baseUrl = "https://api.twitter.com/2/";

private readonly HttpClient _httpClient;
Expand Down
16 changes: 16 additions & 0 deletions src/Response/RList.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TwitterSharp.Response.RUser;

namespace TwitterSharp.Response
{
public class RList<T>
{
public T[] Data { get; set; }
public Func<Task<RList<T>>> NextAsync { init; get; }

}
}
11 changes: 0 additions & 11 deletions src/Response/RUser/RUsers.cs
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions test/TestFollow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
using System.Threading.Tasks;
using TwitterSharp.Client;
using TwitterSharp.Request.Option;
using TwitterSharp.Response;
using TwitterSharp.Response.RUser;

namespace TwitterSharp.UnitTests
{
[TestClass]
public class TestFollow
{
private async Task<bool> ContainsFollowAsync(string username, RUsers rUsers)
private async Task<bool> ContainsFollowAsync(string username, RList<User> rUsers)
{
if (rUsers.Users.Any(x => x.Username == username))
if (rUsers.Data.Any(x => x.Username == username))
{
return true;
}
Expand Down
5 changes: 3 additions & 2 deletions test/TestLike.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
using System.Threading.Tasks;
using TwitterSharp.Client;
using TwitterSharp.Request.Option;
using TwitterSharp.Response;
using TwitterSharp.Response.RUser;

namespace TwitterSharp.UnitTests
{
[TestClass]
public class TestLike
{
private async Task<bool> ContainsLikeAsync(string username, RUsers rUsers)
private async Task<bool> ContainsLikeAsync(string username, RList<User> rUsers)
{
if (rUsers.Users.Any(x => x.Username == username))
if (rUsers.Data.Any(x => x.Username == username))
{
return true;
}
Expand Down
5 changes: 3 additions & 2 deletions test/TestRetweet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,17 @@
using System.Threading.Tasks;
using TwitterSharp.Client;
using TwitterSharp.Request.Option;
using TwitterSharp.Response;
using TwitterSharp.Response.RUser;

namespace TwitterSharp.UnitTests
{
[TestClass]
public class TestRetweet
{
private async Task<bool> ContainsUserAsync(string username, RUsers rUsers)
private async Task<bool> ContainsUserAsync(string username, RList<User> rUsers)
{
if (rUsers.Users.Any(x => x.Username == username))
if (rUsers.Data.Any(x => x.Username == username))
{
return true;
}
Expand Down
Loading