notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/federation] Add edition to nodeinfo response

Browse source
This commit is contained in:
Laura Hausmann 2024-07-10 18:11:17 +02:00
parent 2d76bcda23
commit 91acb8ed9e
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
5 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Iceshrimp.Backend/Controllers/Federation/NodeInfoController.cs
View file

@ -46,6 +46,7 @@ public class NodeInfoController(IOptions<Config.InstanceSection> config, Databas
Name = "Iceshrimp.NET",
Version = instance.Version,
Codename = instance.Codename,
Edition = instance.Edition,
Homepage = new Uri(Constants.ProjectHomepageUrl),
Repository = Request.Path.Value?.EndsWith("2.1") ?? false
? new Uri(Constants.RepositoryUrl)

1
Iceshrimp.Backend/Core/Configuration/Config.cs
View file

@ -20,6 +20,7 @@ public sealed class Config
private readonly VersionInfo _versionInfo = VersionHelpers.GetVersionInfo();
public string Codename => _versionInfo.Codename;
public string Edition => _versionInfo.Edition;
public string? CommitHash => _versionInfo.CommitHash;
public string RawVersion => _versionInfo.RawVersion;
public string Version => _versionInfo.Version;

1
Iceshrimp.Backend/Core/Federation/WebFinger/Types.cs
View file

@ -94,6 +94,7 @@ public class NodeInfoResponse
[J("name")] public string? Name { get; set; }
[J("version")] public string? Version { get; set; }
[J("codename")] public string? Codename { get; set; }
[J("edition")] public string? Edition { get; set; }
[J("homepage")] public Uri? Homepage { get; set; }
/// <remarks>

1
Iceshrimp.Frontend/Core/Services/VersionService.cs
View file

@ -7,6 +7,7 @@ public sealed class VersionService
private readonly VersionInfo _versionInfo = VersionHelpers.GetVersionInfo();
public string Codename => _versionInfo.Codename;
public string Edition => _versionInfo.Edition;
public string? CommitHash => _versionInfo.CommitHash;
public string RawVersion => _versionInfo.RawVersion;
public string Version => _versionInfo.Version;

11
Iceshrimp.Shared/Helpers/VersionHelpers.cs
View file

@ -2,7 +2,7 @@ using System.Reflection;
namespace Iceshrimp.Shared.Helpers;
public record VersionInfo(string Version, string RawVersion, string Codename, string? CommitHash);
public record VersionInfo(string Version, string RawVersion, string Codename, string Edition, string? CommitHash);
public static class VersionHelpers
{
@ -19,6 +19,13 @@ public static class VersionHelpers
?.Value ??
"unknown";
// Get edition from assembly
var edition = attributes
.OfType<AssemblyMetadataAttribute>()
.FirstOrDefault(p => p.Key == "edition")
?.Value ??
"unknown";
string version;
string rawVersion;
string? commitHash = null;
@ -42,6 +49,6 @@ public static class VersionHelpers
rawVersion = fullVersion;
}
return new VersionInfo(version, rawVersion, codename, commitHash);
return new VersionInfo(version, rawVersion, codename, edition, commitHash);
}
}