added proper return on TooManyRequest case
This commit is contained in:
parent
c371218672
commit
bf7baba789
2 changed files with 24 additions and 4 deletions
|
@ -13,6 +13,7 @@ using BirdsiteLive.Common.Regexes;
|
||||||
using BirdsiteLive.Common.Settings;
|
using BirdsiteLive.Common.Settings;
|
||||||
using BirdsiteLive.Domain;
|
using BirdsiteLive.Domain;
|
||||||
using BirdsiteLive.Models;
|
using BirdsiteLive.Models;
|
||||||
|
using BirdsiteLive.Statistics.Domain;
|
||||||
using BirdsiteLive.Tools;
|
using BirdsiteLive.Tools;
|
||||||
using BirdsiteLive.Twitter;
|
using BirdsiteLive.Twitter;
|
||||||
using BirdsiteLive.Twitter.Models;
|
using BirdsiteLive.Twitter.Models;
|
||||||
|
@ -32,9 +33,10 @@ namespace BirdsiteLive.Controllers
|
||||||
private readonly IStatusService _statusService;
|
private readonly IStatusService _statusService;
|
||||||
private readonly InstanceSettings _instanceSettings;
|
private readonly InstanceSettings _instanceSettings;
|
||||||
private readonly ILogger<UsersController> _logger;
|
private readonly ILogger<UsersController> _logger;
|
||||||
|
private readonly ITwitterStatisticsHandler _twitterStatisticsHandler;
|
||||||
|
|
||||||
#region Ctor
|
#region Ctor
|
||||||
public UsersController(ITwitterUserService twitterUserService, IUserService userService, IStatusService statusService, InstanceSettings instanceSettings, ITwitterTweetsService twitterTweetService, ILogger<UsersController> logger)
|
public UsersController(ITwitterUserService twitterUserService, IUserService userService, IStatusService statusService, InstanceSettings instanceSettings, ITwitterTweetsService twitterTweetService, ILogger<UsersController> logger, ITwitterStatisticsHandler twitterStatisticsHandler)
|
||||||
{
|
{
|
||||||
_twitterUserService = twitterUserService;
|
_twitterUserService = twitterUserService;
|
||||||
_userService = userService;
|
_userService = userService;
|
||||||
|
@ -42,6 +44,7 @@ namespace BirdsiteLive.Controllers
|
||||||
_instanceSettings = instanceSettings;
|
_instanceSettings = instanceSettings;
|
||||||
_twitterTweetService = twitterTweetService;
|
_twitterTweetService = twitterTweetService;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_twitterStatisticsHandler = twitterStatisticsHandler;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
@ -72,12 +75,17 @@ namespace BirdsiteLive.Controllers
|
||||||
if (!string.IsNullOrWhiteSpace(id) && UserRegexes.TwitterAccount.IsMatch(id) && id.Length <= 15)
|
if (!string.IsNullOrWhiteSpace(id) && UserRegexes.TwitterAccount.IsMatch(id) && id.Length <= 15)
|
||||||
user = _twitterUserService.GetUser(id);
|
user = _twitterUserService.GetUser(id);
|
||||||
|
|
||||||
|
var isSaturated = user == null
|
||||||
|
&& _twitterStatisticsHandler.GetCurrentUserCalls() >=
|
||||||
|
_twitterStatisticsHandler.GetStatistics().UserCallsMax;
|
||||||
|
|
||||||
var acceptHeaders = Request.Headers["Accept"];
|
var acceptHeaders = Request.Headers["Accept"];
|
||||||
if (acceptHeaders.Any())
|
if (acceptHeaders.Any())
|
||||||
{
|
{
|
||||||
var r = acceptHeaders.First();
|
var r = acceptHeaders.First();
|
||||||
if (r.Contains("application/activity+json"))
|
if (r.Contains("application/activity+json"))
|
||||||
{
|
{
|
||||||
|
if (user == null && isSaturated) return new ObjectResult("Too Many Requests") { StatusCode = 429 };
|
||||||
if (user == null) return NotFound();
|
if (user == null) return NotFound();
|
||||||
var apUser = _userService.GetUser(user);
|
var apUser = _userService.GetUser(user);
|
||||||
var jsonApUser = JsonConvert.SerializeObject(apUser);
|
var jsonApUser = JsonConvert.SerializeObject(apUser);
|
||||||
|
@ -85,8 +93,9 @@ namespace BirdsiteLive.Controllers
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (user == null && isSaturated) return View("ApiSaturated");
|
||||||
if (user == null) return View("UserNotFound");
|
if (user == null) return View("UserNotFound");
|
||||||
|
|
||||||
var displayableUser = new DisplayTwitterUser
|
var displayableUser = new DisplayTwitterUser
|
||||||
{
|
{
|
||||||
Name = user.Name,
|
Name = user.Name,
|
||||||
|
@ -190,7 +199,5 @@ namespace BirdsiteLive.Controllers
|
||||||
var jsonApUser = JsonConvert.SerializeObject(followers);
|
var jsonApUser = JsonConvert.SerializeObject(followers);
|
||||||
return Content(jsonApUser, "application/activity+json; charset=utf-8");
|
return Content(jsonApUser, "application/activity+json; charset=utf-8");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
13
src/BirdsiteLive/Views/Users/ApiSaturated.cshtml
Normal file
13
src/BirdsiteLive/Views/Users/ApiSaturated.cshtml
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
@using BirdsiteLive.Controllers;
|
||||||
|
@{
|
||||||
|
ViewData["Title"] = "Api Saturated";
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="text-center">
|
||||||
|
<h1 class="display-4">429 Too Many Requests</h1>
|
||||||
|
<p>
|
||||||
|
<br />
|
||||||
|
The API is saturated.<br/>
|
||||||
|
Please consider using another instance.
|
||||||
|
</p>
|
||||||
|
</div>
|
Loading…
Add table
Reference in a new issue