diff --git a/SS14.Changelog.Tests/ChangelogParseTest.cs b/SS14.Changelog.Tests/ChangelogParseTest.cs index b89e369..796607b 100644 --- a/SS14.Changelog.Tests/ChangelogParseTest.cs +++ b/SS14.Changelog.Tests/ChangelogParseTest.cs @@ -28,7 +28,7 @@ Did stuff! Assert.That(parsed, Is.Not.Null); Assert.That(parsed.Author, Is.EqualTo("Ev1__l P-JB2323")); Assert.That(parsed.Time, Is.EqualTo(time)); - Assert.That(parsed.Url, Is.EqualTo("https://www.example.com")); + Assert.That(parsed.HtmlUrl, Is.EqualTo("https://www.example.com")); Assert.That(parsed.Changes, Is.EquivalentTo(new[] { (ChangelogEntryType.Add, "Did the thing"), @@ -57,7 +57,7 @@ Did stuff! Assert.That(parsed, Is.Not.Null); Assert.That(parsed.Author, Is.EqualTo("Swept")); Assert.That(parsed.Time, Is.EqualTo(time)); - Assert.That(parsed.Url, Is.EqualTo("https://www.example.com")); + Assert.That(parsed.HtmlUrl, Is.EqualTo("https://www.example.com")); Assert.That(parsed.Changes, Is.EquivalentTo(new[] { (ChangelogEntryType.Add, "Did the thing"), @@ -86,7 +86,7 @@ Did stuff! Assert.That(parsed, Is.Not.Null); Assert.That(parsed.Author, Is.EqualTo("Swept")); Assert.That(parsed.Time, Is.EqualTo(time)); - Assert.That(parsed.Url, Is.EqualTo("https://www.example.com")); + Assert.That(parsed.HtmlUrl, Is.EqualTo("https://www.example.com")); Assert.That(parsed.Changes, Is.EquivalentTo(new[] { (ChangelogEntryType.Add, "Did the thing"), @@ -107,7 +107,7 @@ public void TestBroke() Assert.That(parsed, Is.Not.Null); Assert.That(parsed.Author, Is.EqualTo("AJCM")); Assert.That(parsed.Time, Is.EqualTo(time)); - Assert.That(parsed.Url, Is.EqualTo("https://www.example.com")); + Assert.That(parsed.HtmlUrl, Is.EqualTo("https://www.example.com")); Assert.That(parsed.Changes, Is.EquivalentTo(new[] { (ChangelogEntryType.Add, "Makes gravity generator and windows repairable with a lit welding tool") diff --git a/SS14.Changelog/ChangelogData.cs b/SS14.Changelog/ChangelogData.cs index bbc93dd..d73a108 100644 --- a/SS14.Changelog/ChangelogData.cs +++ b/SS14.Changelog/ChangelogData.cs @@ -16,7 +16,7 @@ public ChangelogData(string author, ImmutableArray<(ChangelogEntryType, string)> public ImmutableArray<(ChangelogEntryType, string)> Changes { get; } public DateTimeOffset Time { get; } public int Number { get; init; } - public required string Url { get; init; } + public required string HtmlUrl { get; init; } } public enum ChangelogEntryType diff --git a/SS14.Changelog/Controllers/WebhookController.cs b/SS14.Changelog/Controllers/WebhookController.cs index b347a43..99267b9 100644 --- a/SS14.Changelog/Controllers/WebhookController.cs +++ b/SS14.Changelog/Controllers/WebhookController.cs @@ -186,7 +186,7 @@ private void HandlePullRequest(GHPullRequestEvent eventData) return new ChangelogData(author, entries.ToImmutableArray(), pr.MergedAt ?? DateTimeOffset.Now) { Number = pr.Number, - Url = pr.Url + HtmlUrl = pr.Url }; } } diff --git a/SS14.Changelog/Services/ChangelogService.cs b/SS14.Changelog/Services/ChangelogService.cs index e2e0983..333d02f 100644 --- a/SS14.Changelog/Services/ChangelogService.cs +++ b/SS14.Changelog/Services/ChangelogService.cs @@ -344,7 +344,7 @@ private void WriteChangelogPart(ChangelogData data) { {"author", Quoted(data.Author)}, {"time", Quoted(data.Time.ToString("O"))}, - {"url", Quoted(data.Url)}, + {"url", Quoted(data.HtmlUrl)}, { "changes", new YamlSequenceNode(