mirror of
https://github.com/ppy/osu.git
synced 2026-05-18 09:09:52 +08:00
Add fallback to use Message when Hint is not available
This commit is contained in:
@@ -62,7 +62,7 @@ namespace osu.Game.Online.API
|
||||
// attempt to decode a displayable error string.
|
||||
var error = JsonConvert.DeserializeObject<OAuthError>(req.GetResponseString() ?? string.Empty);
|
||||
if (error != null)
|
||||
throwableException = new APIException(error.Message, ex);
|
||||
throwableException = new APIException(error.UserDisplayableError, ex);
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -201,10 +201,15 @@ namespace osu.Game.Online.API
|
||||
|
||||
private class OAuthError
|
||||
{
|
||||
public string UserDisplayableError => !string.IsNullOrEmpty(Hint) ? Hint : ErrorIdentifier;
|
||||
|
||||
[JsonProperty("error")]
|
||||
public string ErrorType { get; set; }
|
||||
public string ErrorIdentifier { get; set; }
|
||||
|
||||
[JsonProperty("hint")]
|
||||
public string Hint { get; set; }
|
||||
|
||||
[JsonProperty("message")]
|
||||
public string Message { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user