Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions UnitystationLauncher.Tests/Models/Api/ServerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static void HasTrustedUrlSource_ShouldReturnFalseWhenNull()
[Theory]
[InlineData("http://myshadyunitystationdownload.test")]
[InlineData("http://127.0.0.1")]
[InlineData("http://unitystationfile.b-cdn.net")]
[InlineData("http://cdn.unitystation.org")]
[InlineData(" ")]
[InlineData("")]
public static void HasTrustedUrlSource_ShouldReturnFalseWhenUntrusted(string url)
Expand All @@ -79,9 +79,9 @@ public static void HasTrustedUrlSource_ShouldReturnTrueWhenTrusted()
{
Server server = new("Unit Test", 0, "127.0.0.1", 0)
{
WinDownload = "https://unitystationfile.b-cdn.net/Windows",
OsxDownload = "https://unitystationfile.b-cdn.net/Mac",
LinuxDownload = "https://unitystationfile.b-cdn.net/Linux"
WinDownload = "https://cdn.unitystation.org/Windows",
OsxDownload = "https://cdn.unitystation.org/Mac",
LinuxDownload = "https://cdn.unitystation.org/Linux"
};

server.HasTrustedUrlSource.Should().BeTrue();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,23 +44,23 @@
<screenshots>
<screenshot type="default">
<caption>StationHub news panel</caption>
<image>https://unitystationfile.b-cdn.net/screenshots/stationhub2.png</image>
<image>https://cdn.unitystation.org/screenshots/stationhub2.png</image>
</screenshot>
<screenshot>
<caption>StationHub servers panel</caption>
<image>https://unitystationfile.b-cdn.net/screenshots/stationhub.png</image>
<image>https://cdn.unitystation.org/screenshots/stationhub.png</image>
</screenshot>
<screenshot>
<caption>A parking accident angers an official</caption>
<image>https://unitystationfile.b-cdn.net/screenshots/unitystation-shuttle.png</image>
<image>https://cdn.unitystation.org/screenshots/unitystation-shuttle.png</image>
</screenshot>
<screenshot>
<caption>A monkey god appears in the station's chapel</caption>
<image>https://unitystationfile.b-cdn.net/screenshots/unitystation-monke.png</image>
<image>https://cdn.unitystation.org/screenshots/unitystation-monke.png</image>
</screenshot>
<screenshot>
<caption>UI for ordering cargo from Centcomm</caption>
<image>https://unitystationfile.b-cdn.net/screenshots/cargo-ui.jpg</image>
<image>https://cdn.unitystation.org/screenshots/cargo-ui.jpg</image>
</screenshot>
</screenshots>

Expand Down
2 changes: 1 addition & 1 deletion UnitystationLauncher/Constants/ApiUrls.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static class ApiUrls
public static string Latest10VersionsUrl => $"{ChangelogBaseUrl}/all-changes?format=json&limit=10";
public static string LatestBlogPosts => $"{ChangelogBaseUrl}/posts/?format=json";

private static string CdnBaseUrl => "https://unitystationfile.b-cdn.net";
private static string CdnBaseUrl => "https://cdn.unitystation.org";
public static string GoodFilesBaseUrl => $"{CdnBaseUrl}/GoodFiles";
public static string AllowedGoodFilesUrl => $"{GoodFilesBaseUrl}/AllowGoodFiles.json";

Expand Down
1 change: 1 addition & 0 deletions UnitystationLauncher/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Avalonia.ReactiveUI;

namespace UnitystationLauncher;

public static class Program
{
public static void Main(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
Expand Down
8 changes: 4 additions & 4 deletions docs/flatpak-maintenance.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ appstream-util validate org.unitystation.StationHub.metainfo.xml
If you get errors like these, they can be ignored.
```
org.unitystation.StationHub.metainfo.xml: FAILED:
• attribute-invalid : <screenshot> width too large [https://unitystationfile.b-cdn.net/screenshots/unitystation-monke.png] maximum is 1600px
• attribute-invalid : <screenshot> height too large [https://unitystationfile.b-cdn.net/screenshots/unitystation-monke.png] maximum is 900px
• attribute-invalid : <screenshot> width too large [https://unitystationfile.b-cdn.net/screenshots/cargo-ui.jpg] maximum is 1600px
• attribute-invalid : <screenshot> height too large [https://unitystationfile.b-cdn.net/screenshots/cargo-ui.jpg] maximum is 900px
• attribute-invalid : <screenshot> width too large [https://cdn.unitystation.org/screenshots/unitystation-monke.png] maximum is 1600px
• attribute-invalid : <screenshot> height too large [https://cdn.unitystation.org/screenshots/unitystation-monke.png] maximum is 900px
• attribute-invalid : <screenshot> width too large [https://cdn.unitystation.org/screenshots/cargo-ui.jpg] maximum is 1600px
• attribute-invalid : <screenshot> height too large [https://cdn.unitystation.org/screenshots/cargo-ui.jpg] maximum is 900px
```

### Desktop entry
Expand Down
Loading