glenux-archive/cloutier--bird.makeup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

made twitteruser more async

Browse source
This commit is contained in:
Vincent Cloutier 2022-12-28 10:23:46 -05:00
parent 944dfc7254
commit e7197f3054
8 changed files with 49 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/BirdsiteLive.Domain/UserService.cs
View file

@ -162,7 +162,7 @@ namespace BirdsiteLive.Domain
} }
// Validate User Protected // Validate User Protected
var user = _twitterUserService.GetUser(twitterUser); var user = await _twitterUserService.GetUserAsync(twitterUser);
if (!user.Protected) if (!user.Protected)
{ {
// Execute // Execute

2
src/BirdsiteLive.Pipeline/Processors/RefreshTwitterUserStatusProcessor.cs
View file

@ -40,7 +40,7 @@ namespace BirdsiteLive.Pipeline.Processors
try try
{ {
userView = _twitterUserService.GetUser(user.Acct); userView = await _twitterUserService.GetUserAsync(user.Acct);
} }
catch (UserNotFoundException) catch (UserNotFoundException)
{ {

5
src/BirdsiteLive.Twitter/CachedTwitterService.cs
View file

@ -1,4 +1,5 @@
using System; using System;
using System.Threading.Tasks;
using BirdsiteLive.Common.Settings; using BirdsiteLive.Common.Settings;
using BirdsiteLive.Twitter.Models; using BirdsiteLive.Twitter.Models;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
@ -36,11 +37,11 @@ namespace BirdsiteLive.Twitter
} }
#endregion #endregion
public TwitterUser GetUser(string username) public async Task<TwitterUser> GetUserAsync(string username)
{ {
if (!_userCache.TryGetValue(username, out TwitterUser user)) if (!_userCache.TryGetValue(username, out TwitterUser user))
{ {
user = _twitterService.GetUser(username); user = await _twitterService.GetUserAsync(username);
if(user != null) _userCache.Set(username, user, _cacheEntryOptions); if(user != null) _userCache.Set(username, user, _cacheEntryOptions);
} }

10
src/BirdsiteLive.Twitter/TwitterTweetsService.cs
View file

@ -65,7 +65,7 @@ namespace BirdsiteLive.Twitter
var timeline = tweet.RootElement.GetProperty("data").GetProperty("threaded_conversation_with_injections_v2") var timeline = tweet.RootElement.GetProperty("data").GetProperty("threaded_conversation_with_injections_v2")
.GetProperty("instructions").EnumerateArray().First().GetProperty("entries").EnumerateArray(); .GetProperty("instructions").EnumerateArray().First().GetProperty("entries").EnumerateArray();
return Extract( timeline.First() ); return await Extract( timeline.First() );
} }
catch (Exception e) catch (Exception e)
{ {
@ -84,7 +84,7 @@ namespace BirdsiteLive.Twitter
var client = await _twitterAuthenticationInitializer.MakeHttpClient(); var client = await _twitterAuthenticationInitializer.MakeHttpClient();
var user = _twitterUserService.GetUser(username); var user = await _twitterUserService.GetUserAsync(username);
if (user == null || user.Protected) return new ExtractedTweet[0]; if (user == null || user.Protected) return new ExtractedTweet[0];
@ -129,7 +129,7 @@ namespace BirdsiteLive.Twitter
try try
{ {
var extractedTweet = Extract(tweet); var extractedTweet = await Extract(tweet);
extractedTweets.Add(extractedTweet); extractedTweets.Add(extractedTweet);
} }
@ -145,7 +145,7 @@ namespace BirdsiteLive.Twitter
return extractedTweets.ToArray(); return extractedTweets.ToArray();
} }
private ExtractedTweet Extract(JsonElement tweet) private async Task<ExtractedTweet> Extract(JsonElement tweet)
{ {
JsonElement retweet; JsonElement retweet;
@ -188,7 +188,7 @@ namespace BirdsiteLive.Twitter
.GetProperty("retweeted_status_result").GetProperty("result") .GetProperty("retweeted_status_result").GetProperty("result")
.GetProperty("core").GetProperty("user_results").GetProperty("result") .GetProperty("core").GetProperty("user_results").GetProperty("result")
.GetProperty("legacy").GetProperty("screen_name").GetString(); .GetProperty("legacy").GetProperty("screen_name").GetString();
OriginalAuthor = _twitterUserService.GetUser(OriginalAuthorUsername); OriginalAuthor = await _twitterUserService.GetUserAsync(OriginalAuthorUsername);
} }
string creationTime = tweet.GetProperty("content").GetProperty("itemContent") string creationTime = tweet.GetProperty("content").GetProperty("itemContent")

6
src/BirdsiteLive.Twitter/TwitterUserService.cs
View file

@ -13,7 +13,7 @@ namespace BirdsiteLive.Twitter
{ {
public interface ITwitterUserService public interface ITwitterUserService
{ {
TwitterUser GetUser(string username); Task<TwitterUser> GetUserAsync(string username);
bool IsUserApiRateLimited(); bool IsUserApiRateLimited();
} }
@ -35,10 +35,6 @@ namespace BirdsiteLive.Twitter
} }
#endregion #endregion
public TwitterUser GetUser(string username)
{
return GetUserAsync(username).Result;
}
public async Task<TwitterUser> GetUserAsync(string username) public async Task<TwitterUser> GetUserAsync(string username)
{ {
await _twitterAuthenticationInitializer.EnsureAuthenticationIsInitialized(); await _twitterAuthenticationInitializer.EnsureAuthenticationIsInitialized();

4
src/BirdsiteLive/Controllers/UsersController.cs
View file

@ -59,7 +59,7 @@ namespace BirdsiteLive.Controllers
[Route("/@{id}")] [Route("/@{id}")]
[Route("/users/{id}")] [Route("/users/{id}")]
[Route("/users/{id}/remote_follow")] [Route("/users/{id}/remote_follow")]
public IActionResult Index(string id) public async Task<IActionResult> Index(string id)
{ {
_logger.LogTrace("User Index: {Id}", id); _logger.LogTrace("User Index: {Id}", id);
@ -75,7 +75,7 @@ namespace BirdsiteLive.Controllers
{ {
try try
{ {
user = _twitterUserService.GetUser(id); user = await _twitterUserService.GetUserAsync(id);
} }
catch (UserNotFoundException) catch (UserNotFoundException)
{ {

4
src/BirdsiteLive/Controllers/WellKnownController.cs
View file

@ -142,7 +142,7 @@ namespace BirdsiteLive.Controllers
} }
[Route("/.well-known/webfinger")] [Route("/.well-known/webfinger")]
public IActionResult Webfinger(string resource = null) public async Task<IActionResult> Webfinger(string resource = null)
{ {
if (string.IsNullOrWhiteSpace(resource)) if (string.IsNullOrWhiteSpace(resource))
return BadRequest(); return BadRequest();
@ -203,7 +203,7 @@ namespace BirdsiteLive.Controllers
try try
{ {
_twitterUserService.GetUser(name); await _twitterUserService.GetUserAsync(name);
} }
catch (UserNotFoundException) catch (UserNotFoundException)
{ {

68
src/Tests/BirdsiteLive.Pipeline.Tests/Processors/RefreshTwitterUserStatusProcessorTests.cs
View file

@ -47,8 +47,8 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.IsAny<string>())) .Setup(x => x.GetUserAsync(It.IsAny<string>()))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
@ -95,8 +95,8 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.IsAny<string>())) .Setup(x => x.GetUserAsync(It.IsAny<string>()))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
@ -152,14 +152,14 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Throws(new UserNotFoundException()); .Throws(new UserNotFoundException());
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
@ -216,14 +216,14 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Throws(new UserHasBeenSuspendedException()); .Throws(new UserHasBeenSuspendedException());
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
@ -280,14 +280,14 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Throws(new Exception()); .Throws(new Exception());
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
@ -352,15 +352,15 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Returns((TwitterUser)null); .ReturnsAsync((TwitterUser)null);
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
twitterUserDalMock twitterUserDalMock
@ -424,15 +424,15 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Returns((TwitterUser)null); .ReturnsAsync((TwitterUser)null);
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
twitterUserDalMock twitterUserDalMock
@ -495,15 +495,15 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = true Protected = true
}); });
@ -570,15 +570,15 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false Protected = false
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = true Protected = true
}); });
@ -639,8 +639,8 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns((TwitterUser)null); .ReturnsAsync((TwitterUser)null);
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);
twitterUserDalMock twitterUserDalMock
@ -700,14 +700,14 @@ namespace BirdsiteLive.Pipeline.Tests.Processors
#region Mocks #region Mocks
var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict); var twitterUserServiceMock = new Mock<ICachedTwitterUserService>(MockBehavior.Strict);
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct1))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct1)))
.Returns(new TwitterUser .ReturnsAsync(new TwitterUser
{ {
Protected = false, Protected = false,
}); });
twitterUserServiceMock twitterUserServiceMock
.Setup(x => x.GetUser(It.Is<string>(y => y == acct2))) .Setup(x => x.GetUserAsync(It.Is<string>(y => y == acct2)))
.Throws(new RateLimitExceededException()); .Throws(new RateLimitExceededException());
var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict); var twitterUserDalMock = new Mock<ITwitterUserDal>(MockBehavior.Strict);