StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix broken action links after update to .NET Core 3.0

This commit is contained in:
Jesse Plamondon-Willard 2020-05-14 19:25:51 -04:00
parent b2334fda16
commit 896f531f4f
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SMAPI.Web/Framework/Extensions.cs
View File

@ -22,6 +22,7 @@ namespace StardewModdingAPI.Web.Framework
/// <returns>The generated URL.</returns> /// <returns>The generated URL.</returns>
public static string PlainAction(this IUrlHelper helper, [AspMvcAction] string action, [AspMvcController] string controller, object values = null, bool absoluteUrl = false) public static string PlainAction(this IUrlHelper helper, [AspMvcAction] string action, [AspMvcController] string controller, object values = null, bool absoluteUrl = false)
{ {
// get route values
RouteValueDictionary valuesDict = new RouteValueDictionary(values); RouteValueDictionary valuesDict = new RouteValueDictionary(values);
foreach (var value in helper.ActionContext.RouteData.Values) foreach (var value in helper.ActionContext.RouteData.Values)
{ {
@ -29,13 +30,19 @@ namespace StardewModdingAPI.Web.Framework
valuesDict[value.Key] = null; // explicitly remove it from the URL valuesDict[value.Key] = null; // explicitly remove it from the URL
} }
// get relative URL
string url = helper.Action(action, controller, valuesDict); string url = helper.Action(action, controller, valuesDict);
if (url == null && action.EndsWith("Async"))
url = helper.Action(action[..^"Async".Length], controller, valuesDict);
// get absolute URL
if (absoluteUrl) if (absoluteUrl)
{ {
HttpRequest request = helper.ActionContext.HttpContext.Request; HttpRequest request = helper.ActionContext.HttpContext.Request;
Uri baseUri = new Uri($"{request.Scheme}://{request.Host}"); Uri baseUri = new Uri($"{request.Scheme}://{request.Host}");
url = new Uri(baseUri, url).ToString(); url = new Uri(baseUri, url).ToString();
} }
return url; return url;
} }